extended_inherited_resources 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/extended_inherited_resources.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{extended_inherited_resources}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["josevalim", "stevo"]

data/lib/inherited_resources/base_helpers.rb

@@ -33,10 +33,26 @@ module InheritedResources
     #     @projects ||= end_of_association_chain.paginate(params[:page]).all
     #   end
     #
+
+    def setup_searchlogic(param)
+      if param
+        param=:search unless param.is_a? Symbol
+        instance_variable_set("@search",end_of_association_chain.searchlogic(params[param]))
+      end
+    end
+
+    def config_hash
+      self.class.resources_configuration[:self]
+    end
+
     def collection
-      get_collection_ivar || set_collection_ivar(end_of_association_chain.find(:all))
+      setup_searchlogic(config_hash[:searchlogic])
+      end_of_chain = config_hash[:searchlogic] ? @search : end_of_association_chain
+      end_of_chain = (per_page = config_hash[:pagination]) ?  end_of_chain.paginate(:page => params[:page], :per_page => per_page) : end_of_chain.find(:all)
+      get_collection_ivar || set_collection_ivar(end_of_chain)
     end
 
+
     # This is how the resource is loaded.
     #
     # You might want to overwrite this method when you are using permalink.

data/lib/inherited_resources/class_methods.rb

@@ -36,7 +36,7 @@ module InheritedResources
       options.symbolize_keys!
       options.assert_valid_keys(:resource_class, :collection_name, :instance_name,
                                 :class_name, :route_prefix, :route_collection_name,
-                                :route_instance_name, :singleton, :redirects)
+                                :route_instance_name, :singleton, :redirects, :searchlogic, :pagination)
 
       self.resource_class = options.delete(:resource_class)         if options.key?(:resource_class)
       self.resource_class = options.delete(:class_name).constantize if options.key?(:class_name)
@@ -56,6 +56,9 @@ module InheritedResources
         self.redirects = {:create => self.redirects, :update => self.redirects}
       end
 
+      config[:searchlogic] =  options.delete(:searchlogic) if options.key?(:searchlogic)
+      config[:pagination] =  options.delete(:pagination) if options.key?(:pagination)
+
       options.each do |key, value|
         config[key] = value.to_sym
       end
@@ -255,11 +258,15 @@ module InheritedResources
 
       config[:route_collection_name] = config[:collection_name]
       config[:route_instance_name]   = config[:instance_name]
+      
+      config[:pagination] ||= 25
+      config[:searchlogic] ||= false
+
 
       # Deal with namespaced controllers
       namespaces = self.controller_path.split('/')[0..-2]
       config[:route_prefix] = namespaces.join('_') unless namespaces.empty?
-      
+
       self.redirects ||= {}
       self.redirects[:create] ||= :index
       self.redirects[:update] ||= :index

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - josevalim