bolter 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec99ab0f4a566eef9a9aaba790dd683cf37cb95b
-  data.tar.gz: e6de1200f625cd5a8427158cca89ed5556a0aab4
+  metadata.gz: d60b846bd7d86bed20c7abcb1ade4ace715e683d
+  data.tar.gz: 452b092a56b399b074096dc3d5af6ca904adeedd
 SHA512:
-  metadata.gz: b2c784b730edb31276812828518889f92eda958ad58027e4b15f83689ca3dd1eae36bf68db48d56c3e70893fc00dbe84c1141f297a80b4ba507bb25d67dba65d
-  data.tar.gz: 815bdc59eadb6cc3fac23f8061d425914c2b60f772e4406e7fbdb2aec521a6c5191210c0fd64fb36c87b405ecc87f5f48618173f67c81872aebe0dc25c3bd52b
+  metadata.gz: 5e137b77848fa81ab8f0af2e8d9857f8ebb9e5400d2469beb08eb383cb27c77abda285b5d53c1567e29390523272d460741990660809a7e07b1a281e9e9e8d47
+  data.tar.gz: 72a94638d5a86b8c6cc5927d7033349ec7a8804dd59216e0d20353c19dd927d239a038f937f058a5e90d21218b5c18668c6f28de0c4a0e3dcef65f560ad5be57

data/README.md

@@ -34,10 +34,10 @@ end
 View:
 ```haml
 .search
-    = form_tag books_path, method: :get, id: :search do
-        = fields_for :filters, OpenStruct.new(params[:filters]) do |f|
-            = f.label :with_name, Book.human_attribute_name(:name)
-            = f.text_field :with_name
+    = search_form books_path, id: :search do |f|
+      = f.label :with_name, Book.human_attribute_name(:name)
+      = f.text_field :with_name
+      = f.submit 'Search'
 .index
     %table
         %tr

data/bolter.gemspec

@@ -11,14 +11,15 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{This gem include sorting and filtering methods}
   spec.homepage      = 'http://github.com/jpascal/bolter'
   spec.license       = 'MIT'
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'activerecord'
+  spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'mongoid'
-
-  spec.add_dependency 'activesupport'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'activesupport'
 end

data/lib/bolter/helpers.rb

@@ -1,19 +1,33 @@
 module Bolter
-  module UrlHelpers
-    def sort_link(scope_name, text = nil)
-      sorting = params[:sorting] || "#{scope_name}:asc"
+  module SortHelper
+    def sort_link(scope_name, text = nil, options = {})
+      as = options.fetch(:as, :sorting)
+      sorting = params[as] || "#{scope_name}:asc"
       current_field, direction = sorting.split(':', 2).map(&:to_s)
       direction = direction == 'asc' ? 'desc' : 'asc'
       title = text || scope
-      title = title + "#{direction == 'asc' ? '▲' : '▼'}" if scope_name.to_s == current_field and params[:sorting].present?
-      link_to title.html_safe, url_for(params.merge({:sorting => "#{scope_name}:#{direction}"}))
+      title = title + "#{direction == 'asc' ? '▲' : '▼'}" if scope_name.to_s == current_field and params[as].present?
+      link_to title.html_safe, url_for(params.merge(Hash[as, "#{scope_name}:#{direction}"]))
     end
   end
-  module FormHelpers
-    def self.field_for_filters(name, options = {}, &block)
-      record_object = OpenStruct.new(params[name])
-      builder = instantiate_builder(name, record_object, options)
-      silence(builder, &block)
+  module FormHelper
+    def search_form(url, options = {}, &block)
+      raise ArgumentError, 'Missing block' unless block_given?
+      as = options.fetch(:as, :search)
+      object = OpenStruct.new(params[as])
+      builder = default_form_builder.new(as, object, self, options)
+
+      html_options = options.fetch(:html, {})
+      html_options[:data]   = options.delete(:data)
+      html_options[:remote] = options.fetch(:remote, false)
+      html_options[:method] = options.fetch(:method, :get)
+      html_options[:enforce_utf8] = options.fetch(:enforce_utf8, nil)
+      html_options[:authenticity_token] = options.delete(:authenticity_token)
+      html_options = html_options_for_form(url, html_options)
+
+      output = form_tag_html(html_options)
+      output  << capture(builder, &block)
+      output.safe_concat('</form>')
     end
   end
 end

data/lib/bolter/railtie.rb

@@ -7,8 +7,8 @@ module Bolter
   class Railtie < Rails::Railtie
     initializer 'bolter.initialization' do
       ActiveSupport.on_load(:action_view) do
-        ActionView::Base.send :include, Bolter::FormHelpers
-        ActionView::Base.send :include, Bolter::UrlHelpers
+        ActionView::Base.send :include, Bolter::FormHelper
+        ActionView::Base.send :include, Bolter::SortHelper
       end
 
       ActiveSupport.on_load(:active_record) do

data/lib/bolter/searchable.rb

@@ -24,8 +24,6 @@ module Bolter
         search.each do |name, value|
           if enabled_filters.include?(name.to_s)
             result = result.send(name.to_s, value)
-          else
-            logger.warn "Unknown filter #{self}.#{name}(#{value.inspect})"
           end
         end
         result

data/lib/bolter/version.rb

@@ -1,3 +1,3 @@
 module Bolter
-  VERSION = '0.1.1'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Evgeniy Shurmin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
+  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +101,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -120,9 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: This gem include sorting and filtering methods
 test_files: []
-has_rdoc: