easy_translatable 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bf467e734ff69ca81e47edf7fcbb917b59e84a8
-  data.tar.gz: 76bc1946777bc451dce2f741e519ea9ef338266d
+  metadata.gz: 92e6ca6a6f1919678d40513de824e5f10866940d
+  data.tar.gz: 20b38ee4b7dada0802f53fab8077ebc1079e60fc
 SHA512:
-  metadata.gz: f5c47b00241ee66bf92180d7811fadab41dcf66bf58d117b109a2e6a918488f47c7d7b0fcccba0f1eddc9eae7f3907af518d0ae0cb686bbea70405f6ad27d73c
-  data.tar.gz: 54cb446e8f2ea1a018014bec4db87b377874e3fb2f64577efb491e14e2924bd714d5d12aa21cb6cdde95e8b2e3c581df41dac431c52456312a30342d167c755f
+  metadata.gz: 901ae4e1c1cfd1aa47b14e544f785e4dc595777e2aaf4aba0ecf871584cb7756071867bc08428bda2f6200ab137faa4208a7e42a842f3ca0d08203d16116a6fb
+  data.tar.gz: f779b1fc88db5887f82ad102429f5c50279f368826776fa4a4262a62d35a7d774fd31bf0fce64fd6ebdd4511fe5e7cce9c71442d69969f7f0b8e604b3830fea2

data/README.md

@@ -1,5 +1,4 @@
-# Translatable [![Gem Version](https://badge.fury.io/rb/easy_translatable.png)](http://badge.fury.io/rb/easy_translatable) [![Code Climate](https://codeclimate.com/github/popox/translatable.png)](https://codeclimate.com/github/popox/translatable)
-
+# Translatable [![Gem Version](https://badge.fury.io/rb/easy_translatable.png)](http://badge.fury.io/rb/easy_translatable) [![Code Climate](https://codeclimate.com/github/popox/translatable.png)](https://codeclimate.com/github/popox/translatable) [![Build Status](https://travis-ci.org/popox/translatable.png)](https://travis-ci.org/popox/translatable) [![Coverage Status](https://coveralls.io/repos/popox/translatable/badge.png)](https://coveralls.io/r/popox/translatable)
 ## Requirements
 
 * ActiveRecord 3.2

data/lib/translatable/active_record/adapter.rb

@@ -31,6 +31,25 @@ module Translatable
         stash.write(locale, name, value)
       end
 
+      def save_translations!
+        stash.reject {|locale, attrs| attrs.empty?}.each do |locale, attrs|
+          translations = record.translations_by_locale[locale]
+          attrs.each { |name, value|
+            translation = translations && translations[name] ||
+                record.translations.build(:locale => locale.to_s, :scope => record.class.table_name, :key => name)
+            translation['record_id'] = record.id
+            translation['value'] = value
+            translation.save!
+          }
+        end
+
+        reset
+      end
+
+      def reset
+        stash.clear
+      end
+
       protected
 
       def fetch_attribute(locale, name, value = nil)

data/lib/translatable/active_record/instance_methods.rb

@@ -8,50 +8,85 @@ module Translatable
       end
 
       def self.included(base)
-        # only Rails > 3.1.x compatibility
-        base.class_eval %{
-          def attributes=(attributes, *args)
-            with_given_locale(attributes) { super }
+        # Maintian Rails 3.0.x compatibility ..
+        if base.method_defined?(:assign_attributes)
+          base.class_eval %{
+            def assign_attributes(attributes, options = {})
+              with_given_locale(attributes) { super }
+            end
+          }
+        else
+          base.class_eval %{
+            def attributes=(attributes, *args)
+              with_given_locale(attributes) { super }
+            end
+
+            def update_attributes!(attributes, *args)
+              with_given_locale(attributes) { super }
+            end
+
+            def update_attributes(attributes, *args)
+              with_given_locale(attributes) { super }
+            end
+          }
+        end
+      end
+
+
+      def write_attribute(name, value, options = {})
+        if translated?(name) && translate?
+          options = {:locale => Translatable.locale}.merge(options)
+
+          # Dirty tracking, paraphrased from
+          # ActiveRecord::AttributeMethods::Dirty#write_attribute.
+          name_str = name.to_s
+          if attribute_changed?(name_str)
+            # If there's already a change, delete it if this undoes the change.
+            old = changed_attributes[name_str]
+            changed_attributes.delete(name_str) if value == old
+          else
+            # If there's not a change yet, record it.
+            serialized_value = read_attribute(name, options) if self.serialized_attributes.has_key?(name)
+            old = translatable.fetch(options[:locale], name, serialized_value)
+            old = old.clone if old.duplicable?
+            changed_attributes[name_str] = old if value != old
           end
-        }
-      end
-
-
-      #def write_attribute(name, value, options = {})
-      #  if translated?(name)
-      #    options = {:locale => Translatable.locale}.merge(options)
-      #
-      #    # Dirty tracking, paraphrased from
-      #    # ActiveRecord::AttributeMethods::Dirty#write_attribute.
-      #    name_str = name.to_s
-      #    if attribute_changed?(name_str)
-      #      # If there's already a change, delete it if this undoes the change.
-      #      old = changed_attributes[name_str]
-      #      changed_attributes.delete(name_str) if value == old
-      #    else
-      #      # If there's not a change yet, record it.
-      #      old = globalize.fetch(options[:locale], name)
-      #      old = old.clone if old.duplicable?
-      #      changed_attributes[name_str] = old if value != old
-      #    end
-      #
-      #    translatable.write(options[:locale], name, value)
-      #  else
-      #    super(name, value)
-      #  end
-      #end
+
+          translatable.write(options[:locale], name, value)
+        else
+          super(name, value)
+        end
+      end
 
       def translate
         @translate_me = true
         self
       end
 
