translatable 0.1.4 → 0.2.0

data/README.rdoc

@@ -72,9 +72,10 @@ Block accepts following methods:
       OR
       translatable_locale :lang
 
+  translatable_attr_accessible
   translatable_attr_protected
-    If this line is set then the attributes :locale and :origin will be protected from
-    mass-assigment, otherwise they will be available.
+    If this line is set then the attributes :locale and :origin will be allowed or protected
+    from for mass-assigment.
 
     Note: Note sure that this is the best implementation. Would appreciate any better ideas.
 
@@ -140,6 +141,7 @@ Models:
         translatable  :content, :presence => true
         translatable_model "TranslatedNews"
         translatable_origin :origin_id
+        translatable_attr_accessible
       end
 
       attr_accessible :author_id, :author

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/lib/translatable.rb

@@ -118,7 +118,21 @@ module ActiveRecord
       # Default: false
       #
       def translatable_attr_protected
-        @translatable[:attr_protected] = true
+        @translatable[:attr_accessible] = false
+      end
+
+      ###
+      # Will not register the attributes as accessible.
+      # IMPORTANT: Translatable block will be evaluated on the model after it
+      # was loaded, so it will modify certain thing on final version. Hence this thing is needed.
+      # Examples:
+      #
+      #   translatable_attr_protected
+      #
+      # Default: false
+      #
+      def translatable_attr_accessible
+        @translatable[:attr_accessible] = true
       end
 
       ###
@@ -208,10 +222,14 @@ module ActiveRecord
           validates :#{@translatable[:locale]}, :uniqueness => { :scope => :#{@translatable[:origin]}_id }
 
           belongs_to :#{@translatable[:origin]}, :class_name => "#{self.name}"
-
-          attr_#{!!@translatable[:attr_protected] ? "protected" : "accessible" } :#{@translatable[:locale]}, :#{@translatable[:origin]}_id
         RUBY
 
+        unless @translatable[:attr_accessible].nil?
+          @translatable[:model].module_eval <<-RUBY, __FILE__, __LINE__ + 1
+            attr_#{!!@translatable[:attr_accessible] ? "accessible" : "protected" } :#{@translatable[:locale]}, :#{@translatable[:origin]}_id
+          RUBY
+        end
+
         @translatable[:properties].each do |p|
           if p.size > 1
             @translatable[:model].module_eval <<-RUBY, __FILE__, __LINE__ + 1

data/test/messages.rb

@@ -41,6 +41,7 @@ end
 
 class TranslatedMessage < ActiveRecord::Base
   attr_accessible :title, :content
+  attr_accessible :title, :content, :locale, :as => :editor
 
   before_validation :set_default_locale, :if => :writer_id
   before_create :duplicate_writer_id, :unless => :writer_id
@@ -65,7 +66,6 @@ class Message < ActiveRecord::Base
     translatable  :content, :presence => true
     translatable_model 'TranslatedMessage'
     translatable_origin :message
-    translatable_attr_protected
   end
 
   attr_accessible :writer_id, :writer

data/test/news.rb

@@ -52,6 +52,7 @@ class News < ActiveRecord::Base
   translatable do
     translatable  :title
     translatable  :content
+    translatable_attr_accessible
   end
 
   attr_accessible :author_id, :author

data/test/posts.rb

@@ -60,6 +60,7 @@ class Post < ActiveRecord::Base
     translatable  :content, :presence => true
     translatable_model 'TranslatedPost'
     translatable_origin :post
+    translatable_attr_accessible
   end
 
   attr_accessible :writer_id, :writer

data/test/test_translatable.rb

@@ -229,6 +229,15 @@ class TestDmTranslatable < Test::Unit::TestCase
     assert_equal nil, tm.message_id
   end
 
+  def test_protected_editor_mass_assigment
+    tm = TranslatedMessage.new( {:title => "Resent Post", :content => "That is where the text goes", :locale => "en", :message_id => 1}, :as => :editor)
+
+    assert_equal "Resent Post", tm.title
+    assert_equal "That is where the text goes", tm.content
+    assert_equal "en", tm.locale
+    assert_equal nil, tm.message_id
+  end
+
   def test_accessible_mass_assigment
     tp = TranslatableNews.new( :title => "Resent News", :content => "That is where the text goes", :locale => "en", :origin_id => 1)
 

data/translatable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "translatable"
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["E-Max"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translatable
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &74173130 !ruby/object:Gem::Requirement
+  requirement: &84919140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74173130
+  version_requirements: *84919140
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &74172880 !ruby/object:Gem::Requirement
+  requirement: &84918890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74172880
+  version_requirements: *84918890
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &74172640 !ruby/object:Gem::Requirement
+  requirement: &84918650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74172640
+  version_requirements: *84918650
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &74172400 !ruby/object:Gem::Requirement
+  requirement: &84918410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *74172400
+  version_requirements: *84918410
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &74172160 !ruby/object:Gem::Requirement
+  requirement: &84918150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *74172160
+  version_requirements: *84918150
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &74171880 !ruby/object:Gem::Requirement
+  requirement: &84917890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *74171880
+  version_requirements: *84917890
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &74171640 !ruby/object:Gem::Requirement
+  requirement: &84917640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *74171640
+  version_requirements: *84917640
 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: -993677265
+      hash: 896165331
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: