lolita-translation 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eacac6197ace9e935ccd39162554799972f60d55
-  data.tar.gz: 05a8129d30433e5ac38c22adcfa4abf5a5b980bc
+  metadata.gz: 0d13f0b3c8ae3cfd3e2464773538a6ab3f21552a
+  data.tar.gz: 171b142817fef43c89ee2e274306e7dbe35feb19
 SHA512:
-  metadata.gz: 078b5e8431713ed62eaefbe7495963ff9637a72e5c990b3c3a14631a4de49a0137eec45add6f43b153b75ae9a5be0d1a34c4ebc8a3bccb8a695816ee9c95c024
-  data.tar.gz: 31cb44081b8aa06e8ca46afe54d677bda2c234276d71da8726759726bb65b70a14cc26efe6ac430d43347dff761ffaa668d7a25e3f78c73c0d7e91e6a1a43fbe
+  metadata.gz: 71da84d89a2c4a43c5c7cefa609a66a72927f4e8edcdfb15350b7d469e413904c906995cea85a883aa3a3badac4076df843b94ad6f04fafe40266ab4fa8a1167
+  data.tar.gz: 722fd8ac3412b58df090a2f5087e1af4ea61dbe06a0179ae46cbf255d6470e306ec9a26c1695d64246ec2de842c986e4bd6e43d1f2a58117527c0f7248ab9ebc

data/lib/lolita-translation/builder/active_record_builder.rb

@@ -36,11 +36,21 @@ module Lolita
         def add_ar_klass_attr_accessible attributes
           ar_translation_builder = self
           klass.class_eval do
-            attr_accessible :locale, *attributes
+            if ar_translation_builder.send(:attr_accessible_required?, ar_translation_builder.base_klass)
+              attr_accessible :locale, *attributes
+            end
             self.table_name = ar_translation_builder.table_name
           end
         end
 
+        def attr_accessible_required? klass
+          if defined?(ActiveModel::ForbiddenAttributesProtection)
+            !klass.ancestors.include?(ActiveModel::ForbiddenAttributesProtection)
+          else
+            true
+          end
+        end
+
         def add_ar_klass_table_name name
           klass.class_eval do
             self.table_name = name
@@ -79,7 +89,9 @@ module Lolita
               :dependent => :destroy
             })
             base_klass.accepts_nested_attributes_for translations_association_name, :allow_destroy => true, :reject_if => nested_attributes_rejection_proc
-            base_klass.attr_accessible :translations_attributes,  locale_field_name
+            if attr_accessible_required? base_klass
+              base_klass.attr_accessible :translations_attributes, locale_field_name
+            end
           end
         end
 

data/lib/lolita-translation/version.rb

@@ -3,7 +3,7 @@ module Lolita
     module Version
       MAJOR = 0
       MINOR = 7
-      PATCH = 1
+      PATCH = 2
       BUILD = nil
 
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-translation
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - ITHouse (Latvia) and Arturs Meisters