might 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad96c2f9fdfbd6c5dcd9d741d9ca5dc7de704ebb
-  data.tar.gz: a2f69450d6b65032942bc95236226aba5710f9a1
+  metadata.gz: 16724ee40371d468bd5a932a35a100ae39bff05b
+  data.tar.gz: 1211d23fcfb3043dc2da35000d0c500da5b5c2bf
 SHA512:
-  metadata.gz: 435e9bacc6502d9d718259716584c07f4685e0c07a6b972cbb7e6af1c6008d5f11bdda84fee7513efb10c43fa40aaf214a88175a6b92848a1097c96022d62cdd
-  data.tar.gz: b18938e5e5f207e76c2112048465d6e7552dc73e861572a7b1589b05ce273c5732910aa9e50a6f113614c6c058f78eec9eca1d0e87fbf6ef06b66e69e90769a0
+  metadata.gz: 1f218d738eab33a02c2b62072fe1cb23cce557ccca6752386892877d41c33f96cabcd35b50161d6d6894b12ae8cd950ea7277a4e362b35ddf8a90f1b8e38684a
+  data.tar.gz: eae9d9eb274fc4a539db1457e2f990adcedc73c1d4b2c8aa649c5345bb2e266653a17bb7e2cb91baae3b0406f52356e0ded177d44baa069dc793aec3ad0d529e

data/.rubocop.yml

@@ -1,3 +1,5 @@
+AllCops:
+  TargetRubyVersion: 2.1
 inherit_gem:
   spbtv_code_style: .rubocop.yml
 

data/.travis.yml

@@ -1,6 +1,7 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.1.5
   - 2.2.2
   - 2.2.3
   - ruby-head

data/lib/might/fetcher.rb

@@ -51,7 +51,7 @@ module Might
   #
   #     sort :position, as: :relevance, reverse_direction: true
   #
-  class Fetcher
+  class Fetcher # rubocop:disable Metrics/ClassLength
     extend Uber::InheritableAttr
 
     inheritable_attr :resource_class
@@ -71,7 +71,7 @@ module Might
       @params = params
     end
 
-    # @return [ActiveRecord::Result] filtered and sorted collection
+    # @return [Might::Result] filtered and sorted collection
     # @yieldparam collection [Result] if a block given
     #
     # @example
@@ -91,8 +91,7 @@ module Might
       result = if errors.any?
                  Failure.new(errors)
                else
-                 processed_collection, = middleware.call([collection, processed_params])
-                 Success.new(processed_collection)
+                 Success.new(fetch(processed_params))
                end
 
       if block_given?
@@ -104,14 +103,38 @@ module Might
 
     private
 
+    # @param parsed_params [Hash]
     # @return [ActiveRecord::Relation]
-    def collection
-      self.class.resource_class.all
+    # @api public
+    # This method may be overridden to implement integration with library other than Ransack
+    #
+    def fetch(parsed_params)
+      collection, = middleware.call([self.class.resource_class, parsed_params])
+      collection
+    end
+
+    # @return [Hash, Array] tuple of parameters and processing errors
+    #   this errors may be shown to front-end developer
+    # @api public
+    def process_params(params)
+      process_params_middleware.call([params, []])
+    end
+
+    # Library params processing middleware stack
+    # @return [Middleware::Builder]
+    def process_params_middleware
+      Middleware::Builder.new do |b|
+        b.use FilterParametersExtractor, self.class.filter_parameters_definition
+        b.use FilterParametersValidator
+        b.use SortParametersExtractor, self.class.sort_parameters_definition
+        b.use SortParametersValidator
+        b.use PaginationParametersValidator
+      end
     end
 
     # Library middleware stack
     # @return [Middleware::Builder]
-    def default_middleware
+    def fetch_middleware
       Middleware::Builder.new do |b|
         b.use FilterMiddleware
         b.use SortMiddleware
@@ -122,25 +145,13 @@ module Might
     # User modified middleware stack
     # @return [Middleware::Builder]
     def middleware
-      default_middleware.tap do |builder|
+      fetch_middleware.tap do |builder|
         self.class.middleware_changes.each do |change|
           builder.instance_eval(&change)
         end
       end
     end
 
-    # @return [Hash, Array] tuple of parameters and processing errors
-    #   this errors may be shown to front-end developer
-    def process_params(params)
-      Middleware::Builder.new do |b|
-        b.use FilterParametersExtractor, self.class.filter_parameters_definition
-        b.use FilterParametersValidator
-        b.use SortParametersExtractor, self.class.sort_parameters_definition
-        b.use SortParametersValidator
-        b.use PaginationParametersValidator
-      end.call([params, []])
-    end
-
     class << self
       # Alter middleware chain with the given block
       # @param [Proc] change
@@ -235,12 +246,11 @@ module Might
 
       private
 
-      def alter_middleware(method_name, *args, &block)
+      def alter_middleware(method_name, *args)
         fail ArgumentError unless block_given?
         middleware_changes.push lambda { |builder|
           builder.send method_name, *args, lambda { |env|
-            scope, params = env
-            block.call(scope, params).tap do |r|
+            yield(*env).tap do |r|
               if !r.is_a?(Array) || r.size != 2
                 fail 'After block must return tuple of scope and params'
               end

data/lib/might/filter_parameter_definition.rb

@@ -71,7 +71,7 @@ module Might
     end
 
     def undefined?
-      !self.defined?
+      !self.defined? # rubocop:disable Style/RedundantSelf
     end
 
     # Proc with defined validations

data/lib/might/filter_predicates.rb

@@ -2,32 +2,32 @@ module Might
   # Contains contains with all supported predicates
   #
   module FilterPredicates
-    NOT_EQ = 'not_eq'
-    EQ = 'eq'
-    DOES_NOT_MATCH = 'does_not_match'
-    MATCHES = 'matches'
-    GT = 'gt'
-    LT = 'lt'
-    GTEQ = 'gteq'
-    LTEQ = 'lteq'
-    NOT_CONT = 'not_cont'
-    CONT = 'cont'
-    NOT_START = 'not_start'
-    START = 'start'
-    DOES_NOT_END = 'not_end'
-    ENDS = 'end'
-    NOT_TRUE = 'not_true'
-    TRUE = 'true'
-    NOT_FALSE = 'not_false'
-    FALSE = 'false'
-    BLANK = 'blank'
-    PRESENT = 'present'
-    NOT_NULL = 'not_null'
-    NULL = 'null'
-    NOT_IN = 'not_in'
-    IN = 'in'
-    NOT_CONT_ANY = 'not_cont_any'
-    CONT_ANY = 'cont_any'
+    NOT_EQ = 'not_eq'.freeze
+    EQ = 'eq'.freeze
+    DOES_NOT_MATCH = 'does_not_match'.freeze
+    MATCHES = 'matches'.freeze
+    GT = 'gt'.freeze
+    LT = 'lt'.freeze
+    GTEQ = 'gteq'.freeze
+    LTEQ = 'lteq'.freeze
+    NOT_CONT = 'not_cont'.freeze
+    CONT = 'cont'.freeze
+    NOT_START = 'not_start'.freeze
+    START = 'start'.freeze
+    DOES_NOT_END = 'not_end'.freeze
+    ENDS = 'end'.freeze
+    NOT_TRUE = 'not_true'.freeze
+    TRUE = 'true'.freeze
+    NOT_FALSE = 'not_false'.freeze
+    FALSE = 'false'.freeze
+    BLANK = 'blank'.freeze
+    PRESENT = 'present'.freeze
+    NOT_NULL = 'not_null'.freeze
+    NULL = 'null'.freeze
+    NOT_IN = 'not_in'.freeze
+    IN = 'in'.freeze
+    NOT_CONT_ANY = 'not_cont_any'.freeze
+    CONT_ANY = 'cont_any'.freeze
 
     ON_VALUE = [
       NOT_EQ, EQ,
@@ -41,12 +41,12 @@ module Might
       NOT_FALSE, FALSE,
       BLANK, PRESENT,
       NOT_NULL, NULL
-    ]
+    ].freeze
 
     ON_ARRAY = [
       NOT_IN, IN,
       NOT_CONT_ANY, CONT_ANY
-    ]
+    ].freeze
 
     ALL = ON_VALUE + ON_ARRAY
   end

data/lib/might/filter_value_validator.rb

@@ -30,11 +30,11 @@ module Might
         include ActiveModel::Validations
 
         validates(definition.as, definition.validations) if definition.validations.present?
-        validates(definition.as, 'might/filter_value_validator/defined': true)
+        validates(definition.as, :'might/filter_value_validator/defined' => true)
 
         define_method(:undefined?) { definition.undefined? }
 
-        def self.model_name
+        define_singleton_method :model_name do
           ActiveModel::Name.new(Might, nil, 'Might')
         end
       end

data/lib/might/ransackable_filter_parameters_adapter.rb

@@ -10,7 +10,7 @@ module Might
       scope, params = env
 
       ransackable_parameters = Array(params[:filter]).reject { |f| f.predicate.nil? }
-                               .each_with_object({}) do |filter, ransackable_filters|
+                                                     .each_with_object({}) do |filter, ransackable_filters|
         ransackable_filters[canonical_name_for(filter)] = filter.value
       end
 

data/lib/might/sort_parameter_definition.rb

@@ -37,7 +37,7 @@ module Might
         other.as == as
     end
 
-    alias_method :reverse_direction?, :reverse_direction
+    alias reverse_direction? reverse_direction
 
     def validator
       SortValueValidator.build(self).new
@@ -48,7 +48,7 @@ module Might
     end
 
     def undefined?
-      !self.defined?
+      !self.defined? # rubocop:disable Style/RedundantSelf
     end
   end
 end

data/lib/might/sort_value_validator.rb

@@ -29,7 +29,7 @@ module Might
       Class.new do
         include ActiveModel::Validations
 
-        validates(definition.name, 'might/sort_value_validator/defined': true)
+        validates(definition.name, :'might/sort_value_validator/defined' => true)
 
         define_method(:undefined?) { definition.undefined? }
         define_method(definition.name) {}

data/lib/might/version.rb

@@ -1,4 +1,4 @@
 #
 module Might
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'.freeze
 end

data/might.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.3'
-  spec.add_development_dependency 'spbtv_code_style'
+  spec.add_development_dependency 'spbtv_code_style', '~> 1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: might
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Tema Bolshakov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -154,16 +154,16 @@ dependencies:
   name: spbtv_code_style
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.3
 description: Mighty resource fetchers build on top of Ransack gem
 email:
 - abolshakov@spbtv.com