+      def end_translate
+        @translate_me = nil
+        self
+      end
+
+      def reload(options = nil)
+        @translate_me = false
+        translation_caches.clear
+        translated_attribute_names.each { |name| @attributes.delete(name.to_s) }
+        translatable.reset
+        super(options)
+      end
+
+      def save(*)
+        @translate_me = false
+        super
+      end
+
       def translate?
         !@translate_me.nil? && @translate_me
       end
 
       def read_attribute(name, options = {})
-        options = {:translated => true, :locale => nil}.merge(options)
+        options = {:translated => true, :locale => Translatable.locale}.merge(options)
         if translated?(name) and options[:translated]
           serialized_value = super(name) if self.serialized_attributes.has_key?(name)
           if translate? && (value = translatable.fetch(options[:locale] || Translatable.locale, name, serialized_value))
@@ -68,6 +103,22 @@ module Translatable
         self.class.translated?(name)
       end
 
+      def translated_attributes
+        translated_attribute_names.inject({}) do |attributes, name|
+          attributes.merge(name.to_s => translation.send(name))
+        end
+      end
+
+      # This method is basically the method built into Rails
+      # but we have to pass {:translated => false}
+      def untranslated_attributes
+        attrs = {}
+        attribute_names.each do |name|
+          attrs[name] = read_attribute(name, {:translated => false})
+        end
+        attrs
+      end
+
       def translation_for(locale, name, build_if_missing = false)
         unless translation_caches["#{locale}_#{name}"]
           # Fetch translations from database as those in the translation collection may be incomplete
@@ -129,11 +180,29 @@ module Translatable
             attributes.try(:delete, :locale)
 
         if locale
+          already = translate?
+          translate unless translate?
           Translatable.with_locale(locale, &block)
+          end_translate unless already
         else
           yield
         end
       end
+
+      def translations_by_locale(&block)
+        translations.each_with_object(HashWithIndifferentAccess.new) do |t, hash|
+          hash[t.locale] ||= HashWithIndifferentAccess.new
+          hash[t.locale][t.key] = block_given? ? block.call(t) : t
+        end
+      end
+
+      protected
+
+      def save_translations!
+        translatable.save_translations!
+        translation_caches.clear
+      end
+
     end
   end
 end

data/lib/translatable/active_record/macro.rb

@@ -69,10 +69,8 @@ module Translatable
                  :extend      => HasManyExtensions,
                  :autosave    => false
 
-        #after_create :save_translations!
-        #after_update :save_translations!
-
-        #translation_class.instance_eval %{ attr_accessible :lang }
+        after_create :save_translations!
+        after_update :save_translations!
       end
     end
 

data/lib/translatable/version.rb

@@ -1,3 +1,3 @@
 module Translatable
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/lib/translatable.rb

@@ -7,7 +7,7 @@ module Translatable
 
   class << self
     def locale
-      I18n.locale
+      read_locale || I18n.locale
     end
 
     def locale=(locale)
@@ -16,9 +16,12 @@ module Translatable
 
     def with_locale(locale, &block)
       previous_locale = read_locale
-      set_locale(locale)
-      result = yield(locale)
-      set_locale(previous_locale)
+      begin
+        set_locale(locale)
+        result = yield(locale)
+      ensure
+        set_locale(previous_locale)
+      end
       result
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_translatable
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Paul Bonaud
@@ -25,6 +25,96 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pathname_local
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test_declarative
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,6 +129,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement