filter_factory 0.0.1 → 0.0.2

data/README.md

@@ -25,6 +25,11 @@ Describe your filter:
       field :title, :regex
       field :author, :eq
       field :views, :gte
+
+      # add aliases for the same field with different conditions
+      field :created_at, :gte, alias: :created_at_gte
+      field :created_at, :lte, alias: :created_at_lte
+
       # ...
     end
 
@@ -46,6 +51,16 @@ Render form as you want in your view:
         <br/>
         <%= f.number_field :views %>
     </div>
+    <div>
+        <%= f.label :created_at_gte %>
+        <br/>
+        <%= f.date_select :created_at_gte %>
+    </div>
+    <div>
+        <%= f.label :created_at_lte %>
+        <br/>
+        <%= f.date_select :created_at_lte %>
+    </div>
     <div class="actions">
         <%= f.submit "Filter" %>
     </div>

data/lib/filter_factory/field.rb

@@ -1,10 +1,12 @@
 module FilterFactory
   class Field
-    attr_reader :name, :condition, :options
+    attr_reader :name, :condition, :alias, :options
     attr_accessor :value
 
     def initialize(name, condition, options = {})
-      @name, @condition, @options = name, condition, options
+      valid_options = [:alias]
+      @name, @condition, @options = name, condition, options.reject{|k,v| !valid_options.include?(k)}
+      @alias = @options[:alias] || @name
     end
   end
 end

data/lib/filter_factory/filter.rb

@@ -13,7 +13,7 @@ module FilterFactory
 
     def attributes
       @fields.inject(HashWithIndifferentAccess.new) do |acc,field|
-        acc[field.name] = field.value
+        acc[field.alias] = field.value
         acc
       end
     end
@@ -34,10 +34,10 @@ module FilterFactory
     end
 
     private
-    def field(name, condition)
-      Field.new(name, condition).tap do |field|
-        define_singleton_method(name){ field.value }
-        define_singleton_method("#{name}="){|val| field.value = val }
+    def field(name, condition, options={})
+      Field.new(name, condition, options).tap do |field|
+        define_singleton_method(field.alias){ field.value }
+        define_singleton_method("#{field.alias}="){|val| field.value = val }
 
         @fields << field
       end

data/lib/filter_factory/mongoid/filter.rb

@@ -6,9 +6,9 @@ module FilterFactory
           FilterFactory::Mongoid::Condition.new(field.name, field.value).method(field.condition)
         end
 
-        conditions.inject(nil) do |res,condition|
-          res ? res.instance_eval(&condition) : instance_eval(&condition)
-        end || self
+        conditions.inject(self) do |res,condition|
+          res = res.instance_eval(&condition)
+        end
       end
     end
   end

data/lib/filter_factory/version.rb

@@ -1,3 +1,3 @@
 module FilterFactory
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/filter_factory/active_record/model_spec.rb

@@ -12,14 +12,14 @@ describe ARPost do
   it "should execute filter methods chain" do
     filter = FilterFactory.create do
       field :title, :eq
-      field :author, :eq
+      field :author, :eq, alias: :user
       field :views, :gte
     end
 
     sample = @posts.sample
 
     filter.title = sample.title
-    filter.author = sample.author
+    filter.user = sample.author
 
     described_class.filter(filter).to_a.should == [sample]
   end

data/spec/filter_factory/filter_spec.rb

@@ -15,7 +15,7 @@ describe FilterFactory::Filter do
     filter.fields.map{|f| [f.name, f.condition]}.should == test_fields
   end
 
-  it "should define singleton method for defined field" do
+  it "should define singleton method for defined field by its name if no alias option specified" do
     filter = described_class.create do
       field :name, :eq
     end
@@ -23,6 +23,14 @@ describe FilterFactory::Filter do
     filter.should respond_to(:name, :'name=')
   end
 
+  it "should define singleton method for defined field by its alias if alias option specified" do
+    filter = described_class.create do
+      field :name, :eq, alias: :my_name
+    end
+
+    filter.should respond_to(:my_name, :'my_name=')
+  end
+
   it "should get field value" do
     filter = described_class.create do
       field :name, :eq
@@ -52,20 +60,20 @@ describe FilterFactory::Filter do
   it "should return valid attributes" do
     filter = described_class.create do
       field :name, :eq
-      field :surname, :regex
+      field :surname, :regex, alias: :last_name
     end
     filter.name = "test name"
 
-    filter.attributes.should == HashWithIndifferentAccess.new({name: "test name", surname: nil})
+    filter.attributes.should == HashWithIndifferentAccess.new({name: "test name", last_name: nil})
   end
 
   it "should fill filter values from hash" do
     filter = described_class.create do
       field :name, :eq
-      field :surname, :regex
+      field :surname, :regex, alias: :last_name
     end
 
-    attributes = {name: "my test name", surname: "surname here"}
+    attributes = {name: "my test name", last_name: "surname here"}
     filter.attributes = attributes
     filter.attributes.should == HashWithIndifferentAccess.new(attributes)
   end

data/spec/filter_factory/mongoid/model_spec.rb

@@ -14,12 +14,12 @@ describe MPost do
 
     filter = FilterFactory.create do
       field :title,  :eq
-      field :author, :eq
+      field :author, :eq, alias: :user
       field :views,  :gte
     end
 
     filter.title = sample.title
-    filter.author = sample.author
+    filter.user = sample.author
 
     described_class.filter(filter).to_a.should == [sample]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filter_factory
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies: []
 description: Gem for easy ActiveRecord/Mongoid models filtering
 email: 
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: FilterFactory allows you to easily fetch ActiveRecord/Mongoid models that