i18n_alchemy 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.2.0 - 2013-11-28
+
+* Rails 4 integration
+* Drop support to Ruby 1.8.7 and Rails 3.0 / 3.1
+* Remove support to passing old mass assignment options to assign methods (:without_protection and friends)
+
 ## v0.1.0 - 2013-2-27
 
 * Fix json serialization to delegate to the target object instead of the proxy

data/README.md

@@ -1,6 +1,8 @@
 ## I18nAlchemy
 
-[![Build Status](https://secure.travis-ci.org/carlosantoniodasilva/i18n_alchemy.png)](http://travis-ci.org/carlosantoniodasilva/i18n_alchemy)
+[![Gem Version](https://badge.fury.io/rb/i18n_alchemy.png)](http://badge.fury.io/rb/i18n_alchemy)
+[![Build Status](https://api.travis-ci.org/carlosantoniodasilva/i18n_alchemy.png?branch=master)](http://travis-ci.org/carlosantoniodasilva/i18n_alchemy)
+[![Code Climate](https://codeclimate.com/github/carlosantoniodasilva/i18n_alchemy.png)](https://codeclimate.com/github/carlosantoniodasilva/i18n_alchemy)
 
 I18n date/number parsing/localization
 

data/lib/i18n_alchemy.rb

@@ -14,8 +14,8 @@ module I18n
   module Alchemy
     extend ActiveSupport::Concern
 
-    def localized(attributes=nil, *args)
-      I18n::Alchemy::Proxy.new(self, attributes, *args)
+    def localized(attributes = nil)
+      I18n::Alchemy::Proxy.new(self, attributes)
     end
 
     included do
@@ -25,8 +25,7 @@ module I18n
     end
 
     module ClassMethods
-      def localize(*methods)
-        options = methods.extract_options!
+      def localize(*methods, options)
         parser  = options[:using]
         methods = methods.each_with_object({}) do |method_name, hash|
           hash[method_name] = parser

data/lib/i18n_alchemy/attributes_parsing.rb

@@ -5,22 +5,16 @@ module I18n
         @target.attributes = parse_attributes(attributes)
       end
 
-      # This method is added to the proxy even thought it does not exist in
-      # Rails 3.0 (only >= 3.1).
-      def assign_attributes(attributes, *args)
-        if @target.respond_to?(:assign_attributes)
-          @target.assign_attributes(parse_attributes(attributes), *args)
-        else
-          self.attributes = attributes
-        end
+      def assign_attributes(attributes)
+        @target.assign_attributes(parse_attributes(attributes))
       end
 
-      def update_attributes(attributes, *args)
-        @target.update_attributes(parse_attributes(attributes), *args)
+      def update_attributes(attributes)
+        @target.update_attributes(parse_attributes(attributes))
       end
 
-      def update_attributes!(attributes, *args)
-        @target.update_attributes!(parse_attributes(attributes), *args)
+      def update_attributes!(attributes)
+        @target.update_attributes!(parse_attributes(attributes))
       end
 
       def update_attribute(attribute, value)

data/lib/i18n_alchemy/proxy.rb

@@ -1,13 +1,17 @@
 module I18n
   module Alchemy
-    # Depend on AS::BasicObject which has a "blank slate" - no methods.
-    class Proxy < ActiveSupport::BasicObject
+    # Depend on AS::Basic/ProxyObject which has a "blank slate" - no methods.
+    base_proxy = defined?(ActiveSupport::ProxyObject) ?
+      ActiveSupport::ProxyObject : ActiveSupport::BasicObject
+
+    class Proxy < base_proxy
       include AttributesParsing
 
       # TODO: cannot assume _id is always a foreign key.
       # Find a better way to find that and skip these columns.
-      def initialize(target, attributes=nil, *args)
+      def initialize(target, attributes = nil)
         @target = target
+        @target_class = target.class
 
         @localized_attributes = {}
         @localized_associations = []
@@ -18,7 +22,7 @@ module I18n
           build_associations
         end
 
-        assign_attributes(attributes, *args) if attributes
+        assign_attributes(attributes) if attributes
       end
 
       # Override to_param to always return the +proxy.to_param+. This allow us
@@ -59,12 +63,11 @@ module I18n
       private
 
       def active_record_compatible?
-        target_class = @target.class
-        target_class.respond_to?(:columns) && target_class.respond_to?(:nested_attributes_options)
+        @target_class.respond_to?(:columns) && @target_class.respond_to?(:nested_attributes_options)
       end
 
       def build_attributes
-        @target.class.columns.each do |column|
+        @target_class.columns.each do |column|
           column_name = column.name
           next if column.primary || column_name.ends_with?("_id") || @localized_attributes.key?(column_name)
 
@@ -74,7 +77,7 @@ module I18n
       end
 
       def build_methods
-        @target.class.localized_methods.each_pair do |method, parser_type|
+        @target_class.localized_methods.each_pair do |method, parser_type|
           method = method.to_s
           parser = detect_parser(parser_type)
           build_attribute(method, parser)
@@ -82,7 +85,7 @@ module I18n
       end
 
       def build_associations
-        @target.class.nested_attributes_options.each_key do |association_name|
+        @target_class.nested_attributes_options.each_key do |association_name|
           create_localized_association(association_name)
         end
       end
@@ -95,7 +98,7 @@ module I18n
 
       def create_localized_association(association_name)
         @localized_associations <<
-          AssociationParser.new(@target.class, association_name)
+          AssociationParser.new(@target_class, association_name)
       end
 
       def create_localized_attribute(column_name, parser)

data/lib/i18n_alchemy/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Alchemy
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/test/action_view_test.rb

@@ -20,27 +20,38 @@ class ActionViewTest < I18n::Alchemy::TestCase
   end
 
   def test_text_field_with_string_attribute
-    assert_equal '<input id="product_name" name="product[name]" size="30" type="text" value="Potato" />',
+    assert_equal text_input(:name, 'Potato'),
       @template.text_field(:product, :name, :object => @localized)
   end
 
   def test_text_field_with_integer_attribute
-    assert_equal '<input id="product_quantity" name="product[quantity]" size="30" type="text" value="10" />',
+    assert_equal text_input(:quantity, '10'),
       @template.text_field(:product, :quantity, :object => @localized)
   end
 
   def test_text_field_with_decimal_attribute
-    assert_equal '<input id="product_price" name="product[price]" size="30" type="text" value="1,99" />',
+    assert_equal text_input(:price, '1,99'),
       @template.text_field(:product, :price, :object => @localized)
   end
 
   def test_text_field_with_date_attribute
-    assert_equal '<input id="product_released_at" name="product[released_at]" size="30" type="text" value="28/02/2011" />',
+    assert_equal text_input(:released_at, '28/02/2011'),
       @template.text_field(:product, :released_at, :object => @localized)
   end
 
   def test_text_field_with_time_attribute
-    assert_equal '<input id="product_last_sale_at" name="product[last_sale_at]" size="30" type="text" value="28/02/2011 13:25:30" />',
+    assert_equal text_input(:last_sale_at, '28/02/2011 13:25:30'),
       @template.text_field(:product, :last_sale_at, :object => @localized)
   end
+
+  private
+
+  def text_input(attribute_name, value)
+    size = rails4? ? ' ' : ' size="30" '
+    %Q[<input id="product_#{attribute_name}" name="product[#{attribute_name}]"#{size}type="text" value="#{value}" />]
+  end
+
+  def rails4?
+    ActionPack::VERSION::STRING.start_with? "4"
+  end
 end

data/test/db/test_schema.rb

@@ -15,7 +15,6 @@ ActiveRecord::Schema.define do
     t.datetime   :updated_at
     t.timestamp  :last_sale_at
     t.references :supplier
-    t.string     :my_precious
   end
 
   create_table :suppliers do |t|

data/test/i18n_alchemy/proxy/attributes_parsing_test.rb

@@ -13,16 +13,6 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
     assert_equal "28/02/2011", @localized.released_at
   end
 
-  def test_initializes_proxy_with_attributes_and_skips_mass_assignment_security_protection_when_without_protection_is_used
-    @localized = @product.localized(attributes_hash, :without_protection => true)
-    if support_assign_attributes_without_protection?
-      assert_equal 'My Precious!', @localized.my_precious
-    else
-      assert_nil @localized.my_precious
-    end
-    assert_equal 1, @localized.quantity
-  end
-
   def test_assign_attributes
     @localized.assign_attributes(:price => '1,99')
     assert_equal "1,99", @localized.price
@@ -34,24 +24,8 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
     end
   end
 
-  def test_new_with_attr_protected_attributes
-    @localized.assign_attributes(attributes_hash)
-    assert_nil @localized.my_precious
-    assert_equal 1, @localized.quantity
-  end
-
-  def test_assign_attributes_skips_mass_assignment_security_protection_when_without_protection_is_used
-    @localized.assign_attributes(attributes_hash, :without_protection => true)
-    if support_assign_attributes_without_protection?
-      assert_equal 'My Precious!', @localized.my_precious
-    else
-      assert_nil @localized.my_precious
-    end
-    assert_equal 1, @localized.quantity
-  end
-
   def test_assign_attributes_does_not_change_given_attributes_hash
-    assert_attributes_hash_is_not_changed(attributes = attributes_hash) do
+    assert_attributes_hash_is_unchanged do |attributes|
       @localized.assign_attributes(attributes)
     end
   end
@@ -62,7 +36,7 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
   end
 
   def test_attributes_assignment_does_not_change_given_attributes_hash
-    assert_attributes_hash_is_not_changed(attributes = attributes_hash) do
+    assert_attributes_hash_is_unchanged do |attributes|
       @localized.attributes = attributes
     end
   end
@@ -74,7 +48,7 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
   end
 
   def test_update_attributes_does_not_change_given_attributes_hash
-    assert_attributes_hash_is_not_changed(attributes = attributes_hash) do
+    assert_attributes_hash_is_unchanged do |attributes|
       @localized.update_attributes(attributes)
     end
   end
@@ -86,7 +60,7 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
   end
 
   def test_update_attributes_bang_does_not_change_given_attributes_hash
-    assert_attributes_hash_is_not_changed(attributes = attributes_hash) do
+    assert_attributes_hash_is_unchanged do |attributes|
       @localized.update_attributes!(attributes)
     end
   end
@@ -130,13 +104,9 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
 
   private
 
-  def attributes_hash
-    { :my_precious => 'My Precious!', :quantity => 1 }
-  end
-
-  def assert_attributes_hash_is_not_changed(attributes)
-    yield
-    assert_equal 1, attributes[:quantity]
-    assert_equal 'My Precious!', attributes[:my_precious]
+  def assert_attributes_hash_is_unchanged
+    attributes = { :quantity => 1 }
+    yield attributes
+    assert_equal({ :quantity => 1 }, attributes)
   end
 end

data/test/i18n_alchemy/proxy_test.rb

@@ -124,32 +124,32 @@ class ProxyTest < I18n::Alchemy::ProxyTestCase
   # DateTime
   def test_parses_datetime_attribute_input
     @localized.updated_at = "28/02/2011 13:25:30"
-    assert_equal Time.mktime(2011, 2, 28, 13, 25, 30), @product.updated_at
+    assert_equal Time.utc(2011,"feb",28,13,25,30), @product.updated_at
   end
 
   def test_localizes_datetime_attribute_output
-    @product.updated_at = Time.mktime(2011, 2, 28, 13, 25, 30)
+    @product.updated_at = Time.utc(2011,"feb",28,13,25,30)
     assert_equal "28/02/2011 13:25:30", @localized.updated_at
   end
 
   def test_localizes_datetime_attribute_before_type_cast_output
-    @product.updated_at = Time.mktime(2011, 2, 28, 13, 25, 30)
+    @product.updated_at = Time.utc(2011,"feb",28,13,25,30)
     assert_equal "28/02/2011 13:25:30", @localized.updated_at_before_type_cast
   end
 
   # Timestamp
   def test_parses_timestamp_attribute_input
     @localized.last_sale_at = "28/02/2011 13:25:30"
-    assert_equal Time.mktime(2011, 2, 28, 13, 25, 30), @product.last_sale_at
+    assert_equal Time.utc(2011,"feb",28,13,25,30), @product.last_sale_at
   end
 
   def test_localizes_timestamp_attribute_output
-    @product.last_sale_at = Time.mktime(2011, 2, 28, 13, 25, 30)
+    @product.last_sale_at = Time.utc(2011,"feb",28,13,25,30)
     assert_equal "28/02/2011 13:25:30", @localized.last_sale_at
   end
 
   def test_localizes_timestamp_attribute_before_type_cast_output
-    @product.last_sale_at = Time.mktime(2011, 2, 28, 13, 25, 30)
+    @product.last_sale_at = Time.utc(2011,"feb",28,13,25,30)
     assert_equal "28/02/2011 13:25:30", @localized.last_sale_at_before_type_cast
   end
 

data/test/i18n_alchemy/time_parser_test.rb

@@ -7,24 +7,12 @@ module BaseTimeParserTest
 
   # TODO: why so many time differences on the output?
   def test_parses_valid_string_times_with_default_i18n_locale
-    output_timestamp = if RUBY_VERSION < "1.9"
-                         "Sat Dec 31 12:15:45 UTC 2011"
-                       else
-                         "2011-12-31 12:15:45 UTC"
-                       end
-
-    assert_equal output_timestamp, @parser.parse("12/31/2011 12:15:45")
+    assert_equal "2011-12-31 12:15:45 UTC", @parser.parse("12/31/2011 12:15:45")
   end
 
   def test_parsers_string_times_on_current_i18n_locale
     I18n.with_locale :pt do
-      output_timestamp = if RUBY_VERSION < "1.9"
-                           "Sat Dec 31 12:15:45 UTC 2011"
-                         else
-                           "2011-12-31 12:15:45 UTC"
-                         end
-
-      assert_equal output_timestamp, @parser.parse("31/12/2011 12:15:45")
+      assert_equal "2011-12-31 12:15:45 UTC", @parser.parse("31/12/2011 12:15:45")
     end
   end
 

data/test/models/product.rb

@@ -5,8 +5,6 @@ class Product < ActiveRecord::Base
   localize :estimated_last_comission_payment_at, :using => :timestamp
   localize :released_month, :using => MyCustomDateParser
 
-  attr_protected :my_precious
-
   belongs_to :supplier
 
   def initialize(*)

data/test/test_helper.rb

@@ -21,11 +21,6 @@ Dir["test/models/*.rb"].each { |file| require File.expand_path(file) }
 
 module I18n::Alchemy
   class TestCase < MiniTest::Unit::TestCase
-    # AR 3.0 does not have assign_attributes and without_protection option, so we
-    # are going to skip such tests in this version.
-    def support_assign_attributes_without_protection?
-      @support_assign_attributes ||= ActiveRecord::VERSION::STRING >= "3.1.0"
-    end
   end
 
   class ProxyTestCase < TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_alchemy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +40,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,39 +48,51 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +116,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +124,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.2
+        version: '10.1'
 description: I18n date/number parsing/localization
 email:
 - carlosantoniodasilva@gmail.com
@@ -156,18 +174,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2006072931743591474
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2006072931743591474
 requirements: []
 rubyforge_project: i18n_alchemy
 rubygems_version: 1.8.23