simple_localizer 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/simple_localizer.rb

@@ -24,28 +24,31 @@ module SimpleLocalizer
 
   module ClassMethods
     def translates *columns
-      underscore_name = name.underscore.gsub("/", "_").to_sym
-      foreign_key     = "#{underscore_name}_id".to_sym
-
-      translation_class = const_set(:Translation, Class.new(ActiveRecord::Base))
       translated_attribute_names = columns.map &:to_s
 
-      translation_class.table_name = "#{underscore_name}_translations"
-      translation_class.belongs_to(underscore_name, # WORKAROUND Rails prefers association name to be symbol
-        :class_name  => self.name,
-        :foreign_key => foreign_key
-      )
-      translation_class.validates :locale, :presence => true
-      translation_class.validates underscore_name, :presence => true
-      translation_class.validates :locale, :uniqueness => { :scope => foreign_key }
-
-      has_many(:translations,
-        :dependent   => :destroy,
-        :autosave    => true,
-        :class_name  => translation_class.name,
-        :inverse_of  => underscore_name,
-        :foreign_key => foreign_key
-      )
+      unless const_defined? :Translation
+        underscore_name = name.underscore.gsub("/", "_").to_sym
+        foreign_key     = "#{underscore_name}_id".to_sym
+
+        translation_class = const_set(:Translation, Class.new(ActiveRecord::Base))
+
+        translation_class.table_name = "#{underscore_name}_translations"
+        translation_class.belongs_to(underscore_name, # WORKAROUND Rails prefers association name to be symbol
+          :class_name  => self.name,
+          :foreign_key => foreign_key
+        )
+        translation_class.validates :locale, :presence => true
+        translation_class.validates underscore_name, :presence => true
+        translation_class.validates :locale, :uniqueness => { :scope => foreign_key }
+
+        has_many(:translations,
+          :dependent   => :destroy,
+          :autosave    => true,
+          :class_name  => translation_class.name,
+          :inverse_of  => underscore_name,
+          :foreign_key => foreign_key
+        )
+      end
 
       translated_attribute_names.each do |attr|
         define_method attr do
@@ -68,9 +71,9 @@ module SimpleLocalizer
             }
 
             if I18n.respond_to?(:fallbacks) && translation.try(attr).nil?
-              fallbacks_locales = I18n.fallbacks[locale.to_sym]
+              fallbacks_locales = I18n.fallbacks.fetch(locale.to_sym, locale).map(&:to_s)
               translation = translations.detect { |translation|
-                fallbacks_locales.include?(translation.locale.to_sym) && translation.send(attr).present?
+                fallbacks_locales.include?(translation.locale) && translation.send(attr).present?
               }
             end
 

data/simple_localizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "simple_localizer"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["vad4msiu"]
-  s.date = "2013-01-23"
+  s.date = "2013-01-24"
   s.description = "Simple localization your ActiveRecord fields without magic"
   s.email = "vad4msiu@gmail.com"
   s.extra_rdoc_files = [

data/spec/dummy/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/vad4msiu/projects/github/simple_localizer
   specs:
-    simple_localizer (0.0.4)
+    simple_localizer (0.0.5)
       activerecord
 
 GEM

data/spec/dummy/db/migrate/20130123200543_create_product_translations.rb

@@ -2,8 +2,9 @@ class CreateProductTranslations < ActiveRecord::Migration
   def change
     create_table :product_translations do |t|
       t.string :locale, :null => false
-      t.integer :product_id      
-      t.string :name      
+      t.integer :product_id
+      t.string :name
+      t.string :description
 
       t.timestamps
     end

data/spec/dummy/db/schema.rb

@@ -55,11 +55,12 @@ ActiveRecord::Schema.define(:version => 20130123200543) do
   add_index "legacy_service_translations", ["locale"], :name => "index_legacy_service_translations_on_locale"
 
   create_table "product_translations", :force => true do |t|
-    t.string   "locale",     :null => false
+    t.string   "locale",      :null => false
     t.integer  "product_id"
     t.string   "name"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.string   "description"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
   end
 
   add_index "product_translations", ["locale", "product_id"], :name => "index_product_translations_on_locale_and_product_id", :unique => true

data/spec/simple_localizer_spec.rb

@@ -121,8 +121,25 @@ end
 describe Product do
   let(:product) { Product.create! :name_ru => 'asd' }
 
-  describe "после обвноления" do
+  it "должен поддерживать повтороный вызов translates" do
+    expect {
+      product.update_attributes(
+        :name_ru        => 'qwe',
+        :description_ru => 'asd'
+      )
+    }.to raise_error
 
+    Product.translates :description
+
+    expect {
+      product.update_attributes(
+        :name_ru        => 'qwe',
+        :description_ru => 'asd'
+      )
+    }.to_not raise_error
+  end
+
+  describe "после обвноления" do
     it "должен обновлять перевод" do
       product.update_attributes :name_ru => 'qwe'
       product.translations.where(:locale => 'ru').first.name.should == 'qwe'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_localizer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70257384619060 !ruby/object:Gem::Requirement
+  requirement: &70339903079500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257384619060
+  version_requirements: *70339903079500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70257384631020 !ruby/object:Gem::Requirement
+  requirement: &70339903089440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70257384631020
+  version_requirements: *70339903089440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70257384628940 !ruby/object:Gem::Requirement
+  requirement: &70339903087320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70257384628940
+  version_requirements: *70339903087320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70257384626000 !ruby/object:Gem::Requirement
+  requirement: &70339903084420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *70257384626000
+  version_requirements: *70339903084420
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70257384624000 !ruby/object:Gem::Requirement
+  requirement: &70339903082420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257384624000
+  version_requirements: *70339903082420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70257384638660 !ruby/object:Gem::Requirement
+  requirement: &70339903097020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257384638660
+  version_requirements: *70339903097020
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70257384637400 !ruby/object:Gem::Requirement
+  requirement: &70339903095720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 3.2.10
   type: :development
   prerelease: false
-  version_requirements: *70257384637400
+  version_requirements: *70339903095720
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70257384634960 !ruby/object:Gem::Requirement
+  requirement: &70339903093360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,7 +98,7 @@ dependencies:
         version: 1.4.1
   type: :development
   prerelease: false
-  version_requirements: *70257384634960
+  version_requirements: *70339903093360
 description: Simple localization your ActiveRecord fields without magic
 email: vad4msiu@gmail.com
 executables: []
@@ -206,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 434225171533963133
+      hash: -4422529473626842115
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: