translatable 0.1.3 → 0.1.4

data/README.rdoc

@@ -72,6 +72,12 @@ Block accepts following methods:
       OR
       translatable_locale :lang
 
+  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.
+
+    Note: Note sure that this is the best implementation. Would appreciate any better ideas.
+
 == Now to create the translations?
 
  They can be created in two different ways:

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/translatable.rb

@@ -107,6 +107,20 @@ module ActiveRecord
         @translatable[:origin] = translatable_origin_prepared origin_key
       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_protected
+        @translatable[:attr_protected] = true
+      end
+
       ###
       # Define the key that the translation will be used for belongs_to association,
       # to communicate with original model
@@ -195,7 +209,7 @@ module ActiveRecord
 
           belongs_to :#{@translatable[:origin]}, :class_name => "#{self.name}"
 
-          attr_accessible :#{@translatable[:locale]}, :#{@translatable[:origin]}_id
+          attr_#{!!@translatable[:attr_protected] ? "protected" : "accessible" } :#{@translatable[:locale]}, :#{@translatable[:origin]}_id
         RUBY
 
         @translatable[:properties].each do |p|

data/test/messages.rb

@@ -0,0 +1,72 @@
+require 'active_record'
+require 'translatable'
+
+class CreateMessagesTables < ActiveRecord::Migration
+  def up
+    create_table(:writers, :force => true) do |t|
+      t.string :name, :null => false
+
+      t.timestamps
+    end
+
+    create_table(:translated_messages) do |t|
+      t.string :title, :null => false
+      t.string :content, :null => false
+      t.integer :message_id, :null => false
+      t.string :locale, :null => false, :limit => 2
+      t.integer :writer_id
+
+      t.timestamps
+    end
+
+    create_table(:messages) do |t|
+      t.integer :writer_id
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table(:writers)
+    drop_table(:translated_messages)
+    drop_table(:messages)
+  end
+end
+
+CreateMessagesTables.migrate(:up)
+
+class Author < ActiveRecord::Base
+  validates :name, :presence => true
+end
+
+class TranslatedMessage < ActiveRecord::Base
+  attr_accessible :title, :content
+
+  before_validation :set_default_locale, :if => :writer_id
+  before_create :duplicate_writer_id, :unless => :writer_id
+
+  protected
+
+  def set_default_locale
+    self.locale ||= ::I18n.locale
+  end
+
+  def duplicate_writer_id
+    self.writer_id = message.writer_id
+  end
+end
+
+class Message < ActiveRecord::Base
+
+  belongs_to  :writer
+
+  translatable do
+    translatable  :title, :presence => true, :uniqueness => true
+    translatable  :content, :presence => true
+    translatable_model 'TranslatedMessage'
+    translatable_origin :message
+    translatable_attr_protected
+  end
+
+  attr_accessible :writer_id, :writer
+end

data/test/posts.rb

@@ -3,7 +3,7 @@ require 'translatable'
 
 class CreatePostsTables < ActiveRecord::Migration
   def up
-    create_table(:writers) do |t|
+    create_table(:writers, :force => true) do |t|
       t.string :name, :null => false
 
       t.timestamps

data/test/test_translatable.rb

@@ -2,6 +2,7 @@
 require 'helper'
 require 'news'
 require 'posts'
+require 'messages'
 
 class TestDmTranslatable < Test::Unit::TestCase
 
@@ -218,4 +219,22 @@ class TestDmTranslatable < Test::Unit::TestCase
 
     assert_equal post, post.translations.first.post
   end
+
+  def test_protected_mass_assigment
+    tm = TranslatedMessage.new( :title => "Resent Post", :content => "That is where the text goes", :locale => "en", :message_id => 1)
+
+    assert_equal "Resent Post", tm.title
+    assert_equal "That is where the text goes", tm.content
+    assert_equal nil, 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)
+
+    assert_equal "Resent News", tp.title
+    assert_equal "That is where the text goes", tp.content
+    assert_equal "en", tp.locale
+    assert_equal 1, tp.origin_id
+  end
 end

data/translatable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "translatable"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["E-Max"]
-  s.date = "2012-08-19"
+  s.date = "2012-08-25"
   s.description = "This game was build to make whole proccess of working with translation for DM to be almost invisble. That was THE AIM."
   s.email = "max@studentify.nl"
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/translatable.rb",
     "test/helper.rb",
+    "test/messages.rb",
     "test/news.rb",
     "test/posts.rb",
     "test/support/active_record.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translatable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000Z
+date: 2012-08-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &74385030 !ruby/object:Gem::Requirement
+  requirement: &74173130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74385030
+  version_requirements: *74173130
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &74384790 !ruby/object:Gem::Requirement
+  requirement: &74172880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74384790
+  version_requirements: *74172880
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &74384550 !ruby/object:Gem::Requirement
+  requirement: &74172640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74384550
+  version_requirements: *74172640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &74384310 !ruby/object:Gem::Requirement
+  requirement: &74172400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *74384310
+  version_requirements: *74172400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &74384070 !ruby/object:Gem::Requirement
+  requirement: &74172160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *74384070
+  version_requirements: *74172160
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &74383830 !ruby/object:Gem::Requirement
+  requirement: &74171880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *74383830
+  version_requirements: *74171880
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &74383590 !ruby/object:Gem::Requirement
+  requirement: &74171640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *74383590
+  version_requirements: *74171640
 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
@@ -108,6 +108,7 @@ files:
 - VERSION
 - lib/translatable.rb
 - test/helper.rb
+- test/messages.rb
 - test/news.rb
 - test/posts.rb
 - test/support/active_record.rb
@@ -129,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 853174477
+      hash: -993677265
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: