has_filter 0.0.1 → 0.1.0

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+* 0.1.0
+  Rails 2.3 compatibility
+  `filtering` method become `filter`
+  Fix filtering with invalid params, now filter only model's attribute
+  Fix empty filtering
+
+* 0.0.1
+  Initial release

data/README.md

@@ -1,20 +1,32 @@
-= HasFilter
+# HasFilter
 
 Active Record filter conditions
 
 It's allows you to find a model with a specific set of conditions, eliminating complex set of filter conditions in filter forms.
 
 
-== Getting started
+## Getting started
 
 Install - Gemfile
 
 `gem has_filter`
 
 
+### Rails 2.3
+
+In rails 2.3 also needs add to `envoriment.rb`
+
+```ruby
+config.gem 'has_filter'
+```
+
+### Bundle
+
 `$ bundle install`
 
 
+### Usage
+
 ```ruby
 class Post < ActiveRecord::Base
   has_filter
@@ -24,9 +36,9 @@ end
 And now you can use:
 
 ```ruby
-Post.filtering(:active => true)          #=> All active posts
-Post.filtering(:active => [true, false]) #=> All posts active or not
-Post.filtering(:title  => "Something")   #=> All that match with title Something (title like %Something%)
+Post.filter(:active => true)          #=> All active posts
+Post.filter(:active => [true, false]) #=> All posts active or not
+Post.filter(:title  => "Something")   #=> All that match with title Something (title like %Something%)
 ```
 You can also specify what attributes should be filtered
 
@@ -37,8 +49,6 @@ end
 ```
 
 ```ruby
-Post.filtering(:active => true)                         #=> No filtering
-Post.filtering(:title  => "Something", :active => true) #=> All that match with title Something (title like %Something%) ignoring active condition
+Post.filter(:active => true)                         #=> No filtering
+Post.filter(:title  => "Something", :active => true) #=> All that match with title Something (title like %Something%) ignoring active condition
 ```
-
-

data/lib/has_filter.rb

@@ -7,45 +7,74 @@ module HasFilter
 
   module ClassMethods
     def has_filter(allowed_fields = nil)
-      @allowed_fields = *allowed_fields
+      @_filters = *allowed_fields
     end
 
-    def filtering(conditions)
+    def filter(filtering = nil)
+      return [] unless filtering
+      conditions = filtering
       filters = []
-      if @allowed_fields.present?
-        conditions = conditions.select { |key| @allowed_fields.include? key }
-        if conditions.empty?
-          filters << hash_conditions(:id, nil)
-        end
-        conditions.each do |key, value|
-          next if value.nil?
-          if self.columns_hash[key.to_s].type == :string
-            filters << like_conditions(key, value)
-          else
-            filters << hash_conditions(key, value)
-          end
-        end
+
+      conditions = conditions.select { |k, v| self.column_names.include? k.to_s }
+
+      if @_filters.present?
+        conditions = conditions.select { |key| @_filters.include? key }
+      end
+
+      if conditions.empty?
+        filters << _hash_conditions(:id, nil)
       else
-        conditions.each do |key, value|
-          next if value.nil?
-          if self.columns_hash[key.to_s].type == :string
-            filters << like_conditions(key, value)
-          else
-            filters << hash_conditions(key, value)
-          end
-        end
+        filters << _set_filters(conditions)
       end
-      find(:all, *filters)
+
+      filters = filters.flatten
+      find(:all, :conditions => filters)
     end
 
     private
 
-    def hash_conditions(key, value)
-      { :conditions => { key => value } }
+    def _hash_conditions(key, value)
+      if value.is_a? Array
+        ["#{key.to_s} in (:#{key.to_s})"]
+      else
+        ["#{key.to_s} = :#{key.to_s}"]
+      end
+    end
+
+    def _like_conditions(key, value)
+      if value.is_a? Array
+        ["#{key.to_s} in (:#{key.to_s})"]
+      else
+        ["#{key.to_s} like :#{key.to_s}"]
+      end
     end
 
-    def like_conditions(key, value)
-      { :conditions => ["#{key.to_s} like ?", "%#{value}%"] }
+    def _set_filters(filtering)
+      filters = []
+      conditions = filtering
+      conditions.reject! { |k, v| v.nil? }
+
+      conditions.each do |key, value|
+        next if value.nil?
+        if self.columns_hash[key.to_s].type == :string
+          filters << _like_conditions(key, value)
+        else
+          filters << _hash_conditions(key, value)
+        end
+      end
+
+      conditions = conditions.inject({}) do |hash, (key, value)|
+        if !value.is_a?(Array) && self.columns_hash[key.to_s].type == :string
+          hash[key.to_sym] = "%#{value}%"
+        elsif value.is_a?(Array)
+          hash[key.to_sym] = value.delete_if { |a| a.to_s.blank? }
+        else
+          hash[key.to_sym] = value
+        end
+        hash
+      end
+
+      [filters.join(" AND "), conditions]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies: []
 description: Active Record filter conditions
 email:
@@ -23,6 +23,7 @@ files:
 - Rakefile
 - Gemfile
 - README.md
+- CHANGELOG.md
 homepage: https://github.com/jhonnyquest/has_filter
 licenses: []
 post_install_message: