might 0.7.0 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a99e1e236e472a2f44627590833f038129a24b8b
-  data.tar.gz: 4d73b4d2dc3a555a946a3335baa5eb125b1efe13
+SHA256:
+  metadata.gz: f869b4b6ee90b6e24eb8cc2536525a038cff9d26d921a9f9f94c93d24a971249
+  data.tar.gz: 2fbed37817a64752e22bb725d365408c7e8355d111a4ee60954cecbe9e237a43
 SHA512:
-  metadata.gz: 9725439777f374fe441cee6b05bdfd69fd836fb18a8776141eab222c99c28c128658de13e83aaa174cc8f5d6c9b1284b0bfe433818ded81c47d974f9ad63513f
-  data.tar.gz: 86ff8d294343e2917804b38c1551a364245d6eba9784eed5e63f52863dc9c8a60e30e8254281da17d52c34bac6da6e83094ec3c25d7c47ab1c37b34c98053541
+  metadata.gz: 3f8b92843b3c52236ac5052c38105cdeeb0045d5b007a11958f985511a8d6abd5434c2755bfbd709ac912e9aa55fc3d0097e9d8d3806af89ddc3e27e01b45c94
+  data.tar.gz: 4d62a98391fbeb6ac6d04ab0a158847f9b988f6a39c50b5236bcf59dc0a53e705991fac0a91198ea9e738d7bebd429acdd2de7df633f0aa0a92874b4c440b4c2

data/.codeclimate.yml

@@ -0,0 +1,19 @@
+---
+engines:
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+  fixme:
+    enabled: true
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+  - "**.rb"
+exclude_paths:
+- bin/**/*
+- config/**/*
+- gemfiles/**/*
+- spec/**/*

data/.rubocop.yml

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

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+**0.7.2**
+
+  * Use `autoload` instead of explicit `require` and `require_relative`.
+
 **0.7.0**
 
   * Allow to pass block to `FilterParameter#fetch` to customize not found behaviour.

data/Gemfile

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in might.gemspec
 gemspec
 
-gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'codeclimate-test-reporter', '1.0.4', group: :test, require: nil

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'might'

data/lib/might.rb

@@ -1,4 +1,49 @@
+# frozen_string_literal: true
+require 'set'
+require 'forwardable'
+require 'active_model'
+require 'active_support'
+require 'active_support/dependencies/autoload'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/object/blank'
+require 'active_support/concern'
+require 'active_support/callbacks'
+require 'middleware'
+require 'uber/inheritable_attr'
+
 # Top level namespace for mighty fetchers
 module Might
   require 'might/version'
+  extend ActiveSupport::Autoload
+
+  autoload :Fetcher
+  autoload :FetcherError
+  autoload :FilterMiddleware
+  autoload :FilterParameter
+  autoload :FilterParameterDefinition
+  autoload :FilterParameters
+  autoload :FilterParametersExtractor
+  autoload :FilterParametersValidator
+  autoload :FilterPredicates
+  autoload :FilterUndefinedParameter
+  autoload :FilterValueValidator
+  autoload :PaginationMiddleware
+  autoload :PaginationParametersValidator
+  autoload :Paginator
+  autoload :RansackableFilter
+  autoload :RansackableFilterParametersAdapter
+  autoload :RansackableSort
+  autoload :RansackableSortParametersAdapter
+  autoload :Result
+  autoload :Failure, 'might/result'
+  autoload :Success, 'might/result'
+  autoload :SortMiddleware
+  autoload :SortParameter
+  autoload :FilterUndefinedParameter
+  autoload :SortParameterDefinition
+  autoload :SortParametersExtractor
+  autoload :SortParametersValidator
+  autoload :SortUndefinedParameter
+  autoload :SortValueValidator
+  autoload :VERSION
 end

data/lib/might/fetcher.rb

@@ -1,19 +1,4 @@
-require 'might/filter_parameters'
-require 'might/sort_parameters_extractor'
-require 'might/sort_parameters_validator'
-require 'might/filter_parameters_extractor'
-require 'might/filter_parameters_validator'
-require 'might/pagination_parameters_validator'
-
-require 'might/filter_middleware'
-require 'might/sort_middleware'
-require 'might/pagination_middleware'
-
-require 'might/result'
-require 'uber/inheritable_attr'
-require 'middleware'
-
-#
+# frozen_string_literal: true
 module Might
   # Configure your own fetcher
   #
@@ -68,7 +53,7 @@ module Might
 
     # @param params [Hash]
     def initialize(params)
-      @params = params
+      @params = params.with_indifferent_access
     end
 
     # @return [Might::Result] filtered and sorted collection
@@ -227,8 +212,9 @@ module Might
       #     end
       #   end
       #
-      def after(&block)
-        alter_middleware(:use, &block)
+      def after(middleware_or_index = nil, &block)
+        args = middleware_or_index ? [:insert_after, middleware_or_index] : [:use]
+        alter_middleware(*args, &block)
       end
 
       # Add middleware to the beginning of middleware chane

data/lib/might/fetcher_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Might
   class FetcherError < StandardError
   end

data/lib/might/filter_middleware.rb

@@ -1,7 +1,4 @@
-require_relative 'ransackable_filter'
-require_relative 'ransackable_filter_parameters_adapter'
-require 'middleware'
-#
+# frozen_string_literal: true
 module Might
   # Filter scope using ransack gem
   #

data/lib/might/filter_parameter.rb

@@ -1,6 +1,4 @@
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/object/blank'
-
+# frozen_string_literal: true
 module Might
   # User provided filtering on particular parameter
   #

data/lib/might/filter_parameter_definition.rb

@@ -1,7 +1,4 @@
-require 'active_support/core_ext/module/delegation'
-require_relative 'filter_predicates'
-require_relative 'filter_value_validator'
-
+# frozen_string_literal: true
 module Might
   # Filtering parameter definition
   #

data/lib/might/filter_parameters.rb

@@ -1,6 +1,4 @@
-require 'set'
-require 'forwardable'
-
+# frozen_string_literal: true
 module Might
   #
   class FilterParameters
@@ -17,6 +15,18 @@ module Might
       @parameters = Set.new(parameters)
     end
 
+    # Dup internal set.
+    def initialize_dup(orig)
+      super
+      @parameters = orig.parameters.dup
+    end
+
+    # Clone internal set.
+    def initialize_clone(orig)
+      super
+      @parameters = orig.parameters.clone
+    end
+
     # Find filter by name
     # @param name [String]
     # @return [Might::FilterParameter, nil]

data/lib/might/filter_parameters_extractor.rb

@@ -1,8 +1,4 @@
-require_relative 'filter_predicates'
-require_relative 'filter_undefined_parameter'
-require_relative 'filter_parameter'
-require_relative 'filter_parameters'
-
+# frozen_string_literal: true
 module Might
   # User provided filters syntax:
   #   * `{ 'name_eq' => 'Martin' }` - name is equal to Martin

data/lib/might/filter_parameters_validator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Might
   # Validates filters and raises error if one of them is invalid
   #

data/lib/might/filter_predicates.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Might
   # Contains contains with all supported predicates
   # You can register your own predicates. Predicates should perform on array or on singular value:
@@ -6,32 +7,32 @@ module Might
   #   Might::FilterPredicates.register('is_upper_case', on: :value)
   #
   module FilterPredicates
-    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
+    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'
 
     @predicates_on_value = Set.new([
       NOT_EQ, EQ,

data/lib/might/filter_undefined_parameter.rb

@@ -1,5 +1,4 @@
-require_relative 'filter_parameter_definition'
-
+# frozen_string_literal: true
 module Might
   # Null object for ParameterDefinition
   #

data/lib/might/filter_value_validator.rb

@@ -1,12 +1,4 @@
-require 'active_support'
-require 'active_support/core_ext/module/delegation'
-require 'active_model/validator'
-require 'active_model/validations'
-require 'active_model/naming'
-require 'active_model/callbacks'
-require 'active_model/translation'
-require 'active_model/errors'
-
+# frozen_string_literal: true
 module Might
   # Build singleton validation class for specified attribute name
   # @example you need a nice validator for a first_name
@@ -30,7 +22,7 @@ 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? }
 

data/lib/might/pagination_middleware.rb

@@ -1,6 +1,4 @@
-# require_relative 'validator'
-require 'might/paginator'
-
+# frozen_string_literal: true
 module Might
   # Pagination middleware
   #

data/lib/might/pagination_parameters_validator.rb

@@ -1,13 +1,4 @@
-require 'active_support/concern'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/callbacks'
-require 'active_model/naming'
-require 'active_model/validator'
-require 'active_model/callbacks'
-require 'active_model/translation'
-require 'active_model/errors'
-require 'active_model/validations'
-
+# frozen_string_literal: true
 module Might
   #
   class PaginationParametersValidator

data/lib/might/paginator.rb

@@ -1,5 +1,4 @@
-# require 'active_support/core_ext/hash/keys'
-
+# frozen_string_literal: true
 module Might
   # Paginates ActiveRecord scopes
   # @example

data/lib/might/railtie.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 require 'rails/railtie'
 
-#
 module Might
   # Load railtie to get translations
   class Railtie < Rails::Railtie

data/lib/might/ransackable_filter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Might
   #
   class RansackableFilter

data/lib/might/ransackable_filter_parameters_adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Might
   # Converts array of parameters to hash familiar to ransack gem
   #

data/lib/might/ransackable_sort.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Might
   # Sort scope
   class RansackableSort

data/lib/might/ransackable_sort_parameters_adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Might
   # Converts array of parameters to hash familiar to ransack gem
   #

data/lib/might/result.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Might
   # Marker module
   module Result

data/lib/might/sort_middleware.rb

@@ -1,8 +1,4 @@
-require 'might/ransackable_sort_parameters_adapter'
-require 'might/ransackable_sort'
-require 'might/sort_parameters_extractor'
-require 'middleware'
-
+# frozen_string_literal: true
 module Might
   # Sort scope using ransack gem
   #

data/lib/might/sort_parameter.rb

@@ -1,5 +1,4 @@
-require 'active_support/core_ext/module/delegation'
-
+# frozen_string_literal: true
 module Might
   # User provided filtering on particular parameter
   #

data/lib/might/sort_parameter_definition.rb

@@ -1,5 +1,4 @@
-require_relative 'sort_value_validator'
-
+# frozen_string_literal: true
 module Might
   # Sorting parameter definition
   #
@@ -24,11 +23,11 @@ module Might
       @reverse_direction = reverse_direction
     end
 
-    # If two parameters have the same name, they are equal.
-    delegate :hash, to: :name
+    # If two parameters have the same outer name, they are equal.
+    delegate :hash, to: :as
 
     def eql?(other)
-      other.is_a?(self.class) && other.name == name
+      other.is_a?(self.class) && other.as == as
     end
 
     def ==(other)

data/lib/might/sort_parameters_extractor.rb

@@ -1,6 +1,4 @@
-require 'might/sort_undefined_parameter'
-require 'might/sort_parameter'
-
+# frozen_string_literal: true
 module Might
   # User provided sorting syntax:
   #   * `name` - sort by name

data/lib/might/sort_parameters_validator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Might
   # Validates sortings and raises error if one of them is invalid
   #

data/lib/might/sort_undefined_parameter.rb

@@ -1,5 +1,4 @@
-require 'might/sort_parameter_definition'
-
+# frozen_string_literal: true
 module Might
   # Null object for ParameterDefinition
   #

data/lib/might/sort_value_validator.rb

@@ -1,12 +1,4 @@
-require 'active_support'
-require 'active_support/core_ext/module/delegation'
-require 'active_model/validator'
-require 'active_model/validations'
-require 'active_model/callbacks'
-require 'active_model/naming'
-require 'active_model/translation'
-require 'active_model/errors'
-
+# frozen_string_literal: true
 module Might
   # Build singleton validation class for specified attribute name
   # @example you need a nice validator for a first_name
@@ -29,7 +21,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 @@
-#
+# frozen_string_literal: true
 module Might
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.5'
 end

data/might.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'might/version'
@@ -26,9 +27,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'ransack', '>= 1.6.6'
   spec.add_development_dependency 'activerecord', '>= 3.2', '< 6.0.0'
   spec.add_development_dependency 'sqlite3', '~> 1.3.11'
-  spec.add_development_dependency 'bundler', '~> 1.12.5'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 11.2.2'
   spec.add_development_dependency 'rspec', '~> 3.5.0'
   spec.add_development_dependency 'spbtv_code_style', '1.4.1'
   spec.add_development_dependency 'appraisal', '2.1.0'
+  spec.add_development_dependency 'rubocop', '0.40.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: might
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.5
 platform: ruby
 authors:
 - Tema Bolshakov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -118,16 +118,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.40.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.40.0
 description: Mighty resource fetchers build on top of Ransack gem
 email:
 - abolshakov@spbtv.com
@@ -191,6 +205,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
@@ -259,9 +274,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Mighty resource fetchers
 test_files: []
-has_rdoc: