i18n_alchemy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0cdd8714968ef991225eebdcec192d500899088
-  data.tar.gz: e06cc5ccd8b1f592944afead78b89cfc729c5916
+  metadata.gz: 68f198998d37ed939ead93b7a86d836fa73b8e7c
+  data.tar.gz: 880e2dbb5699e4a714922e5fc40958929b3b7d48
 SHA512:
-  metadata.gz: ce91056f4f49686040773feb06d6114357519d38e15470cd8d3a7302501648f4eefc0c378cad331ff86da5d86e1c830835aebc9a1d523e890f5a9fac509dcbbc
-  data.tar.gz: 269f78adb7f6eb001ca83b9f830a95bb9f081bb18d49d0a6727253056bdc18d9400aabbe52c3deddde249155c4e81f79211a3809a7f9b315f952bd0f0783beca
+  metadata.gz: ca5de87fe772476d5f48507a1d0b8ae2cd9dc40521a878a1a61c0d24ccfb1f338a096fde002fbd38540eed82fd574b6055657d7717b338c2aaa71a5e96c64b51
+  data.tar.gz: 9c5ceb2c9203ac97686f7f0f6b45bf3e27aa184985b22eb7451c5cc063b60b215763a2307a691375fd39f930433fd2fe420b035192b365167b36ff859fded590

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## v0.2.2 - 2015-08-26
+
+* Rails 4.2 and Ruby 2.2 support (Rails 4.2.1+ support by [@Danielpk](https://github.com/Danielpk))
+
 ## v0.2.1 - 2014-05-05
 
-* Rails 4.1 support ([@sobrinho][https://github.com/sobrinho])
+* Rails 4.1 support ([@sobrinho](https://github.com/sobrinho))
 
 ## v0.2.0 - 2013-11-28
 
@@ -14,7 +18,7 @@
 * Improve localization for non-AR objects
 * Allow custom parsers to accept a parser module
 * Add support for localizing methods
-* Add support for custom parsers ([@caironoleto][https://github.com/caironoleto])
+* Add support for custom parsers ([@caironoleto](https://github.com/caironoleto))
 
 ## v0.0.1 - 2012-5-8
 

data/lib/i18n_alchemy/proxy.rb

@@ -46,6 +46,7 @@ module I18n
       # Allow calling localized methods with :send. This allows us to integrate
       # with action view methods.
       alias :send :__send__
+      alias :public_send :__send__
 
       # Allow calling localized methods with :try. If the method is not declared
       # here, it'll be delegated to the target, losing localization capabilities.
@@ -69,7 +70,7 @@ module I18n
       def build_attributes
         @target_class.columns.each do |column|
           column_name = column.name
-          next if column.primary || column_name.ends_with?("_id") || @localized_attributes.key?(column_name)
+          next if skip_column?(column_name)
 
           parser = detect_parser_from_column(column)
           build_attribute(column_name, parser)
@@ -142,6 +143,12 @@ module I18n
           type_or_parser
         end
       end
+
+      def skip_column?(column_name)
+        column_name == @target_class.primary_key ||
+          column_name.ends_with?("_id") ||
+          @localized_attributes.key?(column_name)
+      end
     end
   end
 end

data/lib/i18n_alchemy/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Alchemy
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/test/action_view_test.rb

@@ -21,37 +21,45 @@ class ActionViewTest < I18n::Alchemy::TestCase
   end
 
   def test_text_field_with_string_attribute
-    assert_equal text_input(:name, 'Potato'),
-      @template.text_field(:product, :name, :object => @localized)
+    assert_same_text_input :name, 'Potato'
   end
 
   def test_text_field_with_integer_attribute
-    assert_equal text_input(:quantity, '10'),
-      @template.text_field(:product, :quantity, :object => @localized)
+    assert_same_text_input :quantity, '10'
   end
 
   def test_text_field_with_decimal_attribute
-    assert_equal text_input(:price, '1,99'),
-      @template.text_field(:product, :price, :object => @localized)
+    assert_same_text_input :price, '1,99'
   end
 
   def test_text_field_with_date_attribute
-    assert_equal text_input(:released_at, '28/02/2011'),
-      @template.text_field(:product, :released_at, :object => @localized)
+    assert_same_text_input :released_at, '28/02/2011'
   end
 
   def test_text_field_with_time_attribute
-    assert_equal text_input(:last_sale_at, '28/02/2011 13:25:30'),
-      @template.text_field(:product, :last_sale_at, :object => @localized)
+    assert_same_text_input :last_sale_at, '28/02/2011 13:25:30'
   end
 
   private
 
-  def text_input(attribute_name, value)
+  # Since we do not want to rely on Rails dom-assertions (neither from the
+  # framework nor from the extracted gem), we build our own :).
+  def assert_same_text_input(attribute, value)
+    assert_includes [
+      text_input_sorted_attributes(attribute, value),
+      text_input_unsorted_attributes(attribute, value)
+    ], @template.text_field(:product, attribute, :object => @localized)
+  end
+
+  def text_input_sorted_attributes(attribute_name, value)
     size = rails4? ? ' ' : ' size="30" '
     %Q[<input id="product_#{attribute_name}" name="product[#{attribute_name}]"#{size}type="text" value="#{value}" />]
   end
 
+  def text_input_unsorted_attributes(attribute_name, value)
+    %Q[<input type="text" value="#{value}" name="product[#{attribute_name}]" id="product_#{attribute_name}" />]
+  end
+
   def rails4?
     ActionPack::VERSION::STRING.start_with? "4"
   end

data/test/db/test_schema.rb

@@ -8,7 +8,7 @@ ActiveRecord::Schema.define do
 
   create_table :products do |t|
     t.string     :name
-    t.decimal    :price
+    t.decimal    :price, precision: 10, scale: 2
     t.integer    :quantity
     t.date       :released_at
     t.date       :released_month
@@ -25,6 +25,6 @@ ActiveRecord::Schema.define do
   create_table :accounts do |t|
     t.references :supplier
     t.string     :account_number
-    t.decimal    :total_money
+    t.decimal    :total_money, precision: 10, scale: 2
   end
 end

data/test/i18n_alchemy/proxy/attributes_parsing_test.rb

@@ -88,7 +88,7 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
   def test_should_assign_for_nested_attributes_for_one_to_one_association
     @supplier_localized.assign_attributes(:account_attributes => {:account_number => 10, :total_money => '100,87'})
     account = @supplier_localized.account
-    assert_equal 10, account.account_number
+    assert_equal '10', account.account_number.to_s
     assert_equal '100,87', account.localized.total_money
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n_alchemy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Carlos Antonio da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +73,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: i18n_alchemy
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: I18n date/number parsing/localization