easy_translatable 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07c01316196483c2f6af68455278d9e92c16dd48
-  data.tar.gz: 91caddf7318b585c7db393c4bda5784784e7b7b0
+  metadata.gz: d87d6fc4d906ec7164dc1afa51c00e91fb4a75a1
+  data.tar.gz: c667ece3ff6da305d1a92e5f10c842b49c412d00
 SHA512:
-  metadata.gz: 61de0f484b7f8637f1ccff01d020eaa9ae3d47c24563c5dcbbec69de1f7643111f02dcc5e71ffb6d4c1b4f50fd9c1ab3dda40ab6379b98b6ba7fb3c7ecfe2817
-  data.tar.gz: 82d6f692782508f0d5555f0f0cc833feab8446aee5d1b3991be66bf4498471e16adde80a81b3106e49975d225fec7ae9d611686ce6b741d45315d9c9c69eaa9e
+  metadata.gz: 86540d0c52254e9958ac5496d4dc146dac7671e7a16db19d19190a5eb4b9a850498d86fee171262cd4a0cecb761fb715881282fbf5e8f1f5a80beeeeb3fede68
+  data.tar.gz: 3a116572954e6de7d712b9c599f2d8c4f227ad253633eaf5269592d60767683eb0e8a5b90cf27ed1bfe50284d06034d996c0e4ffb76de25bf1959830610dd19d

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2008, 2009, 2010 Sven Fuchs, Joshua Harvey, Clemens Kofler, John-Paul Bader, ClicRDV
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,4 +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) [![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)
+# Translatable [![Gem Version](https://badge.fury.io/rb/easy_translatable.png)](http://badge.fury.io/rb/easy_translatable) [![Code Climate](https://codeclimate.com/github/clicrdv/translatable.png)](https://codeclimate.com/github/clicrdv/translatable) [![Build Status](https://travis-ci.org/clicrdv/translatable.png)](https://travis-ci.org/clicrdv/translatable) [![Coverage Status](https://coveralls.io/repos/clicrdv/translatable/badge.png)](https://coveralls.io/r/clicrdv/translatable)
 ## Requirements
 
 * ActiveRecord 3.2
@@ -23,3 +23,6 @@ gem 'easy_translatable', '~> 0.1.0'
 - cleanup
 - doc
 - migration/model for translation table
+
+
+Copyright (c) 2008, 2009, 2010 Sven Fuchs, Joshua Harvey, Clemens Kofler, John-Paul Bader, ClicRDV

data/lib/translatable/active_record/class_methods.rb

@@ -39,18 +39,18 @@ module Translatable
         end
       end
 
-      def on_after_save_callback(attr_names, callback)
-        after_save callback, :if => Proc.new { |rec|
+      def condition_callback(attr_names, callback)
+        Proc.new { |rec|
           attr_names.any? do |translatable_attr|
             callback && rec.changes.keys.include?(translatable_attr.to_s)
           end
         }
       end
 
-      def on_before_save_callback(attr_names, callback)
-        before_save callback, :if => Proc.new { |rec|
-          attr_names.any? do |translatable_attr|
-            callback && rec.changes.keys.include?(translatable_attr.to_s)
+      %w(after_save before_save after_update before_update).each do |cb|
+        class_eval  %{
+          def on_#{cb}_callback(attr_names, callback)
+            #{cb} callback, :if => condition_callback(attr_names, callback)
           end
         }
       end

data/lib/translatable/active_record/instance_methods.rb

@@ -179,7 +179,7 @@ module Translatable
         locale = respond_to?(:locale=) ? attributes.try(:[], :locale) :
             attributes.try(:delete, :locale)
 
-        if locale
+        if locale && !respond_to?(:locale=)
           already = translate?
           translate unless translate?
           Translatable.with_locale(locale, &block)

data/lib/translatable/active_record/macro.rb

@@ -26,6 +26,8 @@ module Translatable
 
           on_after_save_callback(attr_names, options[:after_save]) if options[:after_save]
           on_before_save_callback(attr_names, options[:before_save]) if options[:before_save]
+          on_after_update_callback(attr_names, options[:after_update]) if options[:after_update]
+          on_before_update_callback(attr_names, options[:before_update]) if options[:before_update]
 
           Translatable.add_translatable self
 

data/lib/translatable/version.rb

@@ -1,3 +1,3 @@
 module Translatable
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_translatable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Paul Bonaud
@@ -164,6 +164,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - lib/translatable.rb
 - lib/translatable/active_record.rb