multilang-hstore 0.4 → 1.0.0.rc1

data/lib/multilang-hstore.rb

@@ -1,8 +1,8 @@
 require 'multilang-hstore/version'
+require 'multilang-hstore/exceptions'
 require 'multilang-hstore/translation_proxy'
 require 'multilang-hstore/translation_keeper'
 require 'multilang-hstore/active_record_extensions'
-require 'activerecord-postgres-hstore'
 
 module Multilang
 end

data/lib/multilang-hstore/active_record_extensions.rb

@@ -1,11 +1,11 @@
 module Multilang
   module ActiveRecordExtensions
 
-    module ClassMethods
+    def self.raise_mass_asignment_deprecation_error!
+      raise Multilang::Exceptions::DeprecationError.new(":accessible was deprecated starting multilang-hstore >= 1.0.0 which is intended for Rails >= 4.0.0. Check more info about the deprecation of mass-asignment in Rails 4")
+    end
 
-      def multilang_accessible_translations
-        class_variable_get(:@@multilang_accessible_translations)
-      end
+    module ClassMethods
 
       def multilang(*args)
 
@@ -18,7 +18,7 @@ module Multilang
 
         options.assert_valid_keys([:required, :length, :accessible, :format, :nil])
 
-        define_translation_base! unless included_modules.include?(InstanceMethods)
+        define_translation_base!
 
         args.each do |attribute|
 
@@ -36,13 +36,12 @@ module Multilang
 
           #attribute accessibility for mass assignment
           if options[:accessible]
-            matr = multilang_accessible_translations + [attribute.to_sym]
-            class_variable_set(:@@multilang_accessible_translations, matr)
+            Multilang::ActiveRecordExtensions.raise_mass_asignment_deprecation_error!
           end
 
           module_eval do
             serialize "#{attribute}", ActiveRecord::Coders::Hstore
-          end
+          end if defined?(ActiveRecord::Coders::Hstore)
 
           I18n.available_locales.each do |locale|
 
@@ -56,8 +55,7 @@ module Multilang
 
             # locale based attribute accessibility for mass assignment
             if options[:accessible]
-              matr = multilang_accessible_translations + ["#{attribute}_#{locale}".to_sym]
-              class_variable_set(:@@multilang_accessible_translations, matr)
+              Multilang::ActiveRecordExtensions.raise_mass_asignment_deprecation_error!
             end
 
             # attribute presence validator
@@ -88,29 +86,18 @@ module Multilang
       private
 
       def define_translation_base!
-        include InstanceMethods
 
         define_method "multilang_translation_keeper" do |attribute|
           unless instance_variable_defined?("@multilang_attribute_#{attribute}")
             instance_variable_set("@multilang_attribute_#{attribute}", MultilangTranslationKeeper.new(self, attribute))
           end
           instance_variable_get "@multilang_attribute_#{attribute}"
-        end
-
-        unless class_variable_defined?(:@@multilang_accessible_translations)
-          class_variable_set(:@@multilang_accessible_translations, [])
-        end
+        end unless method_defined? :multilang_translation_keeper
 
       end
 
     end
 
-    module InstanceMethods
-      def mass_assignment_authorizer(role = :default)
-        super(role) + (self.class.multilang_accessible_translations || [])
-      end
-    end #module InstanceMethods
-
   end #module ActiveRecordExtensions
 end ##module Multilang
 

data/lib/multilang-hstore/translation_keeper.rb

@@ -124,6 +124,7 @@ module Multilang
     end
 
     def flush!
+      @model.send("#{@attribute}_will_change!")
       @model[@attribute] = @translations
     end
 

data/lib/multilang-hstore/version.rb

@@ -1,3 +1,3 @@
 module Multilang
-  VERSION = "0.4"
+  VERSION = "1.0.0.rc1"
 end

data/spec/multilang_spec.rb

@@ -139,52 +139,24 @@ describe Multilang do
     rp.body_ru.should == "Русский текст"
   end
 
-  it "should not mass assign attributes in ProtectedPost" do
-    rp = ProtectedPost.new( :title_lv => "Latviešu nosaukums",
-                            :title_ru => "Русский заголовок",
-                            :body_lv => "Latviešu apraksts",
-                            :body_ru => "Русский текст" )
-    
-    # test
-    rp.title_lv.should_not == "Latviešu nosaukums"
-    rp.body_lv.should_not == "Latviešu apraksts"
-    rp.title_ru.should_not == "Русский заголовок"
-    rp.body_ru.should_not == "Русский текст"
-  end
-
-  
-  it "should mass assign attributes in RegulularPost, v2" do
-    rp = RegularPost.new( { :title => {
-                              :lv => "Latviešu nosaukums",
-                              :ru => "Русский заголовок"
-                            },
-                            :body => {:lv => "Latviešu apraksts",
-                              :ru => "Русский текст"
-                            }
-                          } )
-    
-    # test
-    rp.title_lv.should == "Latviešu nosaukums"
-    rp.body_lv.should == "Latviešu apraksts"
-    rp.title_ru.should == "Русский заголовок"
-    rp.body_ru.should == "Русский текст"
+  it "should raise an exception if the deprecated option :accessible is passed as true" do
+    expect {
+      class ProtectedPost < ActiveRecord::Base
+        self.table_name = 'protected_posts'
+        multilang :title, :accessible => true
+        multilang :body,  :accessible => true
+      end
+    }.to raise_error(Multilang::Exceptions::DeprecationError)
   end
 
-  it "should not not mass assign attributes in ProtectedPost, v2" do
-    rp = ProtectedPost.new( { :title => {
-                                :lv => "Latviešu nosaukums",
-                                :ru => "Русский заголовок"
-                              },
-                              :body => {:lv => "Latviešu apraksts",
-                                :ru => "Русский текст"
-                              }
-                            } )
-    
-    # test
-    rp.title_lv.should_not == "Latviešu nosaukums"
-    rp.body_lv.should_not == "Latviešu apraksts"
-    rp.title_ru.should_not == "Русский заголовок"
-    rp.body_ru.should_not == "Русский текст"
+  it "should not raise an exception if the deprecated option :accessible is passed as false" do
+    expect {
+      class ProtectedPost < ActiveRecord::Base
+        self.table_name = 'protected_posts'
+        multilang :title, :accessible => false
+        multilang :body,  :accessible => false
+      end
+    }.to_not raise_error(Multilang::Exceptions::DeprecationError)
   end
 
   it "should save/load attributes in RegularPost" do
@@ -280,4 +252,32 @@ describe Multilang do
     
   end
 
+  it "should load the updated translations" do
+    # create
+    post = NamedPost.new
+    post.title = {:en=>"English", :es=>"Spanish"}
+    post.name = "First"
+    post.save!
+
+    # query
+    query_post = NamedPost.where(:name=>"First").first
+    query_post.should_not be_nil
+    I18n.locale = :es
+    query_post.title.should == "Spanish"
+    I18n.locale = :en
+    query_post.title.should == "English"
+   
+    # update
+    query_post.title = {:en=>"English USA", :es=>"Spanish LAT"}
+    query_post.save!
+
+    #reload
+    query_post = NamedPost.where(:name=>"First").first
+    query_post.should_not be_nil
+    I18n.locale = :es
+    query_post.title.should == "Spanish LAT"
+    I18n.locale = :en
+    query_post.title.should == "English USA"
+  end
+
 end

data/spec/schema.rb

@@ -1,19 +1,15 @@
 ActiveRecord::Schema.define(:version => 1) do
+
   create_table :abstract_posts do |t|
     t.hstore :title
     t.hstore :body
+    t.string :name
     t.integer :void, :default => 1
   end
 
-  #create_table :posts do |t|
-  #  t.text :title
-  #  t.text :body
-  #  t.integer :void, :default => 1
-  #end
+  create_table :named_posts do |t|
+    t.hstore :title
+    t.string :name
+  end
 
-  #create_table :pages do |t|
-  #  t.text :title
-  #  t.text :body
-  #  t.integer :void, :default => 1
-  #end
 end

data/spec/spec_helper.rb

@@ -4,8 +4,6 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 require 'rubygems'
 require 'active_support'
 require 'active_record'
-require 'activerecord-postgres-hstore/activerecord'
-require 'activerecord-postgres-hstore/coder'
 require 'multilang-hstore'
 require 'logger'
 
@@ -28,34 +26,27 @@ end
 
 #testable models
 class AbstractPost < ActiveRecord::Base
-  serialize :title, ActiveRecord::Coders::Hstore
-  serialize :body, ActiveRecord::Coders::Hstore
 end
 
 class MinimalPost < ActiveRecord::Base
   self.table_name = 'abstract_posts'
-  multilang :title, :required => false,  :accessible => true
-  multilang :body,  :required => false, :accessible => true
-  attr_accessible :void
+  multilang :title, :required => false
+  multilang :body,  :required => false
 end
 
 class RegularPost < ActiveRecord::Base
   self.table_name = 'abstract_posts'
-  multilang :title, :required => true, :length => 25,   :accessible => true
-  multilang :body,  :required => true, :length => 1000, :accessible => true
-  attr_accessible :void
-end
-
-class ProtectedPost < ActiveRecord::Base
-  self.table_name = 'abstract_posts'
-  multilang :title, :accessible => false
-  multilang :body,  :accessible => false
-  attr_accessible :void
+  multilang :title, :required => true, :length => 25
+  multilang :body,  :required => true, :length => 1000
 end
 
 class PartialPost < ActiveRecord::Base
   self.table_name = 'abstract_posts'
   multilang :title
   multilang :body
-  attr_accessible :void
+end
+
+class NamedPost < ActiveRecord::Base
+  self.table_name = 'named_posts'
+  multilang :title
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: multilang-hstore
 version: !ruby/object:Gem::Version
-  version: '0.4'
-  prerelease: 
+  version: 1.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Arthur Meinart
@@ -29,13 +29,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: activerecord-postgres-hstore
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 4.0.0
 description: Model translations for Rails 3 backed by PostgreSQL and Hstore
 email: hello@heapsource.com
 executables: []
@@ -73,9 +73,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25