easy_translatable 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff59051dd5f5534569166f4b31b9ee93a7a637cd
-  data.tar.gz: 72c756caaca02663bc0fe02d61145b568f24324d
+  metadata.gz: d6d5a48b4e1cdd3ad7007081bdfe0561dd1a429c
+  data.tar.gz: 52e60d36a522792167113c202d9c14eeb90dc628
 SHA512:
-  metadata.gz: c603dbf48910d7bb8502408856ad56c9f3a9c8e14d12bbb071667bf8a3c8534ef5cd7d6e6876f56da503d290964602b7266fab076396e74b969ad985f7f03b4c
-  data.tar.gz: e2197b3097c3aef681045e244ac0ef60a3b017e2fbbbd4a5bcfa05d5c8766f58912f15e4710143dbbfd03a86c79efd8aef31e5330b46380553e82820b46d4838
+  metadata.gz: 53fc2b2560d9eeeec311705c39eb1cf8b6a3fbc528df54f6bd0a7ea04efe081c7998a58337604d5cc6056e8b58a03e3fbf78121599610452665af9e517561a4f
+  data.tar.gz: e3eca0c22e70e6890f333fd27d7a0473d280d719ad21630b7fc0f9c9170bf90343c7f466c7c49b41e191942a770e92aad4afb9b882e837e4a278c2e00104897d

data/lib/translatable/active_record/macro.rb

@@ -49,7 +49,7 @@ module Translatable
       def setup_translatable!(options)
         options[:table_name] ||= Translatable.translation_class.table_name
         options[:foreign_key] ||= 'record_id'
-        options[:conditions] ||= ''
+        options[:conditions] ||= {}
         options[:after_save] ||= false
         options[:before_save] ||= false
 
@@ -66,7 +66,7 @@ module Translatable
 
         has_many :translations, :class_name  => translation_class.name,
                  :foreign_key => options[:foreign_key],
-                 :conditions  => options[:conditions],
+                 :conditions  => conditions(options),
                  :dependent   => :destroy,
                  :extend      => HasManyExtensions,
                  :autosave    => false
@@ -74,6 +74,16 @@ module Translatable
         after_create :save_translations!
         after_update :save_translations!
       end
+      
+      def conditions(options)        
+        table_name = self.table_name      
+        proc { 
+          c = options[:conditions]
+          c = self.instance_eval(&c) if c.is_a?(Proc) 
+          c.merge(:scope => table_name, :locale => Translatable.locale)
+        }       
+      end
+      
     end
 
     module HasManyExtensions

data/lib/translatable/version.rb

@@ -1,3 +1,3 @@
 module Translatable
-  VERSION = '0.3.0'
-end
+  VERSION = '0.3.1'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_translatable
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Paul Bonaud
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Handle translations for AR models into a single table