has_filter 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.2
+  * Add limit option for filtering, default = 100.
+  * Fix empty filtering again - Only return nothing when filtering
+    options is empty and filter fields is allowed
+
 ## 0.1.1
   * Fix nil filtering
   * Fix boolean filtering

data/README.md

@@ -52,3 +52,13 @@ end
 Post.filter(:active => true)                         #=> No filtering
 Post.filter(:title  => "Something", :active => true) #=> All that match with title Something (title like %Something%) ignoring active condition
 ```
+
+### Limit
+
+By default the max of records is 100, by you can specify other amount:
+
+```ruby
+Article.filter({:status => "open"}, 1)   #=> Retrieve just one element
+```
+
+Note which when we specify a limit, we need to wrap our options in a hash

data/lib/has_filter.rb

@@ -1,5 +1,3 @@
-require 'active_record'
-
 module HasFilter
   def self.included(base)
     base.extend ClassMethods
@@ -10,24 +8,22 @@ module HasFilter
       @_filters = *allowed_fields
     end
 
-    def filter(filtering = nil)
-      return [] unless filtering
+    def filter(filtering = nil, limit = 100)
       conditions = filtering
-      filters = []
-
-      conditions = _normalize_conditions(conditions)
-
-      if conditions.empty?
-        filters << _hash_conditions(:id)
-      else
-        filters << _set_filters(conditions)
+      if @_filters.present?
+        conditions = _valid_filters(conditions)
+        return [] if conditions.empty?
       end
 
-      find(:all, :conditions => filters.flatten)
+      conditions = _normalize_conditions(conditions)
+      all(:conditions => _set_filters(conditions).flatten, :limit => limit)
     end
 
     private
 
+    def _valid_filters(conditions)
+      conditions.select { |k, v| @_filters.include? k }
+    end
 
     def _set_filters(conditions)
       filters = []
@@ -74,9 +70,8 @@ module HasFilter
 
     def _normalize_conditions(filtering)
       conditions = filtering
-      conditions = conditions.select { |k, v| self.column_names.include? k.to_s }
-      conditions = conditions.select { |k, v| @_filters.include? k              } if @_filters.present?
-      conditions = conditions.reject { |k, v| v && v.blank? || v.nil?           }
+      conditions = conditions.select{ |k, v| self.column_names.include? k.to_s }
+      conditions = conditions.reject{ |k, v| v && v.blank? || v.nil?           }
 
       conditions.inject({})  do |hash, (key, value)|
         key = key.to_sym

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_filter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Active Record filter conditions.