mobility-ransack 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e2b2fb4a83837ab504f3094122475e7f3dd47370419e475553eb6a50dcd32b6
-  data.tar.gz: afbe3bacb2c1acbf5d2e83f07c72e03f51ff02aab08b1de8e00f59ecb4ba06b8
+  metadata.gz: 1875d7ec16b978a380c59ff6d7422537e860dbe797fb44755d1659b55121c11a
+  data.tar.gz: a489d834de55dd89265b787c858d799ba77040e24d929329f0fa4f684f0c4da1
 SHA512:
-  metadata.gz: 9746d4b0acf3509a5080bfc091b364cc4774b4e62e2c43824f68c286f5c2d2c3776f31024b5b13d113d2b1324abba4745f5b8cba2bb31d0927f86a572f87582f
-  data.tar.gz: a17f31df6addb9f42a6c22e0a081746dc9a07d67538596588801bab37d2ce210105921e3193e1019c1b4bbab99d895965e6994d6ee90e1d0c45ddf068a89fc44
+  metadata.gz: 4c13a01c141709e58e5061461dad39f4239c3d71e3f15bed3894bb59f11b6b15d1c0423bcd4008f6382abb40200dcf11d2a08d95227c3a5716436e370876180e
+  data.tar.gz: 373dbc15c6dd9690b6672c160761dfd91977ebe99808f1457b37c4cae056f19231b3c1e6b5dedd345965591949a1c0ad81cfb9d05570c32d3400d40beb1c05fe

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Mobility Ransack Changelog
 
+## 1.1
+
+### 1.2.0
+- [Add compatibility with rails
+  7+](https://github.com/shioyama/mobility-ransack/pull/22), thanks
+  [mhenrixon](https://github.com/mhenrixon)!
+- [Update mobility-ransack.gemspec](https://github.com/shioyama/mobility-ransack/pull/23),
+  thanks [kevynlebouille](https://github.com/kevynlebouille)!
+
+### 1.1.0
+- Make MobilityRansack handle associations correctly
+  ([#20](https://github.com/shioyama/mobility-ransack/pull/20))
+
+## 1.0
+
+### 1.0.1
+- Update gemspec to support Mobility 1.x
+  ([#17](https://github.com/shioyama/mobility-ransack/pull/17))
+
+### 1.0.0
+- Enable Mobility 1.x compatibility
+  ([#10](https://github.com/shioyama/mobility-ransack/pull/10))
+
 ## 0.2
 
 ### 0.2.2

data/Gemfile

@@ -6,7 +6,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 group :development, :test do
-  gem 'rails', "~> #{ENV['RAILS_VERSION'] || '6.0'}"
+  gem 'rails', "~> #{ENV['RAILS_VERSION'] || '6.1'}.0"
 
   gem 'pry'
   gem 'pry-byebug'

data/Gemfile.lock

@@ -1,135 +1,141 @@
 PATH
   remote: .
   specs:
-    mobility-ransack (1.0.0)
-      mobility (~> 1.0.0)
+    mobility-ransack (1.1.0)
+      mobility (>= 1.0.1, < 2.0)
       ransack (>= 1.8.0, < 3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.4)
-      actionpack (= 6.0.3.4)
+    actioncable (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.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)
+    actionmailbox (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
+    actionmailer (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.4)
-      actionview (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.3.2)
+      actionview (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       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)
+    actiontext (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionview (6.1.3.2)
+      activesupport (= 6.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    activejob (6.1.3.2)
+      activesupport (= 6.1.3.2)
       globalid (>= 0.3.6)
-    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 (6.0.3.4)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activerecord (6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activestorage (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      marcel (~> 1.0.0)
+      mini_mime (~> 1.0.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     builder (3.2.4)
     byebug (11.1.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
     database_cleaner (1.8.4)
     diff-lcs (1.3)
-    erubi (1.9.0)
+    erubi (1.10.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.7.0)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.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 (1.0.0)
+    mini_mime (1.0.3)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
+    mobility (1.1.2)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
-    nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nio4r (2.5.7)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogiri (1.11.7-x86_64-linux)
+      racc (~> 1.4)
     pry (0.13.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    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 (= 6.0.3.4)
+    rails (6.1.3.2)
+      actioncable (= 6.1.3.2)
+      actionmailbox (= 6.1.3.2)
+      actionmailer (= 6.1.3.2)
+      actionpack (= 6.1.3.2)
+      actiontext (= 6.1.3.2)
+      actionview (= 6.1.3.2)
+      activejob (= 6.1.3.2)
+      activemodel (= 6.1.3.2)
+      activerecord (= 6.1.3.2)
+      activestorage (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
+      bundler (>= 1.15.0)
+      railties (= 6.1.3.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    railties (6.1.3.2)
+      actionpack (= 6.1.3.2)
+      activesupport (= 6.1.3.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      thor (~> 1.0)
     rake (13.0.1)
-    ransack (2.4.0)
+    ransack (2.4.2)
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
       i18n
@@ -156,27 +162,28 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.3)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    websocket-driver (0.7.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   database_cleaner (~> 1.7, >= 1.7.0)
   mobility-ransack!
   pry
   pry-byebug
-  rails (~> 6.0)
+  rails (~> 6.1.0)
   rake (>= 12.3.3)
+  ransack (= 2.4.2)
   rspec (~> 3.0)
   sqlite3 (~> 1.3, >= 1.3.0)
 
 BUNDLED WITH
-   2.0.2
+   2.2.2

data/README.md

@@ -18,12 +18,9 @@ Search on translated attributes with
 Just add the gem to your Gemfile:
 
 ```ruby
-gem 'mobility-ransack', '~> 1.0.0'
+gem 'mobility-ransack', '~> 1.2.0'
 ```
 
-(For Mobility versions earlier than 1.0, replace `1.0.0` with `0.2.2`, but be
-aware this version is no longer supported.)
-
 Now enable the `ransack` plugin in Mobility's configuration:
 
 ```ruby

data/lib/mobility/plugins/ransack.rb

@@ -18,34 +18,6 @@ module Mobility
           names.each do |name|
             klass.ransacker(name) { backend_class.build_node(name, Mobility.locale) }
           end
-          klass.extend ClassMethods
-        end
-      end
-
-      module ClassMethods
-        def ransack(*)
-          super.extend(Search)
-        end
-      end
-
-      module Search
-        def result(opts = {})
-          sorted = sorts.inject(super) do |relation, sort|
-            predicate = ::Ransack::Visitor.new.visit_Ransack_Nodes_Sort(sort)
-            apply_mobility_scope(relation, predicate, [sort.attr_name])
-          end
-          conditions.inject(sorted) do |relation, condition|
-            apply_mobility_scope(relation, condition.arel_predicate, condition.attributes.compact.flatten.map(&:name))
-          end
-        end
-
-        private
-
-        def apply_mobility_scope(relation, predicate, attributes)
-          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

data/lib/mobility/ransack/version.rb

@@ -1,5 +1,5 @@
 module Mobility
   module Ransack
-    VERSION = "1.0.0"
+    VERSION = "1.2.0"
   end
 end

data/lib/mobility/ransack.rb

@@ -1,6 +1,56 @@
 require "mobility/ransack/version"
+require "mobility/plugins/arel"
+require "ransack"
 
 module Mobility
   module Ransack
+    class Visitor < Mobility::Plugins::Arel::Visitor
+      def initialize
+        super(nil, nil)
+      end
+
+      private
+
+      def visit_collection(objects)
+        objects.map(&method(:visit)).sum([]).uniq
+      end
+      alias :visit_Array :visit_collection
+      alias :visit_Arel_Nodes_Equality :visit_Arel_Nodes_Binary
+      alias :visit_Arel_Nodes_Or :visit_Arel_Nodes_Binary
+
+      def visit_Mobility_Plugins_Arel_Attribute(object)
+        [[object.backend_class, object.locale]]
+      end
+
+      def visit_default(*)
+        []
+      end
+    end
+
+    module Search
+      def result(opts = {})
+        sorted = sorts.inject(super) do |relation, sort|
+          predicate = ::Ransack::Visitor.new.visit_Ransack_Nodes_Sort(sort)
+          apply_mobility_scope(relation, predicate, [sort.attr_name])
+        end
+        conditions.inject(sorted) do |relation, condition|
+          apply_mobility_scope(relation, condition.arel_predicate, condition.attributes.compact.flat_map(&:name))
+        end
+      end
+
+      private
+
+      def apply_mobility_scope(relation, predicate, attributes)
+        visitor.accept(predicate).inject(relation) do |i18n_rel, (backend_class, locale)|
+          backend_class.apply_scope(i18n_rel, predicate, locale)
+        end
+      end
+
+      def visitor
+        @visitor ||= Visitor.new
+      end
+    end
+
+    ::Ransack::Search.prepend Search
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility-ransack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
@@ -19,7 +19,7 @@ dependencies:
         version: 1.8.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,21 +29,27 @@ dependencies:
         version: 1.8.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: mobility
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,42 +82,42 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 description:
 email:
 - chris@dejimata.com
@@ -147,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Search attributes translated by Mobility with Ransack.