filter_form 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 46c6a58b11f78f33bf95db4070aeebdc01d1461e
-  data.tar.gz: 098c3ec61496b73b4a54bf41b4d34182ceda52ec
+  metadata.gz: 61f48ddb9a951f24ca2c7f1c637f8c46387ebb63
+  data.tar.gz: a44a6a392a2f1714c06ce37d3eb83f20d8c89e3c
 SHA512:
-  metadata.gz: 9d941db09900aaa526c33d9e63f71e38351551c13ab457fc8e4190da3995224690069ad5d28f612049f1eef5a3c6c368067e4895f804434f7ccf86f73c6f7e3d
-  data.tar.gz: b033d09304ba27afe144216b3d46d1d4bb54320dace72c929e0196e1646e603c7730fb2f61e7cccbe44923bc4c5b7a6fd51126b570075ac7fdc9fc0c03123260
+  metadata.gz: 912056cb716eabd7eb85bb4182cfbffb18819cc202c396f62b8001c2b3b637b0a124ba7acb788f8c26c49f1499e0696d95a1c3d268551f97359e9291b2e8dc6a
+  data.tar.gz: 612c03cae32f18acf25a6543bc03c33597a442387582b435f08638437a28f092c808b612639e8fe212db3b3dba9e166ae038a3566fcdee9d0a1f42e1a0948a2f

data/lib/filter_form/form_helper.rb

@@ -7,6 +7,12 @@ module FilterForm
         html:   { class: 'filter_form', novalidate: true }
       })
 
+      record.instance_eval do
+        def model_name
+          klass.model_name
+        end
+      end
+
       simple_form_for(record, options, &block)
     end
   end

data/lib/filter_form/input_options/base.rb

@@ -101,10 +101,10 @@ module FilterForm
 
       def object_condition
         if options[:predicate_selector]
-          object.base.conditions.select { |condition| condition.a.first.name == input_attribute_name.to_s }.first
+          object.base.conditions.select { |condition| condition.a.first.name == input_attribute_name }.first
         else
           object.base.conditions.select do |condition|
-            condition.a.first.name == input_attribute_name.to_s && condition.predicate.name == predicate.to_s
+            condition.a.first.name == input_attribute_name && condition.predicate.name == predicate.to_s
           end.first
         end
       end

data/lib/filter_form/input_options_builder.rb

@@ -12,13 +12,14 @@ require 'filter_form/input_options/datetime/base'
 
 module FilterForm
   class InputOptionsBuilder
-    attr_accessor :attribute_name, :object, :custom_predicate, :custom_type
+    attr_accessor :object, :custom_predicate, :custom_type
+    attr_reader :attribute_name
 
     def initialize(options)
-      @attribute_name = options[:attribute_name]
       @object = options[:object]
       @custom_predicate = options[:custom_predicate]
       @custom_type = options[:custom_type]
+      self.attribute_name = options[:attribute_name]
     end
 
 
@@ -26,6 +27,10 @@ module FilterForm
       input_options_class.new(attribute_name: attribute_name, object: object, custom_predicate: custom_predicate, options: options).simple_form_options
     end
 
+    def attribute_name=(new_attribute_name)
+      @attribute_name = new_attribute_name.to_s
+    end
+
   private
 
     def input_options_class
@@ -77,7 +82,7 @@ module FilterForm
       elsif money?
         :money
       else
-        object.klass.columns_hash[attribute_name.to_s].type
+        object.klass.columns_hash[attribute_name].type
       end
     end
   end

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/spec/models/input_options_builder_spec.rb

@@ -8,15 +8,14 @@ describe FilterForm::InputOptionsBuilder do
   let(:builder) { FilterForm::InputOptionsBuilder.new(object: search) }
 
   context 'boolean' do
-    before do
-      builder.attribute_name = :married
-    end
-
     context 'default predicate' do
       it 'returns correct options with predicate "true"' do
-        result  = builder.build
-        options = { as: :boolean, required: false, label: 'MARRIED IS TRUE', input_html: { name: 'q[married_true]', checked: false } }
-        expect(result).to eq(options)
+        builder.attribute_name = :married
+
+        result = builder.build
+
+        expected_result = { as: :boolean, required: false, label: 'MARRIED IS TRUE', input_html: { name: 'q[married_true]', checked: false } }
+        expect(result).to eq(expected_result)
       end
     end
   end
@@ -41,29 +40,27 @@ describe FilterForm::InputOptionsBuilder do
   end
 
   context 'text' do
-    before do
-      builder.attribute_name = :about
-    end
-
     context 'default predicate' do
       it 'returns correct options with predicate "cont"' do
-        result  = builder.build
-        options = { as: :string, required: false, label: 'ABOUT CONTAINS', input_html: { name: 'q[about_cont]' } }
-        expect(result).to eq(options)
+        builder.attribute_name = :about
+
+        result = builder.build
+
+        expected_result = { as: :string, required: false, label: 'ABOUT CONTAINS', input_html: { name: 'q[about_cont]' } }
+        expect(result).to eq(expected_result)
       end
     end
   end
 
   context 'money' do
-    before do
-      builder.attribute_name = :amount
-    end
-
     context 'default predicate' do
       it 'returns correct options with predicate "eq"' do
-        result  = builder.build
-        options = { as: :integer, required: false, label: 'AMOUNT EQUALS', input_html: { name: 'q[amount_eq]', step: 'any' } }
-        expect(result).to eq(options)
+        builder.attribute_name = :amount
+
+        result = builder.build
+
+        expected_result = { as: :integer, required: false, label: 'AMOUNT EQUALS', input_html: { name: 'q[amount_eq]', step: 'any' } }
+        expect(result).to eq(expected_result)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form