bolter 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f077be5f7527087f34a2b3904fc1ef41892ac5e
-  data.tar.gz: e87af41c1e3c37ec7476cbf0c35a3db81f4bd61f
+  metadata.gz: 52578fcf1c9bc72f05c801f76bc2ca6ac39f4770
+  data.tar.gz: fb776fdcc9b125db0b42977011a24df11d7b6d1e
 SHA512:
-  metadata.gz: 972bb1adec38bcff8f0bb16712ec0af16f167a66fc50af9e2c2897608ce4d4ccb47489ff27f2ecb3793a68ac2ca204967d48d0b4f08d08cee55a075cc41dfe51
-  data.tar.gz: cb4fea07d44051b56f52d5e4904fb725f71e39e82ce1ff2c1fcb2c46a938b8c068beb44499a33284ce1c90e4c3ecfc97c0553470e39f7adaf35ef34d62106f01
+  metadata.gz: 3f62de8aa336b4298e03738330dcae5b52ea0635ead54d1e59d4c88c22de9423c6f598e4bd02c6469457a88a20d8952971095d559258c0fbf31a154daaf1272c
+  data.tar.gz: 929f9fa946426da756cd52f78b827ae2ad9645ac8a5d5df62e8f77da83ee727b283fe2bc443f3eb0384e5d99b48cab5ba083c99648585a386ed5cad617c3ef91

data/README.md

@@ -25,7 +25,10 @@ Or install it yourself as:
 Model:
 ```ruby
 class Book < ActiveRecord::Base 
-  filter :with_author, -> (author) {
+  include Bolter::Searchable
+  include Bolter::Sortable
+
+  scope :with_author, -> (author) {
     self.where("author like ?",author)
   }
 end
@@ -52,8 +55,6 @@ Controller:
 @books = Book.search(params[:filters]).sorting(params[:sorting])
 ```
 
-
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/bolter/railtie.rb

@@ -10,18 +10,6 @@ module Bolter
         ActionView::Base.send :include, Bolter::FormHelper
         ActionView::Base.send :include, Bolter::SortHelper
       end
-
-      ActiveSupport.on_load(:active_record) do
-        ActiveRecord::Base.send :include, Bolter::Searchable
-        ActiveRecord::Base.send :include, Bolter::Sortable
-      end
-
-      if defined? ::Mongoid::Document
-        ActiveSupport.on_load(:mongoid) do
-          Mongoid::Document.send :include, Bolter::Searchable
-          Mongoid::Document.send :include, Bolter::Sortable
-        end
-      end
     end
   end
 end

data/lib/bolter/searchable.rb

@@ -2,29 +2,14 @@ module Bolter
   module Searchable
     extend ActiveSupport::Concern
     included do
-      cattr_reader :filters
-    end
-    class_methods do
-      def filter(name, value, &block)
-        @@filters ||= []
-        @@filters << name.to_s
-        scope name.to_sym, value, &block
-      end
-      def search(params = {}, options = {})
-        # Prepare filters
-        enabled_filters = Array(options[:filters] || self.filters).map(&:to_s)
-
-        # Prepare default result
+      cattr_reader :used_as_filters
+      def self.search(params = {}, options = {})
         result = self
-
         # Prepare params to search
         search = (params || {}).clone.reject{|_,value| value.to_s.empty? }
-
         # Apply filters
         search.each do |name, value|
-          if enabled_filters.include?(name.to_s)
-            result = result.send(name.to_s, value)
-          end
+          result = result.send(name.to_s, value) if result.respond_to? name.to_s
         end
         result
       end

data/lib/bolter/version.rb

@@ -1,3 +1,3 @@
 module Bolter
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Evgeniy Shurmin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler