awesome_hstore_translate 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f66324c452a30143941262a58e3f45ed167b62
-  data.tar.gz: a10f57987da1fc94474bbd233c0be1e7f488991d
+  metadata.gz: 27419212e7681dce9c73a1b3e6b46f2b9e8a3815
+  data.tar.gz: 833c8bb2d84488c700b8fbcad69f9101378bee67
 SHA512:
-  metadata.gz: 48affbf85e24d2ca9b6fb750983abbf1ecab8c5016392cd19ee2dcf95c09d77a208b72fbd7dca1e04f5ee031229fa69cc60a5e247cb656e3d46cea383cf734a8
-  data.tar.gz: a596402fdb07093f51aa8c9a612a98046f262b52e5601c24800cb8bdef827bef6e5b2208cf6155a78258db5e44651f6be842f11fb8a2bb29b3f4dfb994ffeec9
+  metadata.gz: 3086c68e3504fcc602f60f980b1daab90685877bd295e616b3dc4b2d20380b241923e1a6e7519194f65737e777ee3dfce25c7973eeeb188fc76c1ddb787f11b2
+  data.tar.gz: 9e4c7bfece6fa94d6261d98f294bf015140f34197818aa2bb321f791fb484a450c00e92b5cc56cd9f6836dca852f232703c95c9b147064b0c9b429f8816d6a22

data/.gitignore

@@ -17,6 +17,7 @@
 .idea/dictionaries
 .idea/vcs.xml
 .idea/jsLibraryMappings.xml
+.idea/dataSources
 
 # Sensitive or high-churn files:
 .idea/dataSources.ids

data/README.md

@@ -15,7 +15,8 @@ This gem uses PostgreSQLs hstore datatype and ActiveRecord models to translate m
  - [x] `v0.1.0` Language specific accessors
  - [x] `v0.2.0` Awesome Hstore Translate as drop in replace for [`hstore_translate`](https://github.com/Leadformance/hstore_translate)
    - `with_[attr]_translation(str)` is not supported
- - [x] `v0.2.0` Support record selection via ActiveRecord (e. g. `where`, `find_by`, ..)
+ - [x] `v0.2.2` Support record selection via ActiveRecord (e. g. `where`, `find_by`, ..)
+ - [x] `v0.3.0` Support record ordering via ActiveRecord `order`
  - [ ] `backlog` Support `friendly_id` (see `friendly_id-awesome_hstore` gem)
 
 ## Requirements
@@ -143,7 +144,17 @@ p.title_de # => Deutscher Titel
 Page.create!(:title_en => 'English title', :title_de => 'Deutscher Titel')
 Page.create!(:title_en => 'Another English title', :title_de => 'Noch ein Deutscher Titel')
 
-Page.where(title: 'Another English title')  # => Page
+Page.where(title: 'Another English title')  # => Page with title 'Another English title'
+```
+
+### Order
+`awesome_hstore_translate` patches ActiveRecord, so you can conviniently use `order` as you like.
+
+```ruby
+Page.create!(:title_en => 'English title', :title_de => 'Deutscher Titel')
+Page.create!(:title_en => 'Another English title', :title_de => 'Noch ein Deutscher Titel')
+
+Page.all.order(title: :desc)  # => Page with title 'English title'
 ```
 
 ### Limitations

data/awesome_hstore_translate.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'awesome_hstore_translate'
   spec.version       = AwesomeHstoreTranslate::VERSION
   spec.authors       = ['Robin Bühler', 'Rob Worley']
-  spec.email         = ['public@openscript.ch']
+  spec.email         = ['public+rubygems@openscript.ch']
 
   spec.summary       = 'Using PostgreSQLs hstore datatype to provide ActiveRecord models data translation.'
   spec.description   = 'This gem uses PostgreSQLs hstore datatype and ActiveRecord models to translate model data. It is based on the gem hstore_translate by Rob Worely.'

data/lib/awesome_hstore_translate/active_record/query_methods.rb

@@ -3,18 +3,43 @@ module AwesomeHstoreTranslate
     module QueryMethods
       def where(opts = :chain, *rest)
         if opts.is_a?(Hash)
-          translated_attrs = translated_attributes(opts)
-          normal_attrs = opts.reject{ |key, _| translated_attrs.include? key}
           query = spawn
-          query.where!(normal_attrs, *rest) unless normal_attrs.empty?
+          translated_attrs = translated_attributes(opts)
+          untranslated_attrs = untranslated_attributes(opts)
 
-          translated_attrs.each do |attribute|
-            if opts[attribute].is_a?(String)
-              query.where!(":key = any(avals(#{attribute}))", key: opts[attribute])
+          unless untranslated_attrs.empty?
+            query.where!(untranslated_attrs, *rest)
+          end
+
+          translated_attrs.each do |key, value|
+            if value.is_a?(String)
+              query.where!(":value = any(avals(#{key}))", value: value)
             else
               super
             end
           end
+
+          query
+        else
+          super
+        end
+      end
+
+      def order(*args)
+        if args.is_a?(Array)
+          check_if_method_has_arguments!(:order, args)
+          query = spawn
+          translated_attrs = translated_attributes(args[0])
+          untranslated_attrs = untranslated_attributes(args[0])
+
+          unless untranslated_attrs.empty?
+            query.order!(untranslated_attrs)
+          end
+
+          translated_attrs.each do |key, value|
+            query.order!("#{key} -> '#{I18n.locale.to_s}' #{value}")
+          end
+
           query
         else
           super
@@ -24,7 +49,11 @@ module AwesomeHstoreTranslate
       private
 
       def translated_attributes(opts)
-        self.translated_attribute_names & opts.keys
+        opts.select{ |key, _| self.translated_attribute_names.include?(key) }
+      end
+
+      def untranslated_attributes(opts)
+        opts.reject{ |key, _| self.translated_attribute_names.include?(key) }
       end
     end
   end

data/lib/awesome_hstore_translate/version.rb

@@ -1,3 +1,3 @@
 module AwesomeHstoreTranslate
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesome_hstore_translate
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Robin Bühler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -138,7 +138,7 @@ dependencies:
 description: This gem uses PostgreSQLs hstore datatype and ActiveRecord models to
   translate model data. It is based on the gem hstore_translate by Rob Worely.
 email:
-- public@openscript.ch
+- public+rubygems@openscript.ch
 executables:
 - console
 - setup