filter_form 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b830a861ee39acd8f2c1b5ed04935ad77f3b509a
-  data.tar.gz: c311699b26fb7f0bca2ef57e6173287121735121
+  metadata.gz: 72ec8aa3c0d7466d80687239848d0e71ac1091a4
+  data.tar.gz: d59e186f531264052324f54ad175fc5cc90a25a0
 SHA512:
-  metadata.gz: 69267fd08e65bbb07f3757f1f37a2d4893c802fb12515a1043c864744d9ef8c7ec7d0f87b2251725c2edf243677fbd627cdce8c3dd337bc3b2271ff4bd97ad05
-  data.tar.gz: 72c09ffcc2dd31f588dd6866f3ad7a7655c3b1e6c414f7000a8879d936046e6784f70dcd86aafdfd4112b841b473ea578b4ad7c0c1244284d9cd7d5ac6bde616
+  metadata.gz: 3ee9bd15ec95c1485d19f8e464a11647ddf35e0b307e77b1fcb67e4088da8c9a33b994424b21a11470aebc2f7cad8871bea64a0c1168eb915ae36fdd7dd02dc9
+  data.tar.gz: 4bebe228358abc58495d3bf955c7cf616d1ad69e21a65fe5205f049e96d10cba5d634f15f84ba3520308af331c4a3f611c85db681fa5ba6c9c4f5a760d206e6c

data/README.md

@@ -47,7 +47,6 @@ In your view file:
      Mapping         | Database Column Type                            | Default predicate     | Generated HTML Element    |
      --------------- |:------------------------------------------------|:----------------------|:--------------------------|
      `string`        | `string`                                        | `cont`                | `input[type=text]`        |
-     `select2`       | `string`                                        | `eq`                  | `select`                  |
      `integer`       | `integer`                                       | `eq`                  | `input[type=text]`        |
      `datetime`      | `datetime`                                      | `eq`                  | `input[type=text]`        |
      `date`          | `date`                                          | `eq`                  | `input[type=text]`        |
