hstore_translations 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8d5248b78e634c9887040589d24b67f7868c314
-  data.tar.gz: d3e96e929ab59b2eca0372015f35a5b3cd7ffa45
+  metadata.gz: 14fb5eb836cfaee82a2c483a674af4ee6e5d57ff
+  data.tar.gz: 41cbd94b02a4ab54d81e1e86c353fc1d5fcea928
 SHA512:
-  metadata.gz: 94da578c51984fc472806d573bf4733db73bfadfaf99e071dc8b10c7f35ada57ee9fb645021a719ea2317bad691631c6a1873a18db23a5424dd5043bec830142
-  data.tar.gz: 79d325668efadb4b8c4373d19627a2eb9d4b6a03f778ab19f886028d77d3b4aeb85e67ced5a023aea8522e4ec1824f261092aa8934e5f8d22eaf2a67ef0f460c
+  metadata.gz: 257518ca98e36f73d7d7ab1fde7ef9a05221fb9a20da74e9c95bf87124316ed3328c84441fb8b9b991596e3b278c464facbe4baeba405e14e22d156f0ef05741
+  data.tar.gz: 1305708f6b0cc321e8ccd8e281e173fa5441038018d537c9936636b93a927a95ddfe9f279f7c31543f377c904b2ce31d416e7e86a8a8094f844e6dc0083ea17a

data/lib/hstore_translations/translations_lookup.rb

@@ -4,21 +4,24 @@ module HstoreTranslations
 
     def initialize(model, attribute, locale = nil)
       @model, @attribute, @locale = model, attribute, locale
-      @locale = locale || HstoreTranslations.locale
+      @locale = locale
     end
 
     def value
-      fallbacks.each do |locale|
-        value = try_locale(locale)
-        return value if value.present?
+      if @locale
+        try_locale(@locale)
+      else
+        fallbacks.inject(nil) do |_, locale|
+          value = try_locale(locale)
+          return value if value.present?
+        end
       end
-      nil
     end
 
     private
 
     def fallbacks
-      HstoreTranslations.fallbacks(@locale)
+      HstoreTranslations.fallbacks(@locale || HstoreTranslations.locale)
     end
 
     def try_locale(locale)

data/lib/hstore_translations/version.rb

@@ -1,3 +1,3 @@
 module HstoreTranslations
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/hstore_translations/macro_spec.rb

@@ -45,11 +45,11 @@ end
 
 describe HstoreTranslations::Macro, 'generated accessors' do
   before { Post.translates :title }
+  let(:post) { Post.new }
 
   describe '#title=' do
-    let(:post) { Post.new }
     before do
-      I18n.locale = :en
+      configure_i18n locale: :en
       post.title = 'hello'
     end
 
@@ -66,8 +66,8 @@ describe HstoreTranslations::Macro, 'generated accessors' do
     let(:post) { Post.new(title_en: 'hello', title_ru: 'привет', title_es: 'hola') }
 
     before do
-      I18n.locale = :en
-      I18n.default_locale = :ru
+      configure_i18n locale: :en,
+                     default_locale: :ru
     end
 
     it 'is a title in current locale' do
@@ -100,4 +100,18 @@ describe HstoreTranslations::Macro, 'generated accessors' do
       end
     end
   end
+
+  describe '#title_en' do
+    before do
+      configure_i18n locale: :en,
+                     default_locale: :ru,
+                     available_locales: [:en, :ru]
+      Post.translates :title
+    end
+
+    it 'does not attempt to get value with fallbacks' do
+      post.title_ru = 'hello'
+      post.title_en.should be_nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hstore_translations
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Aleksey Demidov