simple_model_translations 0.2.3 → 0.2.4

data/Gemfile.lock

@@ -1,28 +1,27 @@
 PATH
   remote: .
   specs:
-    simple_model_translations (0.2.3)
+    simple_model_translations (0.2.4)
       activerecord (~> 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    activesupport (3.0.5)
+    arel (2.0.9)
     builder (2.1.2)
     database_cleaner (0.5.2)
     diff-lcs (1.1.2)
-    i18n (0.4.1)
+    i18n (0.5.0)
     rspec (2.0.1)
       rspec-core (~> 2.0.1)
       rspec-expectations (~> 2.0.1)
@@ -35,13 +34,12 @@ GEM
       rspec-expectations (~> 2.0.1)
     shoulda (2.11.3)
     sqlite3-ruby (1.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.0)
   database_cleaner (~> 0.5.2)
   rspec (~> 2.0.0)
   shoulda (~> 2.11.3)

data/lib/simple_model_translations/attributes.rb

@@ -1,19 +1,19 @@
 module SimpleModelTranslations
   module Attributes
     def attributes=(attributes)
-      I18n.with_locale(attributes.delete(:locale) || current_locale_for_translation) do
+      I18n.with_locale(attributes.delete(:locale) || translation_helper.current_locale_for_translation) do
         super(attributes)
       end
     end
 
     def update_attributes!(attributes)
-      I18n.with_locale(attributes.delete(:locale) || current_locale_for_translation) do
+      I18n.with_locale(attributes.delete(:locale) || translation_helper.current_locale_for_translation) do
         super(attributes)
       end
     end
 
     def update_attributes(attributes)
-      I18n.with_locale(attributes.delete(:locale) || current_locale_for_translation) do
+      I18n.with_locale(attributes.delete(:locale) || translation_helper.current_locale_for_translation) do
         super(attributes)
       end
     end

data/lib/simple_model_translations/base.rb

@@ -21,8 +21,8 @@ module SimpleModelTranslations
       configure_translations(attributes.extract_options!)
       translation_class.class_eval(&block) if block_given?
 
-      delegate *(attributes + [:to => :current_translation, :allow_nil => true])
-      delegate *(attributes.map { |attr| "#{attr}=" } + [:to => :find_or_build_current_translation])
+      delegate *(attributes + [:to => 'translation_helper.current_translation'.to_sym, :allow_nil => true])
+      delegate *(attributes.map { |attr| "#{attr}=" } + [:to => 'translation_helper.find_or_build_current_translation'.to_sym])
     end
 
     private

data/lib/simple_model_translations/class_methods.rb

@@ -1,11 +1,9 @@
 module SimpleModelTranslations
   module ClassMethods
     def with_translations(*args)
-      if args.empty?
-        includes(:translations).where("#{translated_column_name(:id)} IS NOT NULL")
-      else
-        includes(:translations).where("#{translated_column_name(:locale)} IN (?)", args)
-      end
+      current_scope = joins(:translations)
+      current_scope = current_scope.where("#{translated_column_name(:locale)} IN (?)", args) unless args.empty?
+      current_scope
     end
     alias with_translation with_translations
     

data/lib/simple_model_translations/instance_methods.rb

@@ -1,36 +1,9 @@
+require 'simple_model_translations/translation_helper'
+
 module SimpleModelTranslations
   module InstanceMethods
-    def find_translation_by_locale(locale)
-      translations.detect { |t| t.locale.to_sym == locale }
+    def translation_helper
+      @translation_helper ||= SimpleModelTranslations::TranslationHelper.new(self)
     end
-    
-    def find_or_build_translation_by_locale(locale)
-      find_translation_by_locale(locale) || build_translation_for_locale(locale)
-    end
-    
-    def build_translation_for_locale(locale)
-      translations.build(:locale => locale, foreign_object_key => self)
-    end
-    
-    def current_locale_for_translation
-      I18n.locale
-    end
-    
-    def default_locale_for_translation
-      I18n.default_locale
-    end
-    
-    def current_translation
-      find_translation_by_locale(current_locale_for_translation) || find_translation_by_locale(default_locale_for_translation)
-    end
-    
-    def find_or_build_current_translation
-      find_or_build_translation_by_locale(current_locale_for_translation)
-    end
-    
-    private
-      def foreign_object_key
-        self.class.name.underscore.to_sym
-      end
   end
 end

data/lib/simple_model_translations/translation_helper.rb

@@ -0,0 +1,45 @@
+module SimpleModelTranslations
+  class TranslationHelper
+    def initialize(record, translation_association = :translations)
+      @record = record
+      @translation_association = translation_association
+    end
+
+    def find_translation_by_locale(locale)
+      translations.detect { |t| t.locale.to_sym == locale }
+    end
+
+    def find_or_build_translation_by_locale(locale)
+      find_translation_by_locale(locale) || build_translation_for_locale(locale)
+    end
+
+    def build_translation_for_locale(locale)
+      translations.build(:locale => locale, foreign_object_key => @record)
+    end
+
+    def current_locale_for_translation
+      I18n.locale
+    end
+
+    def default_locale_for_translation
+      I18n.default_locale
+    end
+
+    def current_translation
+      find_translation_by_locale(current_locale_for_translation) || find_translation_by_locale(default_locale_for_translation)
+    end
+
+    def find_or_build_current_translation
+      find_or_build_translation_by_locale(current_locale_for_translation)
+    end
+    
+    private
+      def foreign_object_key
+        @record.class.name.underscore.to_sym
+      end
+      
+      def translations
+        @record.send(@translation_association)
+      end
+  end
+end

data/lib/simple_model_translations/validations.rb

@@ -2,10 +2,8 @@ module SimpleModelTranslations
   module Validations
     class TranslationsValidator < ::ActiveModel::Validator
       def validate(record)
-        locales = options[:locales]
-        locales = [locales] unless locales.respond_to?(:each)
-        locales.each do |locale|
-          unless record.find_translation_by_locale(locale)
+        Array.wrap(options[:locales]).each do |locale|
+          unless record.translation_helper.find_translation_by_locale(locale)
             record.errors.add(:translations, "miss #{locale} translation")
           end
         end

data/lib/simple_model_translations/version.rb

@@ -1,3 +1,3 @@
 module SimpleModelTranslations
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/simple_model_translations_spec.rb

@@ -28,18 +28,18 @@ describe Article do
   describe '#current_translation' do
     it 'should return translation for current locale if it exists' do
       article = Article.create!(:slug => '__hello__', :name => 'Hello', :content => 'World')
-      article.current_translation.should == article.translations.find_by_locale(I18n.locale)
+      article.translation_helper.current_translation.should == article.translations.find_by_locale(I18n.locale)
     end
     
     it 'should return translation for default locale if translation for current locale does not exist' do
       article = Article.create!(:slug => '__hello__', :name => 'Hello', :content => 'World')
       I18n.locale = :de
-      article.current_translation.should == article.translations.find_by_locale(I18n.default_locale)
+      article.translation_helper.current_translation.should == article.translations.find_by_locale(I18n.default_locale)
     end
     
     it 'should return nil if translations for current and default locales do not exist' do
       article = Article.create!(:slug => '__hello__')
-      article.current_translation.should be_nil
+      article.translation_helper.current_translation.should be_nil
     end
   end
 end

data/spec/spec_helper.rb

@@ -23,12 +23,12 @@ end
 
 RSpec::Matchers.define :have_translation do |locale|
   match do |record|
-    !record.find_translation_by_locale(locale).nil?
+    !record.translation_helper.find_translation_by_locale(locale).nil?
   end
 end
 
 RSpec::Matchers.define :have_translated_attribute do |locale, attribute, value|
   match do |record|
-    record.find_translation_by_locale(locale).send(attribute) == value
+    record.translation_helper.find_translation_by_locale(locale).send(attribute) == value
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_model_translations
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Pavel Forkert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +02:00
+date: 2011-03-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,6 +121,7 @@ files:
 - lib/simple_model_translations/base.rb
 - lib/simple_model_translations/class_methods.rb
 - lib/simple_model_translations/instance_methods.rb
+- lib/simple_model_translations/translation_helper.rb
 - lib/simple_model_translations/validations.rb
 - lib/simple_model_translations/version.rb
 - lib/simple_model_translations.rb
@@ -163,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Simple ActiveRecord translations for Rails 3