filter_form 0.7.7 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5c8473bff6527d8fa6c754e72b47cf579fa7847
-  data.tar.gz: 66261f34afff3cab2d578d78bc7faa5e1756a314
+  metadata.gz: af64eb081604349e69bcd198177df4bd0173d6d4
+  data.tar.gz: 1e74b0a772eddb4c921d1d4e0d1dd27faec6fc66
 SHA512:
-  metadata.gz: 41288ef851b55cbccdc2a8a93c42dd2c31a8fd31db2fe6a7d74b76e34bb427ff98deeb0ba2ca172bef60dc05bf4f6927e396ad80118edad685f182d5d9a779e4
-  data.tar.gz: 4a306b75abd009189ad08ea18ca673ff5f8b9f65a0ab8cc69dac6bef6ed22a2b0061b2563099e348acf84b75d3d86fcdea9e7c0ceead13bce5d3e090fc4cffcd
+  metadata.gz: 58e81f2668303be389ed6923b6df01beb1876f76beacb4954c53eefaf66a51a36fae40ca9752b2939bfacb725112a795f255df09fb341c3536eb6172ad112fa9
+  data.tar.gz: c1f82f684619547ff036bbe173193d9485e0ac3045c7bc82de5727664cd6ebcf510aa60b8a1f8002e60ff3351aa6f5c6e0b49a93ae68a3757a0864541d9bb9f6

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+install: "bundle install"
+script: "bundle exec rspec"

data/README.md

@@ -1,4 +1,4 @@
-# FilterForm
+# FilterForm [![Build Status](https://travis-ci.org/exAspArk/filter_form.png)](https://travis-ci.org/exAspArk/filter_form)
 
 Build filter forms easily by using `ransack` and `simple_form`.
 

data/filter_form.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.0.0'
+  spec.add_development_dependency 'sqlite3'
 end

data/lib/filter_form/input_options/base.rb

@@ -1,12 +1,17 @@
 module FilterForm
   module InputOptions
     class Base
-      include ActiveModel::Model
-
       DEFAULT_PREDICATE = nil
 
       attr_accessor :attribute_name, :object, :custom_predicate, :options
 
+      def initialize(options)
+        @attribute_name = options[:attribute_name]
+        @object = options[:object]
+        @custom_predicate = options[:custom_predicate]
+        @options = options[:options]
+      end
+
       def simple_form_options
         default_options.merge(additional_options).merge(options)
       end
@@ -26,7 +31,7 @@ module FilterForm
       end
 
       def additional_input_options
-        result = { name: input_name, data: {} }
+        result = { name: input_name }
 
         if input_class
           if options[:input_html]
@@ -36,8 +41,13 @@ module FilterForm
           end
         end
 
-        result[:data][:predicate_selector] = options[:predicate_selector] if options[:predicate_selector]
-        result[:data][:current_predicate]  = current_predicate            if current_predicate
+        if options[:predicate_selector]
+          result.merge!(data: { predicate_selector: options[:predicate_selector] })
+        end
+
+        if current_predicate
+          result.merge!(data: { current_predicate: current_predicate })
+        end
 
         result
       end

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

@@ -11,7 +11,11 @@ module FilterForm
         end
 
         def additional_input_options
-          super.merge(value: input_value, step: 'any')
+          if input_value
+            super.merge(value: input_value, step: 'any')
+          else
+            super.merge(step: 'any')
+          end
         end
       end
     end

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

@@ -11,7 +11,11 @@ module FilterForm
         end
 
         def additional_input_options
-          super.merge(value: input_value)
+          if input_value
+            super.merge(value: input_value)
+          else
+            super
+          end
         end
       end
     end

data/lib/filter_form/input_options_builder.rb

@@ -15,11 +15,17 @@ require 'filter_form/input_options/checkbox/base'
 
 module FilterForm
   class InputOptionsBuilder
-    include ActiveModel::Model
-
     attr_accessor :attribute_name, :object, :custom_predicate, :custom_type
 
-    def build(options)
+    def initialize(options)
+      @attribute_name = options[:attribute_name]
+      @object = options[:object]
+      @custom_predicate = options[:custom_predicate]
+      @custom_type = options[:custom_type]
+    end
+
+
+    def build(options = {})
       input_options_class.new(attribute_name: attribute_name, object: object, custom_predicate: custom_predicate, options: options).simple_form_options
     end
 

data/lib/filter_form/version.rb

@@ -1,3 +1,3 @@
 module FilterForm
-  VERSION = '0.7.7'
+  VERSION = '0.7.9'
 end

data/spec/fixtures/locale.yml

@@ -0,0 +1,12 @@
+activerecord:
+  attributes:
+    user:
+      married: "MARRIED"
+      name: "NAME"
+      about: "ABOUT"
+      amount: "AMOUNT"
+ransack:
+  predicates:
+    'true': "IS TRUE"
+    cont: "CONTAINS"
+    eq: "EQUALS"

data/spec/fixtures/migration.rb

@@ -0,0 +1,11 @@
+ActiveRecord::Migration.create_table :users do |t|
+  t.boolean :married
+  t.string  :name
+  t.text    :about
+  t.integer :amount_cents, default: 0
+  t.string  :amount_currency, default: 'USD'
+  t.integer :age
+  t.date    :birthday
+  t.integer :city_id
+  t.string  :gender
+end

data/spec/models/input_options_builder_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+class User < ActiveRecord::Base
+end
+
+describe FilterForm::InputOptionsBuilder do
+  let(:search)  { User.search }
+  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)
+      end
+    end
+  end
+
+  context 'string' do
+    before do
+      builder.attribute_name = :name
+    end
+
+    context 'default predicate' do
+      it 'returns correct options with predicate "cont"' do
+        result  = builder.build
+        options = { as: :string, required: false, label: 'NAME CONTAINS', input_html: { name: 'q[name_cont]' } }
+        expect(result).to eq(options)
+      end
+    end
+  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)
+      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)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+require 'rails'
+require 'action_view'
+require 'active_model'
+
+require 'support/active_record'
+
+require 'filter_form'
+
+RSpec.configure do |config|
+  config.color = true
+  config.tty = true
+  config.order = :random
+end
+
+I18n.backend.store_translations(:test, YAML::load_file('spec/fixtures/locale.yml'))
+I18n.enforce_available_locales = false
+I18n.default_locale = :test

data/spec/support/active_record.rb

@@ -0,0 +1,14 @@
+require 'active_record'
+
+ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
+
+require 'fixtures/migration'
+
+RSpec.configure do |config|
+  config.around do |example|
+    ActiveRecord::Base.transaction do
+      example.run
+      raise ActiveRecord::Rollback
+    end
+  end
+end

metadata

@@ -1,97 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: filter_form
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.9
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-07-02 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
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   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'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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
@@ -101,6 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -123,6 +152,11 @@ files:
 - lib/filter_form/money_converter.rb
 - lib/filter_form/simple_form/form_builder.rb
 - lib/filter_form/version.rb
+- spec/fixtures/locale.yml
+- spec/fixtures/migration.rb
+- spec/models/input_options_builder_spec.rb
+- spec/spec_helper.rb
+- spec/support/active_record.rb
 homepage: https://github.com/exAspArk/filter_form
 licenses:
 - MIT
@@ -133,18 +167,24 @@ 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.2.2
 signing_key: 
 specification_version: 4
 summary: Build your filter forms automatically
-test_files: []
+test_files:
+- spec/fixtures/locale.yml
+- spec/fixtures/migration.rb
+- spec/models/input_options_builder_spec.rb
+- spec/spec_helper.rb
+- spec/support/active_record.rb
+has_rdoc: