mobility-ransack 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e1f7aa59365ce176d9a5baccd87f8091b1d5c23f4532b66c019cf4766b23e43
-  data.tar.gz: 81b3dc8e4294177dbdad6b2403057adfd41756c103e0e803369e7c4a62884140
+  metadata.gz: b666246ec54369683b3ca4c47ab7a37b276b8f6edd105dbfe001438dc8946b63
+  data.tar.gz: 2c6bc9c9703f0a1a14f6eea1ca53bd1098b685d4964e8f2ba926ed801e95de67
 SHA512:
-  metadata.gz: 6f7daffdd7c1f8bb740628ffdbdfe5f52322705afaf970d56a7a7cd56bd06b14673c4af4897c0080bc6d74867d69b8beb5a1b4cda00051d763b98a04e41bbebf
-  data.tar.gz: ae9f596d2d64ff45b5f7a3e562c04dd6ee6fc9e593fddd91f92cc1294384a355360d30d6e75089f22d0ee92ce42755c67706d528c57ec971d23f578e0c2e6f25
+  metadata.gz: 294f956b8dbbfee07354f44f6fd3a27f58f234d274e7361501adb84472c59918f4e133641d140d1e71f0f20e6584af4b961a649d84523737ed1aa3916ccdc408
+  data.tar.gz: 931b32c4430f2623434012710b6436245ddabe1b7522d6b1f703a0038ae7b18d5382daf563a260a77b18d1dbfd3df72d75bd4ea1ae24b0e5a7d737d64eacadf9

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Mobility Ransack Changelog
 
+## 0.2
+
+### 0.2.0
+
+- Support sorting on translated attributes
+  ([#2](https://github.com/shioyama/mobility-ransack/pull/2))
+
 ## 0.1
 
 ### 0.1.1
@@ -9,5 +16,7 @@
 ### 0.1.0
 - Loosen Ransack dependency to allow up to 2.1
 
+## 0.0
+
 ### 0.0.1
 - Add plugin code.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility-ransack (0.1.0)
+    mobility-ransack (0.1.1)
       mobility (~> 0.8.0)
       ransack (>= 1.8.0, < 2.1)
 
@@ -55,6 +55,7 @@ GEM
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
+    database_cleaner (1.7.0)
     diff-lcs (1.3)
     erubi (1.7.1)
     globalid (0.4.1)
@@ -153,6 +154,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  database_cleaner (~> 1.7.0)
   mobility-ransack!
   pry
   pry-byebug

data/README.md

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

data/lib/mobility/plugins/ransack.rb

@@ -26,11 +26,20 @@ module Mobility
 
       class Search < ::Ransack::Search
         def result(opts = {})
-          conditions.inject(super) do |relation, condition|
-            predicate = condition.arel_predicate
-            (condition.attributes.compact.flatten.map(&:name) & object.mobility_attributes).inject(relation) do |i18n_rel, attr|
-              object.mobility_backend_class(attr).apply_scope(i18n_rel, predicate)
-            end
+          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)
+          (attributes & object.mobility_attributes).inject(relation) do |i18n_rel, attr|
+            object.mobility_backend_class(attr).apply_scope(i18n_rel, predicate)
           end
         end
       end

data/lib/mobility/ransack/version.rb

@@ -1,5 +1,5 @@
 module Mobility
   module Ransack
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobility-ransack
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Salzberg
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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
 description: 
 email:
 - chris@dejimata.com