efficient_translations 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    efficient_translations (0.0.4)
+    efficient_translations (0.0.5)
       activerecord (~> 2.3)
       activesupport (~> 2.3)
 

data/lib/efficient_translations/translates_method.rb

@@ -114,7 +114,7 @@ module EfficientTranslations
     end
 
     def default_locale_required
-      unless translations.detect { |t| t.locale.to_sym == I18n.default_locale }
+      if efficient_translations_attributes[I18n.default_locale.to_sym].blank? && translations.detect { |t| t.locale.to_sym == I18n.default_locale.to_sym }.nil?
         # people may expect this message to be localized too ;-)
         errors.add :translations, "for #{I18n.default_locale} is missing"
       end

data/lib/efficient_translations/translation_factory.rb

@@ -9,9 +9,9 @@ module EfficientTranslations
           table_name = "#{base_model.table_name.singularize}_translations"
           cattr_accessor :translatable_model, :translatable_relation_field
           self.translatable_model = base_model
-          self.translatable_relation_field = base_model.name.underscore.gsub '/', '_'
+          self.translatable_relation_field = base_model.model_name.underscore.gsub '/', '_'
 
-          belongs_to translatable_relation_field
+          belongs_to translatable_relation_field, :class_name => self.translatable_model.name
           before_save :stringify_locale!
 
           named_scope :for_locale, lambda { |locale|

data/lib/efficient_translations/version.rb

@@ -1,3 +1,3 @@
 module EfficientTranslations
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/efficient_translations/translates_method_spec.rb

@@ -4,7 +4,7 @@ require 'active_record'
 describe EfficientTranslations do
   def my_model_class
     Kernel.silence_warnings do
-      Kernel.const_set :MyModel, Class.new(ActiveRecord::Base)
+      Object.const_set :MyModel, Class.new(ActiveRecord::Base)
     end
   end
 
@@ -47,8 +47,9 @@ describe EfficientTranslations do
       model = my_model_class
       model.translates :name
       model.validates_presence_of_default_locale
-      lambda { model.new.save! }.should raise_error ActiveRecord::RecordInvalid
-      inst = model.new :translations_attributes => [{ :locale => :en, :name => 'pippo' }]
+      inst = model.new
+      lambda { inst.save! }.should raise_error ActiveRecord::RecordInvalid
+      inst.set_name_translation I18n.default_locale, 'pippo'
       lambda { inst.save! }.should_not raise_error
     end
   end

data/spec/lib/efficient_translations/translation_factory_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe EfficientTranslations::TranslationFactory do
   before :each do
     Kernel.silence_warnings do
-      @model_class = Kernel.const_set :MyModel, Class.new(ActiveRecord::Base)
+      @model_class = Object.const_set :MyModel, Class.new(ActiveRecord::Base)
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: efficient_translations
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Nicola Racco