awesome_hstore_translate 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b7a102f4de133d326d96a0b697f2c546409ce88
-  data.tar.gz: 032d0828417f873bb3b4772fb4da311baa937b38
+  metadata.gz: d8f66324c452a30143941262a58e3f45ed167b62
+  data.tar.gz: a10f57987da1fc94474bbd233c0be1e7f488991d
 SHA512:
-  metadata.gz: 732b84d4d47e6ed0137746a7947834bf75884195db19700b0962337197e4e4e49f42571568f5778371fc73e34812e8789296e4fff914e05e09dd5936f05c004c
-  data.tar.gz: f008e5892a26270fb68ae2773e90d1036d33bcfe8f5ad50a558403742cb8592833f7727ed71af701c3201263745d3d7d492ac4d599646bb481aa968e9033d97a
+  metadata.gz: 48affbf85e24d2ca9b6fb750983abbf1ecab8c5016392cd19ee2dcf95c09d77a208b72fbd7dca1e04f5ee031229fa69cc60a5e247cb656e3d46cea383cf734a8
+  data.tar.gz: a596402fdb07093f51aa8c9a612a98046f262b52e5601c24800cb8bdef827bef6e5b2208cf6155a78258db5e44651f6be842f11fb8a2bb29b3f4dfb994ffeec9

data/README.md

@@ -49,6 +49,9 @@ Make sure that the datatype of this columns is `hstore`:
 ```ruby
 class CreatePages < ActiveRecord::Migration
   def change
+    # Make sure you enable the hstore extenion
+    enable_extension 'hstore' unless extension_enabled?('hstore')
+    
     create_table :pages do |t|
       t.column :title, :hstore
       t.column :content, :hstore
@@ -143,6 +146,21 @@ Page.create!(:title_en => 'Another English title', :title_de => 'Noch ein Deutsc
 Page.where(title: 'Another English title')  # => Page
 ```
 
+### Limitations
+`awesome_hstore_translate` patches ActiveRecord, which create the limitation, that a with `where` chained `first_or_create` and `first_or_create!` **doesn't work** as expected.
+Here is an example, which **won't** work:
+
+``` ruby
+Page.where(title: 'Titre français').first_or_create!
+```
+
+A workaround is:
+
+``` ruby
+Page.where(title: 'Titre français').first_or_create!(title: 'Titre français')
+```
+
+The where clause is internally rewritten to `WHERE 'Titre français' = any(avals(title))`, so the `title: 'Titre français'` is not bound to the scope.
 
 ### Upgrade from [`hstore_translate`](https://github.com/Leadformance/hstore_translate)
 1. Replace the [`hstore_translate`](https://github.com/Leadformance/hstore_translate) with `awesome_hstore_translate` in your Gemfile

data/lib/awesome_hstore_translate/active_record/core.rb

@@ -7,7 +7,7 @@ module AwesomeHstoreTranslate
           if attrs.is_a?(Hash) && contains_translated_attributes(attrs)
             where(attrs).limit(1).first
           else
-            super(args)
+            super
           end
         end
 

data/lib/awesome_hstore_translate/active_record/instance_methods.rb

@@ -4,16 +4,15 @@ module AwesomeHstoreTranslate
       protected
 
       def read_translated_attribute(attr, locale = I18n.locale)
-        locales = []
-        locales << locale
+        locales = Array(locale)
         locales += get_fallback_for_locale(locale) || [] if translation_options[:fallbacks]
 
         translations = read_raw_attribute(attr)
 
         if translations
-          locales.uniq.each do |cur|
-            if translations.has_key?(cur.to_s) && !translations[cur.to_s].empty?
-              return translations[cur.to_s]
+          locales.map(&:to_s).uniq.each do |cur|
+            if translations.has_key?(cur) && !translations[cur].blank?
+              return translations[cur]
             end
           end
         end
@@ -50,4 +49,4 @@ module AwesomeHstoreTranslate
       end
     end
   end
-end
+end

data/lib/awesome_hstore_translate/active_record/query_methods.rb

@@ -6,11 +6,11 @@ module AwesomeHstoreTranslate
           translated_attrs = translated_attributes(opts)
           normal_attrs = opts.reject{ |key, _| translated_attrs.include? key}
           query = spawn
-          query.where!(normal_attrs) unless normal_attrs.empty?
+          query.where!(normal_attrs, *rest) unless normal_attrs.empty?
 
           translated_attrs.each do |attribute|
             if opts[attribute].is_a?(String)
-              query.where!("'#{opts[attribute]}' = any(avals(#{attribute}))")
+              query.where!(":key = any(avals(#{attribute}))", key: opts[attribute])
             else
               super
             end

data/lib/awesome_hstore_translate/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awesome_hstore_translate
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Robin Bühler
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord