filter_form 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 61f48ddb9a951f24ca2c7f1c637f8c46387ebb63
-  data.tar.gz: a44a6a392a2f1714c06ce37d3eb83f20d8c89e3c
+  metadata.gz: 2d514e906d56ea65624a343c6b63c6443145189d
+  data.tar.gz: 4b527e87032319ec14595dd2d2abfe1679d2bf54
 SHA512:
-  metadata.gz: 912056cb716eabd7eb85bb4182cfbffb18819cc202c396f62b8001c2b3b637b0a124ba7acb788f8c26c49f1499e0696d95a1c3d268551f97359e9291b2e8dc6a
-  data.tar.gz: 612c03cae32f18acf25a6543bc03c33597a442387582b435f08638437a28f092c808b612639e8fe212db3b3dba9e166ae038a3566fcdee9d0a1f42e1a0948a2f
+  metadata.gz: dd9a7f928908891e6ada8e519641653211762b32d75b1024063c674655c8a447552f032d6bb804434ca00040706d08c921ab312e9e3fe006a3b0ab39b82e5f34
+  data.tar.gz: cacb7a8fa03accd3b001f1253b6e794bd6e4a87451c69469703b657dca9badfce293c7d13dc0d323750579d785483970f1685fc0838dee15bffccecce106fa41

data/filter_form.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.0.0'
   spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'pry'
 end

data/lib/filter_form/input_options/base.rb

@@ -70,7 +70,11 @@ module FilterForm
       end
 
       def association
-        object.klass.reflections[attribute_name]
+        if ActiveRecord.try(:version).to_s.to_f >= 4.2
+          object.klass.reflections[attribute_name]
+        else
+          object.klass.reflections[attribute_name.to_sym]
+        end
       end
 
       def current_predicate

data/lib/filter_form/input_options_builder.rb

@@ -69,7 +69,11 @@ module FilterForm
     end
 
     def association?
-      !!object.klass.reflections[attribute_name]
+      if ActiveRecord.try(:version).to_s.to_f >= 4.2
+        !!object.klass.reflections[attribute_name]
+      else
+        !!object.klass.reflections[attribute_name.to_sym]
+      end
     end
 
     def money?

data/lib/filter_form/version.rb

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

data/spec/fixtures/migration.rb

@@ -9,3 +9,8 @@ ActiveRecord::Migration.create_table :users do |t|
   t.integer :city_id
   t.string  :gender
 end
+
+ActiveRecord::Migration.create_table :dog do |t|
+  t.string  :name
+  t.integer :user_id
+end

data/spec/models/input_options_builder_spec.rb

@@ -1,12 +1,27 @@
 require 'spec_helper'
 
 class User < ActiveRecord::Base
+  has_one :dog
+end
+
+class Dog < ActiveRecord::Base
 end
 
 describe FilterForm::InputOptionsBuilder do
   let(:search)  { User.search }
   let(:builder) { FilterForm::InputOptionsBuilder.new(object: search) }
 
+  context 'association' do
+    it 'returns correct options with predicate "select"' do
+      builder.attribute_name = :dog
+
+      result = builder.build
+
+      expected_result = { as: :select, required: false, label: 'Dog EQUALS', input_html: { name: 'q[user_id_eq]' }, include_blank: true, selected: nil }
+      expect(result.except(:collection)).to eq(expected_result)
+    end
+  end
+
   context 'boolean' do
     context 'default predicate' do
       it 'returns correct options with predicate "true"' do

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rails'
+require 'pry'
 require 'action_view'
 require 'active_model'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Evgeny Li
@@ -122,6 +122,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Build filter forms easily
 email:
 - exaspark@gmail.com