@@ -60,7 +59,7 @@ Of course you can customize your filter, like:
 
 ```erb
 <%= filter_form_for @q do |f| %>
-  <%= f.filter_input :title, as: :select2 %>
+  <%= f.filter_input :title, as: :select, in: :select2 %>
   <%= f.filter_input :year, as: :select, collection: (2000..2013).to_a, predicate: :not_eq %>
   <%= f.button :submit %>
 <% end %>

data/lib/filter_form/{inputs → input_options}/base.rb

@@ -1,16 +1,12 @@
 module FilterForm
-  module Inputs
+  module InputOptions
     class Base
       include ActiveModel::Model
 
-      INPUT_CLASS = ''
+      attr_accessor :attribute_name, :object, :predicate, :options
 
-      attr_accessor :attribute_name, :object, :predicate
-
-      def options
-        result = default_options.merge(additional_options)
-        result[:input_html].merge!(additional_input_options)
-        result
+      def simple_form_options
+        default_options.merge(additional_options).merge(options)
       end
 
     private
@@ -18,7 +14,7 @@ module FilterForm
       def default_options
         {
           required:   false,
-          input_html: { name: input_name }
+          input_html: { name: input_name }.merge(additional_input_options).merge(options.delete(:input_html) || {})
         }
       end
 
@@ -27,7 +23,11 @@ module FilterForm
       end
 
       def additional_input_options
-        { class: self.class::INPUT_CLASS }
+        input_class ? { class: input_class } : {}
+      end
+
+      def input_class
+        nil
       end
 
       def input_name

data/lib/filter_form/{inputs → input_options}/select/base.rb

@@ -1,7 +1,7 @@
 module FilterForm
-  module Inputs
+  module InputOptions
     module Select
-      class Base < FilterForm::Inputs::Base
+      class Base < FilterForm::InputOptions::Base
         private
 
         def additional_options
@@ -14,7 +14,11 @@ module FilterForm
         end
 
         def collection
-          object.klass.uniq.pluck(attribute_name)
+          options[:collection] || object.klass.uniq.pluck(attribute_name)
+        end
+
+        def input_class
+          options[:in] == :select2 ? 'filter_form_select2' : super
         end
       end
     end

data/lib/filter_form/{inputs → input_options}/select/belongs_to.rb

@@ -1,7 +1,7 @@
 module FilterForm
-  module Inputs
+  module InputOptions
     module Select
-      class BelongsTo < FilterForm::Inputs::Select::Base
+      class BelongsTo < FilterForm::InputOptions::Select::Base
         private
 
         def object_condition
@@ -9,7 +9,7 @@ module FilterForm
         end
 
         def collection
-          attribute_name.to_s.camelize.constantize.all
+          options[:collection] || attribute_name.to_s.camelize.constantize.all
         end
 
         def input_name

data/lib/filter_form/{inputs → input_options}/string/base.rb

@@ -1,7 +1,7 @@
 module FilterForm
-  module Inputs
+  module InputOptions
     module String
-      class Base < FilterForm::Inputs::Base
+      class Base < FilterForm::InputOptions::Base
         private
 
         def additional_options

data/lib/filter_form/input_options/string/date.rb

@@ -0,0 +1,13 @@
+module FilterForm
+  module InputOptions
+    module String
+      class Date < FilterForm::InputOptions::String::Base
+        private
+
+        def input_class
+          'filter_form_date'
+        end
+      end
+    end
+  end
+end

data/lib/filter_form/{inputs → input_options}/string/money.rb

@@ -1,7 +1,7 @@
 module FilterForm
-  module Inputs
+  module InputOptions
     module String
-      class Money < FilterForm::Inputs::String::Base
+      class Money < FilterForm::InputOptions::String::Base
         private
 
         def input_value

data/lib/filter_form/{input_builder.rb → input_options_builder.rb}

@@ -1,31 +1,34 @@
-require 'filter_form/inputs/base'
+require 'filter_form/input_options/base'
 
-require 'filter_form/inputs/select/base'
-require 'filter_form/inputs/select/belongs_to'
-require 'filter_form/inputs/select/select2'
+require 'filter_form/input_options/select/base'
+require 'filter_form/input_options/select/belongs_to'
 
-require 'filter_form/inputs/string/base'
-require 'filter_form/inputs/string/date'
-require 'filter_form/inputs/string/money'
+require 'filter_form/input_options/string/base'
+require 'filter_form/input_options/string/date'
+require 'filter_form/input_options/string/money'
 
 module FilterForm
-  class InputBuilder
+  class InputOptionsBuilder
     include ActiveModel::Model
 
     attr_accessor :attribute_name, :object, :custom_predicate, :custom_type
 
-    def build
-      input_class.new(attribute_name: attribute_name, object: object, predicate: predicate)
+    def build(options)
+      input_options_class.new(attribute_name: attribute_name, object: object, predicate: predicate, options: options)
     end
 
   private
 
-    def input_class
-      result = "FilterForm::Inputs::#{ "#{ type }".camelize }".constantize
+    def input_options_class
+      result = constantize_input_options_class("#{ type }".camelize)
       raise NameError if result.class == Module
       result
     rescue NameError
-      "FilterForm::Inputs::#{ "#{ type }/base".camelize }".constantize
+      constantize_input_options_class("#{ type }/base".camelize)
+    end
+
+    def constantize_input_options_class(class_name)
+      "FilterForm::InputOptions::#{ class_name }".constantize
     end
 
     def predicate

data/lib/filter_form/simple_form/form_builder.rb

@@ -1,16 +1,16 @@
-require 'filter_form/input_builder'
+require 'filter_form/input_options_builder'
 
 module SimpleForm
   class FormBuilder < ActionView::Helpers::FormBuilder
     def filter_input(attribute_name, options = {}, &block)
-      input_builder = FilterForm::InputBuilder.new attribute_name:   attribute_name,
-                                                   object:           object,
-                                                   custom_type:      options.delete(:as),
-                                                   custom_predicate: options[:predicate]
+      input_options_builder = FilterForm::InputOptionsBuilder.new attribute_name:   attribute_name,
+                                                                  object:           object,
+                                                                  custom_type:      options.delete(:as),
+                                                                  custom_predicate: options.delete(:predicate)
 
-      options.reverse_merge!(input_builder.build.options)
+      filter_form_input_options = input_options_builder.build(options)
 
-      input(attribute_name, options, &block)
+      input(attribute_name, filter_form_input_options.simple_form_options, &block)
     end
   end
 end

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.1.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
@@ -110,14 +110,13 @@ files:
 - lib/assets/stylesheets/filter_form.css.sass
 - lib/filter_form.rb
 - lib/filter_form/form_helper.rb
-- lib/filter_form/input_builder.rb
-- lib/filter_form/inputs/base.rb
-- lib/filter_form/inputs/select/base.rb
-- lib/filter_form/inputs/select/belongs_to.rb
-- lib/filter_form/inputs/select/select2.rb
-- lib/filter_form/inputs/string/base.rb
-- lib/filter_form/inputs/string/date.rb
-- lib/filter_form/inputs/string/money.rb
+- lib/filter_form/input_options/base.rb
+- lib/filter_form/input_options/select/base.rb
+- lib/filter_form/input_options/select/belongs_to.rb
+- lib/filter_form/input_options/string/base.rb
+- lib/filter_form/input_options/string/date.rb
+- lib/filter_form/input_options/string/money.rb
+- lib/filter_form/input_options_builder.rb
 - lib/filter_form/ransack/search.rb
 - lib/filter_form/simple_form/form_builder.rb
 - lib/filter_form/version.rb

data/lib/filter_form/inputs/select/select2.rb

@@ -1,9 +0,0 @@
-module FilterForm
-  module Inputs
-    module Select
-      class Select2 < FilterForm::Inputs::Select::Base
-        INPUT_CLASS = 'filter_form_select2'
-      end
-    end
-  end
-end

data/lib/filter_form/inputs/string/date.rb

@@ -1,9 +0,0 @@
-module FilterForm
-  module Inputs
-    module String
-      class Date < FilterForm::Inputs::String::Base
-        INPUT_CLASS = 'filter_form_date'
-      end
-    end
-  end
-end