translatable 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/translatable.rb

@@ -199,16 +199,6 @@ module ActiveRecord
         end
 
         self.module_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def current_translation
-            if translatable_locale_changed?
-              @translatable_locale = ::I18n.locale.to_s
-              translatable_set_current
-            end
-            @current_translation
-          end
-          protected :current_translation
-
-
           def translatable_set_current
             @current_translation = translations.where(:#{@translatable[:locale]} => @translatable_locale).first
           end
@@ -243,8 +233,20 @@ module ActiveRecord
 
     module InstanceMethods
 
-      protected
+      def current_translation
+        if translatable_locale_changed?
+          @translatable_locale = ::I18n.locale.to_s
+          translatable_set_current
+        end
+        @current_translation
+      end
 
+      def other_translations
+        translations - [current_translation]
+      end
+
+      protected
+      
       def translatable_locale_changed?
         @translatable_locale.to_s != ::I18n.locale.to_s
       end

data/test/test_translatable.rb

@@ -91,6 +91,18 @@ class TestDmTranslatable < Test::Unit::TestCase
     assert_equal "ru", t_news.locale
   end
 
+  def test_no_other_translations
+    news = News.create :translations_attributes => [{ :title => "Заголовок", :content => "Содержание", :locale => "ru"}]
+
+    assert news.persisted?
+
+    t_news = TranslatableNews.last
+    assert_equal [t_news], news.other_translations
+    ::I18n.locale = :ru
+     assert_equal [], news.other_translations
+    ::I18n.locale = ::I18n.default_locale
+  end
+
   def test_create_with_translation_with_multiple_locales
     news = News.create :translations_attributes => [{ :title => "Заголовок", :content => "Содержание", :locale => "ru"},
       {:title => "Resent News", :content => "That is where the text goes", :locale => "en"}]
@@ -120,7 +132,7 @@ class TestDmTranslatable < Test::Unit::TestCase
     assert_equal "That is where the text goes", news.content
   end
 
-  def test_access_of_other_translation
+  def test_access_of_different_translation
     news = News.create :translations_attributes => [{:title => "Заголовок", :content => "Содержание", :locale => "ru"},
       {:title => "Resent News", :content => "That is where the text goes", :locale => "en"}]
 

data/translatable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "translatable"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["E-Max"]
-  s.date = "2012-09-20"
+  s.date = "2012-09-23"
   s.description = "This game was build to make whole proccess of working with translation for DM to be almost invisble. That was THE AIM."
   s.email = "max@studentify.nl"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translatable
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000Z
+date: 2012-09-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &76245140 !ruby/object:Gem::Requirement
+  requirement: &81412010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76245140
+  version_requirements: *81412010
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &76244900 !ruby/object:Gem::Requirement
+  requirement: &81411770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76244900
+  version_requirements: *81411770
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &76244660 !ruby/object:Gem::Requirement
+  requirement: &81411530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76244660
+  version_requirements: *81411530
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &76244420 !ruby/object:Gem::Requirement
+  requirement: &81411290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *76244420
+  version_requirements: *81411290
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &76244180 !ruby/object:Gem::Requirement
+  requirement: &81411050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *76244180
+  version_requirements: *81411050
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &76243940 !ruby/object:Gem::Requirement
+  requirement: &81410810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *76243940
+  version_requirements: *81410810
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &76243700 !ruby/object:Gem::Requirement
+  requirement: &81410570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *76243700
+  version_requirements: *81410570
 description: This game was build to make whole proccess of working with translation
   for DM to be almost invisble. That was THE AIM.
 email: max@studentify.nl
@@ -130,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -775339121
+      hash: -89848195
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: