multilang-hstore 0.1 → 0.2

data/lib/multilang-hstore/active_record_extensions.rb

@@ -30,6 +30,10 @@ module Multilang
             multilang_translation_keeper(attribute).update(value)
           end
 
+          define_method "#{attribute}_before_type_cast" do
+            multilang_translation_keeper(attribute).translations
+          end
+
           #attribute accessibility for mass assignment
           if options[:accessible]
             matr = multilang_accessible_translations + [attribute.to_sym]

data/lib/multilang-hstore/translation_keeper.rb

@@ -13,22 +13,11 @@ module Multilang
     end
 
     def value(locale = nil)
-      locale ||= actual_locale
-      read(locale)
+      @translations.value(locale)
     end
 
     def current_or_any_value
-      v = value
-      if v.empty?
-        reduced_locales = locales - [actual_locale]
-        reduced_locales.each do |locale|
-          v = value(locale)
-          return v unless v.empty?
-        end
-      else
-        return v
-      end
-      return ''
+      @translations.current_or_any_value
     end
 
     def to_s
@@ -60,7 +49,7 @@ module Multilang
     end
 
     def locales
-      @translations.keys.map(&:to_sym)
+      @translations.locales
     end
 
     def empty?
@@ -70,7 +59,7 @@ module Multilang
     private
 
     def actual_locale
-      I18n.locale
+      @translations.actual_locale
     end
 
     def write(locale, value)
@@ -78,7 +67,7 @@ module Multilang
     end
 
     def read(locale)
-      MultilangTranslationProxy.new(self, locale)
+      @translations.read(locale)
     end
 
     def raw_read(locale)
@@ -93,6 +82,45 @@ module Multilang
       data = @model[@attribute]
       data = data.blank? ? nil : data
       @translations = data.is_a?(Hash) ? data : {}
+
+      class << translations
+        attr_accessor :multilang_keeper
+        def to_s
+          "#{current_or_any_value}"
+        end
+
+        def locales
+          self.keys.map(&:to_sym)
+        end
+
+        def read(locale)
+          MultilangTranslationProxy.new(self.multilang_keeper, locale)
+        end
+
+        def current_or_any_value
+          v = value
+          if v.empty?
+            reduced_locales = locales - [actual_locale]
+            reduced_locales.each do |locale|
+              v = value(locale)
+              return v unless v.empty?
+            end
+          else
+            return v
+          end
+          return ''
+        end
+
+        def value(locale = nil)
+          locale ||= actual_locale
+          read(locale)
+        end
+
+        def actual_locale
+          I18n.locale
+        end
+      end
+      @translations.public_send("multilang_keeper=", self)
     end
 
     def flush!

data/lib/multilang-hstore/version.rb

@@ -1,3 +1,3 @@
 module Multilang
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

data/spec/multilang_spec.rb

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-$KCODE = "U"
 
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
@@ -255,4 +254,30 @@ describe Multilang do
     rp.body.any.should == "Latviešu apraksts"
     
   end
+
+  it "should set/get attributes directly from HStore underlying type returned by before_type_cast" do
+    rp = RegularPost.new
+
+    # set
+    I18n.locale = :es
+    rp.title = "Hola"
+    rp.body = "Hola Mundo"
+
+    I18n.locale = :en
+    rp.title = "Hello"
+    rp.body = "Hello World"
+    
+    I18n.locale = :ru
+    # test
+    rp.title_before_type_cast.actual_locale.should be :ru
+    rp.title_before_type_cast.locales.should have(2).items
+    rp.title_before_type_cast.locales.should match_array [:es, :en]
+    rp.title_before_type_cast.should be_kind_of Hash
+    I18n.locale = :es
+    rp.title_before_type_cast.value("en").should eq("Hello")
+    rp.title_before_type_cast.value("es").should eq("Hola")
+    rp.title_before_type_cast.value.should eq("Hola")
+    
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multilang-hstore
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies: []
 description: Model translations for Rails 3 backed by PostgreSQL and Hstore
 email: hello@firebase.co