efficient_translations 0.0.1 → 0.0.2

data/Gemfile.lock

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

data/lib/efficient_translations/schema.rb

@@ -8,10 +8,10 @@ module EfficientTranslations
     # the column name to create and its type.
     # eg. create_translation_table :product, :name => :string, :description => :string
     def create_translation_table model_name, translation_fields
-      translation_table_name = "#{model_name.to_s}_translations"
+      translation_table_name = "#{model_name}_translations"
       create_table translation_table_name do |t|
         t.references model_name, :null => false
-        t.string     :locale   , :null => false
+        t.string     :locale,    :null => false
       end
       translation_fields.each do |name, type|
         add_column translation_table_name, name.to_s, type.to_sym

data/lib/efficient_translations/translates_method.rb

@@ -7,7 +7,9 @@ module EfficientTranslations
     module ClassMethods
       def translates *field_names
         make_efficient_translatable! unless defined?(translation_model)
-        field_names.each { |field| define_translation_accessors field }
+        field_names.each do |field|
+          define_translation_accessors field
+        end
       end
 
       def validates_presence_of_default_locale
@@ -18,28 +20,28 @@ module EfficientTranslations
 
       def make_efficient_translatable!
         cattr_accessor :translation_model
-        self.translation_model = TranslationFactory::new_model self
-
+        self.translation_model = TranslationFactory.build self
         has_many :translations, :class_name => translation_model.name, :dependent => :destroy
         accepts_nested_attributes_for :translations
+        after_save :update_translations!
 
         named_scope :with_translations, :include => :translations
         named_scope :with_current_translation, lambda {
           {
             :include => :translations,
-            :conditions => ["#{translation_model.table_name}.locale = ? OR #{translation_model.table_name}.locale = ?", I18n.locale.to_s, I18n.default_locale.to_s]
+            :conditions => [scope_conditions, I18n.locale.to_s, I18n.default_locale.to_s]
           }
         }
         named_scope :with_translation_for, lambda { |locale|
           {
             :inlude => :translations,
-            :conditions => ["#{translation_model.table_name}.locale = ? OR #{translation_model.table_name}.locale = ?", locale.to_s, I18n.default_locale.to_s]
+            :conditions => [scope_conditions, locale.to_s, I18n.default_locale.to_s]
           }
         }
+      end
 
-        after_save :update_translations!
-
-        self.send :include, InstanceMethods
+      def self.scope_conditions
+        "#{translation_model.table_name}.locale = ? OR #{translation_model.table_name}.locale = ?"
       end
 
       def define_translation_accessors field
@@ -89,33 +91,32 @@ module EfficientTranslations
       end
     end
 
-    module InstanceMethods
+    # instance methods - no need to put them a module
+    private
 
-      private
-
-      # attributes are stored in @efficient_attributes instance variable via setter
-      def efficient_translations_attributes
-        @efficient_translations_attributes ||= Hash.new { |hash, key| hash[key] = {} }
-      end
+    # attributes are stored in @efficient_attributes instance variable via setter
+    def efficient_translations_attributes
+      @efficient_translations_attributes ||= Hash.new { |hash, key| hash[key] = {} }
+    end
 
-      def update_translations!
-        if efficient_translations_attributes.present?
-          translations true #force reload all translations
-          efficient_translations_attributes.each do |locale, attributes|
-            translation = translations.detect { |t| t.locale.to_sym == locale } || begin
-              args = { :locale => locale }
-              args[self.class.translation_model.translatable_relation_field] = self
-              self.class.translation_model.new args
-            end
-            translation.update_attributes! attributes
+    def update_translations!
+      if efficient_translations_attributes.present?
+        translations true # force reload all translations
+        efficient_translations_attributes.each do |locale, attributes|
+          translation = translations.detect { |t| t.locale.to_sym == locale } || begin
+            args = { :locale => locale }
+            args[self.class.translation_model.translatable_relation_field] = self
+            self.class.translation_model.new args
           end
+          translation.update_attributes! attributes
         end
       end
+    end
 
-      def default_locale_required
-        unless translations.detect { |t| t.locale.to_sym == I18n.default_locale }
-          errors.add :translations, "for #{I18n.default_locale} is missing"
-        end
+    def default_locale_required
+      unless translations.detect { |t| t.locale.to_sym == I18n.default_locale }
+        # people may expect this message to be localized too ;-)
+        errors.add :translations, "for #{I18n.default_locale} is missing"
       end
     end
   end

data/lib/efficient_translations/translation_factory.rb

@@ -1,26 +1,24 @@
 module EfficientTranslations
   module TranslationFactory
-    def self.new_model base_model
-      if base_model.const_defined?(:Translation)
-        base_model.const_get(:Translation)
+    def self.build base_model
+      if base_model.const_defined? :Translation
+        base_model.const_get :Translation
       else
-        klass = base_model.const_set(:Translation, Class.new(::ActiveRecord::Base))
-        klass.instance_eval do
+        klass = base_model.const_set :Translation, Class.new(ActiveRecord::Base)
+        klass.class_eval do
+          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 '/', '_'
 
-          table_name = "#{base_model.table_name.singularize}_translations"
           belongs_to translatable_relation_field
+          before_save :stringify_locale!
 
           named_scope :for_locale, lambda { |locale|
             { :conditions => ['locale = ? OR locale = ?', locale.to_s, I18n.locale.to_s] }
           }
 
-          before_save :stringify_locale!
-        end
-        klass.class_eval do
-          def stringify_locale!
+          define_method :stringify_locale! do
             self.locale = locale.to_s
           end
         end

data/lib/efficient_translations/version.rb

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

data/spec/lib/efficient_translations/translation_factory_spec.rb

@@ -7,7 +7,7 @@ describe EfficientTranslations::TranslationFactory do
     end
   end
 
-  describe '::new_model' do
+  describe '::build' do
     context 'when no translation model is found' do
       before do
         @klass = Class.new(ActiveRecord::Base)
@@ -16,43 +16,43 @@ describe EfficientTranslations::TranslationFactory do
 
       it 'should create a new ::Translation class' do
         @model_class.should_receive(:const_set).with(:Translation, kind_of(Class)) { |name, klass| klass }
-        EfficientTranslations::TranslationFactory::new_model @model_class
+        EfficientTranslations::TranslationFactory::build @model_class
       end
 
       it 'should define a belongs_to association to the main model' do
         @klass.should_receive(:belongs_to)
-        EfficientTranslations::TranslationFactory::new_model @model_class
+        EfficientTranslations::TranslationFactory::build @model_class
       end
 
       it 'should assign the translatable model in an accessor' do
-        translation = EfficientTranslations::TranslationFactory::new_model @model_class
+        translation = EfficientTranslations::TranslationFactory::build @model_class
         translation.translatable_model.should == @model_class
       end
 
       it 'should assign the translatable model field in an accessor' do
-        translation = EfficientTranslations::TranslationFactory::new_model @model_class
+        translation = EfficientTranslations::TranslationFactory::build @model_class
         translation.translatable_relation_field.should == @model_class.name.underscore.gsub('/','_')
       end
 
       it 'should return the created translation class' do
         klass = Class.new(ActiveRecord::Base)
         @model_class.stub :const_set => klass
-        EfficientTranslations::TranslationFactory::new_model(@model_class).should == klass
+        EfficientTranslations::TranslationFactory::build(@model_class).should == klass
       end
     end
 
     context 'when a translation model is found' do
       it 'should not create a ::Translation class' do
-        EfficientTranslations::TranslationFactory::new_model @model_class
+        EfficientTranslations::TranslationFactory::build @model_class
         @model_class.should_not_receive(:const_set)
-        EfficientTranslations::TranslationFactory::new_model @model_class
+        EfficientTranslations::TranslationFactory::build @model_class
       end
 
       it 'should return the already defined translation class' do
         klass = Class.new(ActiveRecord::Base)
         @model_class.stub :const_set => klass
-        EfficientTranslations::TranslationFactory::new_model @model_class
-        EfficientTranslations::TranslationFactory::new_model(@model_class).should == klass
+        EfficientTranslations::TranslationFactory::build @model_class
+        EfficientTranslations::TranslationFactory::build(@model_class).should == klass
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: efficient_translations
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2012-02-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70105172048080 !ruby/object:Gem::Requirement
+  requirement: &70304938783780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105172048080
+  version_requirements: *70304938783780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70105172047020 !ruby/object:Gem::Requirement
+  requirement: &70304938782640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105172047020
+  version_requirements: *70304938782640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70105172046400 !ruby/object:Gem::Requirement
+  requirement: &70304938781980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70105172046400
+  version_requirements: *70304938781980
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70105172045360 !ruby/object:Gem::Requirement
+  requirement: &70304938780640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70105172045360
+  version_requirements: *70304938780640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70105172043440 !ruby/object:Gem::Requirement
+  requirement: &70304938779720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70105172043440
+  version_requirements: *70304938779720
 description: Translation library for ActiveRecord models in Rails 2
 email:
 - nicola@nicolaracco.com
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4009622527868518176
+      hash: 2503706901101072046
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4009622527868518176
+      hash: 2503706901101072046
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10