mobility-ransack 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be276922cefff8fd33e93a926cc1a4bf34121c9749dfe139be50c273bd2394f5
-  data.tar.gz: d8a30f2fe726f735157480c34ed9735b82acbb62dcd5ec0e32795842d548d740
+  metadata.gz: 33d4ea8f4ac1590f792f64a125d1a7005f98720c56d4932f41b6f8493912c548
+  data.tar.gz: 569f220a16986e813a89fea0d2b6fd25e99c8b1e1c6874c36f2ca72a5c6a555c
 SHA512:
-  metadata.gz: 86be049fae7d2990b93d9e851d0ff719aeb01aef19c708a6ef981ff53390598211a7cd464dd5e00dbf57e502479e3881de13f244b3b4aa2fade0728ff2335f6e
-  data.tar.gz: e31549972b7c78b82147d56ba983616d33fe8a155e232a87665c328dc55e5fd60cabe13a5b379aa8a4be40dd058145d22246365c18ac6d9b18cdfcbd442d5583
+  metadata.gz: b8dfa3e4690f5f3b35833fd7c3fcfbfb762fd6fafe4375804339688e3bd0d451dc19108c8846428b7a4a4b66c965d9635d405dd928742f878c9b00923418967c
+  data.tar.gz: 2d11614d1dec4302221b46b27aff89eebb674db1dee4d7feb99abb76e0e36117e6ab195327160e20bafca0d0052ed61e1aa72888ec047409b2f4a169b3b5e2bd

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Mobility Ransack Changelog
 
+## 1.1
+
+### 1.1.0
+- Make MobilityRansack handle associations correctly
+  ([#20](https://github.com/shioyama/mobility-ransack/pull/20))
+
 ## 1.0
 
 ### 1.0.1

data/Gemfile.lock

@@ -1,135 +1,139 @@
 PATH
   remote: .
   specs:
-    mobility-ransack (1.0.0)
-      mobility (~> 1.0.0)
+    mobility-ransack (1.0.1)
+      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)
     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.1)
       activerecord (>= 5.2.4)
       activesupport (>= 5.2.4)
       i18n
@@ -156,14 +160,13 @@ 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
@@ -173,7 +176,7 @@ DEPENDENCIES
   mobility-ransack!
   pry
   pry-byebug
-  rails (~> 6.0.0)
+  rails (~> 6.1.0)
   rake (>= 12.3.3)
   rspec (~> 3.0)
   sqlite3 (~> 1.3, >= 1.3.0)

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.1'
+gem 'mobility-ransack', '~> 1.1.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,33 +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.flat_map(&:name))
-          end
-        end
-
-        private
-
-        def apply_mobility_scope(relation, predicate, attributes)
-          (attributes & object.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.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

data/lib/mobility/ransack/version.rb

@@ -1,5 +1,5 @@
 module Mobility
   module Ransack
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility-ransack
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-28 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack