filter_form 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7dcaf4e227c17f563b101cefe9a484d9fd066d48
-  data.tar.gz: 7bdd04c0838a27f3e04789a51de8b73e0d4b3d80
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWYwNGI3ZjY3OGZhZDIxOGQ5Mzc1N2QxMTBlYWQ2NmUwMTZiMWM0ZQ==
+  data.tar.gz: !binary |-
+    YjlhZjZmNDZmYmNjM2QzMDM0OTE1ZGQzMzkwZDg0NzMxNWY1N2NiMg==
 SHA512:
-  metadata.gz: 2f17dca9f965ebf77df3b5b2c7cbb6982cd706e0f41f20573d24c0076aba27896f769124aefac747d9ff03e401a0d2fb4f5c82a1938fdbaeb175f7c427c0dee7
-  data.tar.gz: ccfbb999edd00621a83ff4e968816572cbab2667ef9c40c340f6205b78ad0568de7e8e305b88963442c1b5e08d2669c1cd23a28b9aef2938b24531933ec82310
+  metadata.gz: !binary |-
+    Y2UzNTJiYjMyM2Y2Y2E4MTAxZWNlYTllZmQ5Y2E5YjRiZjI0NThmZTFiMTZl
+    YzkxOGIxY2U4MzY0ZGE1MjhkZTYyODJiYTg3MDVjZDQ0ZTQ5NmU2NmYwZGM2
+    NzNmOTlmMGE1OGNiMTgyNDhkYjAzZjQ3MDcxMDRiMmQ5NDA4MDU=
+  data.tar.gz: !binary |-
+    MDBkYjkxYTJiNjhmNjJkOTYyZDZkOGUyMTQzNGI4ZDk1YzcxNTNmMjZhZTNk
+    ZTk5MzgzNThiZjJiM2FiOWRmZjliYzhlZWQ2ZmQxNzE0ZTQwYTI2NTg1ODI5
+    Nzk5YjhmZDRhYjZmODE0ZTAzNTc4ZjczMjU4N2Q2ODA4NDA5M2U=

data/README.md

@@ -40,6 +40,7 @@ In your view file:
   <%= f.filter_input :city      # belongs_to %>
   <%= f.filter_input :parents   # has_many   %>
   <%= f.filter_input :amount    # money      %>
+  <%= f.filter_input :gender, as: :check_boxes, collection: [[:male, 'Male'], [:female, 'Female']]   # checkboxes    %>
   <%= f.button :submit %>
 <% end %>
 ```
@@ -56,8 +57,9 @@ In your view file:
      `decimal`       | `decimal`                                       | `eq`                  | `input[type="number"]`    |
      `date`          | `date`                                          | `eq`                  | `input[type="text"]`      |
      `datetime`      | `datetime`                                      | `eq`                  | `input[type="text"]`      |
-     `select`        | `belongs_to`/`has_many`/`has_and_belongs_to_many` associations | `eq`   | `select`                  |
-     `money`         | `money` [monetized](https://github.com/RubyMoney/money-rails) attribute | `eq` | `input[type="number"]` |
+     `select`        | `belongs_to`/`has_many`/`has_and_belongs_to_many` associations  | `eq`  | `select`                  |
+     `money`         | [monetized](https://github.com/RubyMoney/money-rails) attribute | `eq`  | `input[type="number"]`    |
+     `check_boxes`   | `any'                                           | `in`                  | `input[type=checkbox]`    |
 
 ### Customization
 

data/lib/filter_form/input_options/boolean/base.rb

@@ -0,0 +1,20 @@
+module FilterForm
+  module InputOptions
+    module Boolean
+      class Base < FilterForm::InputOptions::Base
+        DEFAULT_PREDICATE = :true
+
+        private
+
+        def additional_options
+          { as: :boolean }
+        end
+
+        def additional_input_options
+          super.merge(checked: !!input_value)
+        end
+      end
+    end
+  end
+end
+

data/lib/filter_form/input_options/checkbox/base.rb

@@ -2,19 +2,19 @@ module FilterForm
   module InputOptions
     module Checkbox
       class Base < FilterForm::InputOptions::Base
-        DEFAULT_PREDICATE = :true
+        include FilterForm::InputOptions::Shared::WithAssociations
+
+        DEFAULT_PREDICATE = :in
 
         private
 
         def additional_options
-          { as: :boolean }
-        end
-
-        def additional_input_options
-          super.merge(checked: !!input_value)
+          {
+            as: :check_boxes,
+            collection: collection
+          }
         end
       end
     end
   end
 end
-

data/lib/filter_form/input_options/select/base.rb

@@ -2,6 +2,8 @@ module FilterForm
   module InputOptions
     module Select
       class Base < FilterForm::InputOptions::Base
+        include FilterForm::InputOptions::Shared::WithAssociations
+
         DEFAULT_PREDICATE = :eq
 
         private
@@ -15,18 +17,6 @@ module FilterForm
           }
         end
 
-        def collection
-          if options[:collection]
-            options[:collection]
-          elsif belongs_to?
-            attribute_name.to_s.camelize.constantize.all
-          elsif collection?
-            attribute_name.to_s.camelize.singularize.constantize.all
-          else
-            object.klass.uniq.pluck(attribute_name)
-          end
-        end
-
         def input_attribute_name
           if association
             "#{ attribute_name }_id"
@@ -42,18 +32,6 @@ module FilterForm
             super
           end
         end
-
-        def association
-          object.klass.reflections[attribute_name]
-        end
-
-        def belongs_to?
-          association && association.belongs_to?
-        end
-
-        def collection?
-          association && association.collection?
-        end
       end
     end
   end

data/lib/filter_form/input_options/shared/with_associations.rb

@@ -0,0 +1,31 @@
+module FilterForm
+  module InputOptions
+    module Shared
+      module WithAssociations
+        def collection
+          if options[:collection]
+            options[:collection]
+          elsif belongs_to?
+            attribute_name.to_s.camelize.constantize.all
+          elsif collection?
+            attribute_name.to_s.camelize.singularize.constantize.all
+          else
+            object.klass.uniq.pluck(attribute_name)
+          end
+        end
+
+        def association
+          object.klass.reflections[attribute_name]
+        end
+
+        def belongs_to?
+          association && association.belongs_to?
+        end
+
+        def collection?
+          association && association.collection?
+        end
+      end
+    end
+  end
+end

data/lib/filter_form/input_options_builder.rb

@@ -1,4 +1,5 @@
 require 'filter_form/input_options/base'
+require 'filter_form/input_options/shared/with_associations'
 
 require 'filter_form/input_options/select/base'
 
@@ -8,6 +9,8 @@ require 'filter_form/input_options/string/date'
 require 'filter_form/input_options/number/base'
 require 'filter_form/input_options/number/money'
 
+require 'filter_form/input_options/boolean/base'
+
 require 'filter_form/input_options/checkbox/base'
 
 module FilterForm
@@ -51,6 +54,8 @@ module FilterForm
       when :select2
         'select/select2'
       when :boolean
+        'boolean/base'
+      when :check_boxes
         'checkbox/base'
       else
         _type

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,14 @@ dependencies:
   name: rake
   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
@@ -111,10 +111,12 @@ files:
 - lib/filter_form.rb
 - lib/filter_form/form_helper.rb
 - lib/filter_form/input_options/base.rb
+- lib/filter_form/input_options/boolean/base.rb
 - lib/filter_form/input_options/checkbox/base.rb
 - lib/filter_form/input_options/number/base.rb
 - lib/filter_form/input_options/number/money.rb
 - lib/filter_form/input_options/select/base.rb
+- lib/filter_form/input_options/shared/with_associations.rb
 - lib/filter_form/input_options/string/base.rb
 - lib/filter_form/input_options/string/date.rb
 - lib/filter_form/input_options_builder.rb
@@ -131,18 +133,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Build your filter forms automatically
 test_files: []
+has_rdoc: