mobility-ransack 0.2.2 → 1.0.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fccffc8cd01e9b5ffa2b14855cbdb69179c686ef637b4e1875f05714d12240aa
-  data.tar.gz: 17206ff86d0633b9ba24fe328c479e08d6608c11ebbbce5d820a84ff8d72cdec
+  metadata.gz: f3df672b8192defc4e9888ff5d5e11d8321611a5ed8f14903499e481447d7530
+  data.tar.gz: 656a8ca330a761e02595f58670dce0f9dd7a705192e82d17e7357909cf0b8301
 SHA512:
-  metadata.gz: fceda5efd7e9a0e21b1d2c49e0c53881ad68633c38a30722bf8d19bf8f31f08364a8897754418b7c9ae33321b81e38c37baf552a86f32ded4e63c21e1f30feb0
-  data.tar.gz: bb32ad4495c1091e5dc81e89498ca579f5a24caa98616213c989dd6650c08e1d01c5fe47f911d3e5b312235bb8d8b7990050fa17a922f38829649f3114467771
+  metadata.gz: 7c31d6ddadc41ac4538220aafa399beaf2d99cdb93145ba38d6aa1ca8af276bc817934597c2d85db16edd70c24fbb9922b8382a859441d30b597f8a24667f6cf
+  data.tar.gz: 0dceb9bafd2fc61681afe5fe37b1fdb37c19625749772ca0ad6d91659df9b4c63d3fd76f043fbf7d845a59f42b5c665c6a57d7117439c4cebea7f1d73df6cfb3

data/Gemfile

@@ -6,13 +6,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 group :development, :test do
-  if ENV['RAILS_VERSION'] == '5.1'
-    gem 'rails', '>= 5.1', '< 5.2'
-  elsif ENV['RAILS_VERSION'] == '5.0'
-    gem 'rails', '>= 5.0', '< 5.1'
-  else
-    gem 'rails', '>= 5.2.0.rc2', '< 5.3'
-  end
+  gem 'rails', "~> #{ENV['RAILS_VERSION'] || '6.0'}"
 
   gem 'pry'
   gem 'pry-byebug'

data/Gemfile.lock

@@ -1,168 +1,185 @@
 PATH
   remote: .
   specs:
-    mobility-ransack (0.2.1)
+    mobility-ransack (0.2.2)
       mobility (~> 0.8.0)
-      ransack (>= 1.8.0, < 2.1)
+      ransack (>= 1.8.0, < 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.1)
-      actionpack (= 5.2.1)
+    actioncable (6.0.3.4)
+      actionpack (= 6.0.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
+    actionmailbox (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      mail (>= 2.7.1)
+    actionmailer (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.1)
-      actionview (= 5.2.1)
-      activesupport (= 5.2.1)
-      rack (~> 2.0)
+    actionpack (6.0.3.4)
+      actionview (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1)
-      activesupport (= 5.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.3.4)
+      activesupport (= 6.0.3.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.1)
-      activesupport (= 5.2.1)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.3.4)
+      activesupport (= 6.0.3.4)
       globalid (>= 0.3.6)
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
-      arel (>= 9.0)
-    activestorage (5.2.1)
-      actionpack (= 5.2.1)
-      activerecord (= 5.2.1)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activestorage (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
       marcel (~> 0.3.1)
-    activesupport (5.2.1)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
-    builder (3.2.3)
-    byebug (10.0.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    builder (3.2.4)
+    byebug (11.1.1)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    crass (1.0.4)
-    database_cleaner (1.7.0)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    database_cleaner (1.8.4)
     diff-lcs (1.3)
-    erubi (1.7.1)
-    globalid (0.4.1)
+    erubi (1.9.0)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.0.1)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.2)
+    loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    mobility (0.8.0)
-      i18n (>= 0.6.10, < 1.1)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    mobility (0.8.13)
+      i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
-    nio4r (2.3.1)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    rack (2.0.5)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    polyamorous (2.3.2)
+      activerecord (>= 5.2.1)
+    pry (0.13.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.1)
-      actioncable (= 5.2.1)
-      actionmailer (= 5.2.1)
-      actionpack (= 5.2.1)
-      actionview (= 5.2.1)
-      activejob (= 5.2.1)
-      activemodel (= 5.2.1)
-      activerecord (= 5.2.1)
-      activestorage (= 5.2.1)
-      activesupport (= 5.2.1)
+    rails (6.0.3.4)
+      actioncable (= 6.0.3.4)
+      actionmailbox (= 6.0.3.4)
+      actionmailer (= 6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actiontext (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       bundler (>= 1.3.0)
-      railties (= 5.2.1)
+      railties (= 6.0.3.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.1)
-      actionpack (= 5.2.1)
-      activesupport (= 5.2.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (10.5.0)
-    ransack (2.0.1)
-      actionpack (>= 5.0)
-      activerecord (>= 5.0)
-      activesupport (>= 5.0)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.1)
+    ransack (2.3.2)
+      activerecord (>= 5.2.1)
+      activesupport (>= 5.2.1)
       i18n
-    request_store (1.4.1)
+      polyamorous (= 2.3.2)
+    request_store (1.5.0)
       rack (>= 1.4)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    sprockets (3.7.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.20.0)
+    sqlite3 (1.4.2)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  database_cleaner (~> 1.7.0)
+  database_cleaner (~> 1.7, >= 1.7.0)
   mobility-ransack!
   pry
   pry-byebug
-  rails (>= 5.2.0.rc2, < 5.3)
-  rake (~> 10.0)
-  ransack (~> 2.0.0)
+  rails (~> 6.0)
+  rake (>= 12.3.3)
   rspec (~> 3.0)
-  sqlite3
+  sqlite3 (~> 1.3, >= 1.3.0)
 
 BUNDLED WITH
-   1.16.1
+   2.0.2

data/README.md

@@ -18,7 +18,7 @@ Search on translated attributes with
 Just add the gem to your Gemfile:
 
 ```ruby
-gem 'mobility-ransack', '~> 0.2.1'
+gem 'mobility-ransack', '~> 0.2.2'
 ```
 
 Now enable the `ransack` plugin in Mobility's configuration so that it can be

data/lib/mobility/plugins/ransack.rb

@@ -4,21 +4,28 @@ require "mobility"
 module Mobility
   module Plugins
     module Ransack
+      extend Plugin
+
+      default true
+      requires :backend, include: :before
+      requires :active_record
+
       # Applies ransack plugin.
       # @param [Attributes] attributes
       # @param [Boolean] option
-      def self.apply(attributes, option)
-        if option
-          backend_class, model_class = attributes.backend_class, attributes.model_class
-          attributes.each do |attr|
-            model_class.ransacker(attr) { backend_class.build_node(attr, Mobility.locale) }
+      included_hook do |klass, backend_class|
+        if options[:ransack]
+          names.each do |name|
+            klass.ransacker(name) { backend_class.build_node(name, Mobility.locale) }
           end
-          model_class.extend self
+          klass.extend ClassMethods
         end
       end
 
-      def ransack(*)
-        super.extend(Search)
+      module ClassMethods
+        def ransack(*)
+          super.extend(Search)
+        end
       end
 
       module Search
@@ -35,11 +42,14 @@ module Mobility
         private
 
         def apply_mobility_scope(relation, predicate, attributes)
-          (attributes & object.mobility_attributes).inject(relation) do |i18n_rel, attr|
+          mobility_attributes = attributes.select { |attr| object.mobility_attribute?(attr) }
+          mobility_attributes.inject(relation) do |i18n_rel, attr|
             object.mobility_backend_class(attr).apply_scope(i18n_rel, predicate)
           end
         end
       end
     end
+
+    register_plugin(:ransack, Ransack)
   end
 end

data/lib/mobility/ransack/version.rb

@@ -1,5 +1,5 @@
 module Mobility
   module Ransack
-    VERSION = "0.2.2"
+    VERSION = "1.0.0.alpha"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility-ransack
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0.alpha
 platform: ruby
 authors:
 - Chris Salzberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
@@ -36,28 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 1.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -76,43 +76,43 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.0
-description: 
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+description:
 email:
 - chris@dejimata.com
 executables: []
@@ -132,7 +132,7 @@ homepage: https://github.com/shioyama/mobility-ransack
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -143,13 +143,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Search attributes translated by Mobility with Ransack.
 test_files: []