translatable_ar 1.0.3 → 1.0.4

data/lib/{active_record_methods.rb → active_record_base.rb}

@@ -1,5 +1,5 @@
 class TranslatableAR
-  module ActiveRecordMethods
+  module ActiveRecordBase
     extend ActiveSupport::Concern
 
     module ClassMethods
@@ -33,6 +33,7 @@ class TranslatableAR
           define_translatable_ar_writer(attribute)
           define_translatable_ar_reader(attribute)
           define_translatable_ar_changed?(attribute)
+          define_translatable_ar_before_type_cast(attribute)
         end
       end
   
@@ -70,6 +71,16 @@ class TranslatableAR
         end
       end
       
+      def define_translatable_ar_before_type_cast(attribute)
+        define_method("#{attribute}_before_type_cast") do
+          if respond_to?("#{attribute}_i18n")
+            send("#{attribute}_i18n_before_type_cast")[I18n.locale.to_s]
+          else
+            super()
+          end
+        end
+      end
+      
     end
   end
 end

data/lib/railtie.rb

@@ -33,15 +33,11 @@ class TranslatableAr < Rails::Railtie
     end
     
     def models
-      models = []
-      TranslatableAR.models.each do |model|
-        model.translatable_ar_attributes.each do |attribute|
-          if model.columns_hash["#{attribute}_i18n"].nil?
-            models << model
-          end
+      TranslatableAR.models.select do |model|
+        model.translatable_ar_attributes.any? do |attribute|
+          model.columns_hash["#{attribute}_i18n"].nil?
         end
       end
-      models.uniq!      
     end
     
     def attributes

data/lib/templates/setup.rb

@@ -40,4 +40,4 @@ attributes.each do |attribute| -%>
 end-%>
   end
 
-end
+end

data/lib/translatable_ar.rb

@@ -3,5 +3,6 @@ if defined? Rails
   require "railtie"
 end
 require 'translatable_ar_class'
-require 'active_record_methods'
-ActiveRecord::Base.send(:include, TranslatableAR::ActiveRecordMethods)
+require 'active_record_base'
+
+ActiveRecord::Base.send(:include, TranslatableAR::ActiveRecordBase)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translatable_ar
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -33,12 +33,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/active_record_methods.rb
+- lib/active_record_base.rb
 - lib/railtie.rb
 - lib/templates/setup.rb
 - lib/translatable_ar.rb
 - lib/translatable_ar_class.rb
-- test/rails_3.2.11/test/unit/product_test.rb
 homepage: http://github.com/kasperbn/translatable_ar
 licenses: []
 post_install_message: 
@@ -64,5 +63,4 @@ rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: i18n for your active record models with HStore / serialized attribute
-test_files:
-- test/rails_3.2.11/test/unit/product_test.rb
+test_files: []

data/test/rails_3.2.11/test/unit/product_test.rb

@@ -1,111 +0,0 @@
-require File.expand_path('../../test_helper', __FILE__)
-
-class ProductTest < ActiveSupport::TestCase
-
-  # Singular Association
-
-  test "build with nested locale values" do
-    p = Product.new(:name => {'en' => 'Chair', 'da' => 'Stol'}, image_url: '/image1.png')
-    assert_equal 'Chair', p.name_i18n['en']
-    assert_equal 'Stol', p.name_i18n['da']
-    assert_equal '/image1.png', p.image_url
-  end
-
-  test "build with default locale" do
-    p = Product.new(name: 'Table', image_url: '/image1.png')
-    assert_equal('Table', p.name)
-    assert_equal({'en' => 'Table'}, p.name_i18n)
-    assert_equal '/image1.png', p.image_url
-  end
-
-  test "create with nested locale values" do
-    p = Product.create(:name => {'en' => 'Chair', 'da' => 'Stol'}, image_url: '/image1.png', permalink: 'asd')
-    assert_equal 'Chair', p.name_i18n['en']
-    assert_equal 'Stol', p.name_i18n['da']
-    assert_equal '/image1.png', p.image_url
-    assert_equal 1, Product.count
-  end
-
-  test "create with default locale" do
-    p = Product.create(name: 'Table', image_url: '/image1.png')
-    assert_equal 'Table', p.name
-    assert_equal({'en' => 'Table'}, p.name_i18n)
-    assert_equal '/image1.png', p.image_url
-  end
-
-  test "update with nested locale values" do
-    p = Product.new
-    p.update_attributes(:name => {'en' => 'Chair', 'da' => 'Stol'}, image_url: '/image1.png')
-    assert_equal 'Chair', p.name_i18n['en']
-    assert_equal 'Stol', p.name_i18n['da']
-    assert_equal '/image1.png', p.image_url
-  end
-
-  test "update with locale" do
-    p = Product.new
-    p.update_attributes(name: 'Table', image_url: '/image1.png')
-    assert_equal 'Table', p.name
-    assert_equal({'en' => 'Table'}, p.name_i18n)
-    assert_equal '/image1.png', p.image_url
-  end
-
-  test "update with different locale" do
-    p = Product.create(name: 'Table', image_url: '/image1.png')
-    
-    assert_equal 'Table', p.name
-    assert_equal '/image1.png', p.image_url
-    
-    I18n.locale = :da
-    
-    assert_equal nil, p.name
-    assert_equal '/image1.png', p.image_url
-    
-    p.name = 'Bord'
-    
-    assert_equal 'Bord', p.name
-    assert_equal({'en' => 'Table', 'da' => 'Bord'}, p.name_i18n)
-    
-    p.save
-
-    I18n.locale = :en
-    
-    assert_equal 'Table', p.name
-    assert_equal({'en' => 'Table', 'da' => 'Bord'}, p.name_i18n)
-    
-  end
-
-  # Collection Association
-  
-  test "build from collection with nested locale values" do
-    c = Category.create(name: 'Furniture')
-    p = c.products.build(:name => {'en' => 'Chair', 'da' => 'Stol'}, image_url: '/image1.png')
-    assert_equal 'Chair', p.name_i18n['en']
-    assert_equal 'Stol', p.name_i18n['da']
-    assert_equal '/image1.png', p.image_url
-  end  
-  
-  test "build from collection with default locale" do
-    c = Category.create(name: 'Furniture')
-    p = c.products.build(name: 'Table', image_url: '/image1.png')
-    assert_equal('Table', p.name)
-    assert_equal({'en' => 'Table'}, p.name_i18n)
-    assert_equal '/image1.png', p.image_url
-  end
-
-  test "create from collection with nested locale values" do
-    c = Category.create(name: 'Furniture')
-    p = c.products.create(:name => {'en' => 'Chair', 'da' => 'Stol'}, image_url: '/image1.png')
-    assert_equal 'Chair', p.name_i18n['en']
-    assert_equal 'Stol', p.name_i18n['da']
-    assert_equal '/image1.png', p.image_url
-  end
-
-  test "create from collection with default locale" do
-    c = Category.create(name: 'Furniture')
-    p = c.products.create(name: 'Table', image_url: '/image1.png')
-    assert_equal 'Table', p.name
-    assert_equal({'en' => 'Table'}, p.name_i18n)
-    assert_equal '/image1.png', p.image_url
-  end
-  
-end