bolter 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 388ad37ede862d5892971b1ba805ee03bf93ddb6
-  data.tar.gz: 33e039682406dfb86420287c258e553d4984330d
+  metadata.gz: ec99ab0f4a566eef9a9aaba790dd683cf37cb95b
+  data.tar.gz: e6de1200f625cd5a8427158cca89ed5556a0aab4
 SHA512:
-  metadata.gz: d1a2ddf0dd73f69f9faeb1d47caf7c9cd35a7b7623bfac1c450b533509ae7bd3a5a4e859ad9f4c135b0b349dee328b5134ed71ef691f1f8887fc33498d0a1106
-  data.tar.gz: 2895c37fbef6c5379166e5f4494debeed3482ef96d76448f937d45df562cde2654353616b6e92afb3a6beef976157d3878126530d09c7a486719b1911179dc8e
+  metadata.gz: b2c784b730edb31276812828518889f92eda958ad58027e4b15f83689ca3dd1eae36bf68db48d56c3e70893fc00dbe84c1141f297a80b4ba507bb25d67dba65d
+  data.tar.gz: 815bdc59eadb6cc3fac23f8061d425914c2b60f772e4406e7fbdb2aec521a6c5191210c0fd64fb36c87b405ecc87f5f48618173f67c81872aebe0dc25c3bd52b

data/README.md

@@ -36,8 +36,8 @@ View:
 .search
     = form_tag books_path, method: :get, id: :search do
         = fields_for :filters, OpenStruct.new(params[:filters]) do |f|
-            = f.label :with_name, EventTarget.human_attribute_name(:name)
-            = f.text_field :with_name, :class => 'form-control'
+            = f.label :with_name, Book.human_attribute_name(:name)
+            = f.text_field :with_name
 .index
     %table
         %tr

data/lib/bolter/searchable.rb

@@ -3,37 +3,32 @@ module Bolter
     extend ActiveSupport::Concern
     included do
       cattr_reader :filters
-      def self.filter(name, value, &block)
+    end
+    class_methods do
+      def filter(name, value, &block)
         @@filters ||= []
         @@filters << name.to_s
         scope name.to_sym, value, &block
       end
-      # options[:filters] - used filters, default for all
-      def self.search(params = {}, options = {})
+      def search(params = {}, options = {})
         # Prepare filters
-        filters = Array(options[:filters] || self.filters).map(&:to_s)
+        enabled_filters = Array(options[:filters] || self.filters).map(&:to_s)
 
         # Prepare default result
-        result = self.scoped
+        result = self
 
         # Prepare params to search
         search = (params || {}).clone.reject{|_,value| value.to_s.empty? }
 
         # Apply filters
         search.each do |name, value|
-          if self.scopes.include? name.to_sym
-            if filters.include? name.to_s
-              result = self.scopes[name.to_sym][:scope].arity == 0 ? result.send(name) : result.send(name, *value)
-            else
-              logger.warn "Skip filter #{self}.#{name}(#{value.inspect})"
-            end
+          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
-
-        # return scope with applied filters
-        return result
+        result
       end
     end
   end

data/lib/bolter/sortable.rb

@@ -2,15 +2,15 @@ module Bolter
   module Sortable
     extend ActiveSupport::Concern
     included do
-      def self.sorting(sorting)
-        return self.scoped unless sorting
+      def self.sorting(sorting = nil)
+        return self unless sorting
         field, direction = sorting.split(':',2)
         if self.attribute_names.include? field.to_s
           if %W[asc desc].include? direction
-            self.scoped.order(Hash[field, direction])
+            return self.order(Hash[field, direction])
           end
         else
-          self.scoped
+          self
         end
       end
     end

data/lib/bolter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Evgeniy Shurmin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -93,8 +93,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - bolter.gemspec
 - lib/bolter.rb
 - lib/bolter/helpers.rb
@@ -127,3 +125,4 @@ signing_key:
 specification_version: 4
 summary: This gem include sorting and filtering methods
 test_files: []
+has_rdoc: 

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "bolter"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here