i18n_alchemy 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 68f198998d37ed939ead93b7a86d836fa73b8e7c
-  data.tar.gz: 880e2dbb5699e4a714922e5fc40958929b3b7d48
+SHA256:
+  metadata.gz: 2b448e3b19d00c30389b8fafe839c2840ba90b264022108c8f9e356e9441f2e3
+  data.tar.gz: 170fd843fe6f65d8a411c0362121e52ade33ca549a11ec028fb89026bc4216b4
 SHA512:
-  metadata.gz: ca5de87fe772476d5f48507a1d0b8ae2cd9dc40521a878a1a61c0d24ccfb1f338a096fde002fbd38540eed82fd574b6055657d7717b338c2aaa71a5e96c64b51
-  data.tar.gz: 9c5ceb2c9203ac97686f7f0f6b45bf3e27aa184985b22eb7451c5cc063b60b215763a2307a691375fd39f930433fd2fe420b035192b365167b36ff859fded590
+  metadata.gz: e3fa185c470cd2ce647f6c22d6e1f296681a940691181b8dda3f47dfdce93a7aaf7a7c9e0d2d7a62c47c38528bfb3b802d15e0dabed1d9d4c9dd8b081537df18
+  data.tar.gz: 494b9cb4974f6bc8a171c389498e21506be614200a751b097a4a5cf8e2e30d9f14f7b81b4c0931d50596bc3d5ccb750608bc5fb986024a48819c793f0a5f2e0b

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## v0.4.0 - 2020-03-30
+
+* Ruby 3.0 support
+* Rails 6.1 support
+* `update_attributes` and `update_attributes!` are not available through the localized proxy in Rails 6.1, following their removal from Rails.
+
+## v0.3.1 - 2020-02-11
+
+* Ruby 2.6 & 2.7 support (no changes required)
+* Rails 6 support ([@mayordwells](https://github.com/mayordwells))
+* Add support for `update`/`update!` Active Record methods ([@tbk303](https://github.com/tbk303))
+
+## v0.3.0 - 2018-09-08
+
+* Update I18n dependency to require >= 0.7, allowing to install more recent versions ([@nazarhussain](https://github.com/nazarhussain))
+* Rails 5.2 support ([@sega](https://github.com/sega))
+* Ruby 2.5 support (no changes required)
+* Drop support to Rails 3.2 and Ruby 1.9.3/2.0.x/2.1.x
+
+## v0.2.4 - 2017-08-03
+
+* Rails 5.1 and Ruby 2.4 support
+
+## v0.2.3 - 2016-12-19
+
+* Rails 5.0 support ([@rodrigoulisses](https://github.com/rodrigoulisses))
+
 ## 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))

data/README.md

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

data/lib/i18n_alchemy.rb

@@ -20,7 +20,7 @@ module I18n
 
     included do
       class_attribute :localized_methods,
-        :instance_reader => false, :instance_writer => false
+        instance_reader: false, instance_writer: false
       self.localized_methods = {}
     end
 

data/lib/i18n_alchemy/attributes_parsing.rb

@@ -1,5 +1,10 @@
 module I18n
   module Alchemy
+    def self.support_update_attributes?
+      # `update_attributes` and `update_attributes!` were removed in Rails 6.1.
+      ActiveSupport.version < Gem::Version.new("6.1")
+    end
+
     module AttributesParsing
       def attributes=(attributes)
         @target.attributes = parse_attributes(attributes)
@@ -9,12 +14,22 @@ module I18n
         @target.assign_attributes(parse_attributes(attributes))
       end
 
-      def update_attributes(attributes)
-        @target.update_attributes(parse_attributes(attributes))
+      if I18n::Alchemy.support_update_attributes?
+        def update_attributes(attributes)
+          @target.update_attributes(parse_attributes(attributes))
+        end
+
+        def update_attributes!(attributes)
+          @target.update_attributes!(parse_attributes(attributes))
+        end
+      end
+
+      def update(attributes)
+        @target.update(parse_attributes(attributes))
       end
 
-      def update_attributes!(attributes)
-        @target.update_attributes!(parse_attributes(attributes))
+      def update!(attributes)
+        @target.update!(parse_attributes(attributes))
       end
 
       def update_attribute(attribute, value)

data/lib/i18n_alchemy/date_parser.rb

@@ -28,7 +28,7 @@ module I18n
       end
 
       def i18n_format
-        I18n.t(:default, :scope => [i18n_scope, :formats])
+        I18n.t(:default, scope: [i18n_scope, :formats])
       end
 
       def i18n_scope

data/lib/i18n_alchemy/numeric_parser.rb

@@ -34,7 +34,7 @@ module I18n
       end
 
       def translate(key)
-        I18n.t(key, :scope => :"number.format")
+        I18n.t(key, scope: :"number.format")
       end
 
       def valid_for_localization?(value)

data/lib/i18n_alchemy/proxy.rb

@@ -57,8 +57,15 @@ module I18n
       # Delegate all method calls that are not translated to the target object.
       # As the proxy does not have any other method, there is no need to
       # override :respond_to, just delegate it to the target as well.
-      def method_missing(*args, &block)
-        @target.send(*args, &block)
+      if ::RUBY_VERSION >= "2.7"
+        def method_missing(*args, **kwargs, &block)
+          @target.send(*args, **kwargs, &block)
+        end
+        ruby2_keywords :method_missing
+      else
+        def method_missing(*args, &block)
+          @target.send(*args, &block)
+        end
       end
 
       private
@@ -128,12 +135,12 @@ module I18n
       end
 
       def detect_parser_from_column(column)
-        detect_parser(column.number? ? :number : column.type)
+        detect_parser(column.type)
       end
 
       def detect_parser(type_or_parser)
         case type_or_parser
-        when :number
+        when :float, :decimal, :number
           NumericParser
         when :date
           DateParser
@@ -146,7 +153,7 @@ module I18n
 
       def skip_column?(column_name)
         column_name == @target_class.primary_key ||
-          column_name.ends_with?("_id") ||
+          column_name.end_with?("_id") ||
           @localized_attributes.key?(column_name)
       end
     end

data/lib/i18n_alchemy/version.rb

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

data/test/action_view_test.rb

@@ -3,13 +3,13 @@ require "action_pack"
 
 class ActionViewTest < I18n::Alchemy::TestCase
   def setup
-    @template  = ActionView::Base.new
+    @template  = ActionView::Base.respond_to?(:empty) ? ActionView::Base.empty : ActionView::Base.new
     @product   = Product.new(
-      :name         => "Potato",
-      :quantity     => 10,
-      :price        => 1.99,
-      :released_at  => Date.new(2011, 2, 28),
-      :last_sale_at => Time.mktime(2011, 2, 28, 13, 25, 30)
+      name: "Potato",
+      quantity: 10,
+      price: 1.99,
+      released_at: Date.new(2011, 2, 28),
+      last_sale_at: Time.mktime(2011, 2, 28, 13, 25, 30)
     )
     @localized = @product.localized
 
@@ -48,7 +48,7 @@ class ActionViewTest < I18n::Alchemy::TestCase
     assert_includes [
       text_input_sorted_attributes(attribute, value),
       text_input_unsorted_attributes(attribute, value)
-    ], @template.text_field(:product, attribute, :object => @localized)
+    ], @template.text_field(:product, attribute, object: @localized)
   end
 
   def text_input_sorted_attributes(attribute_name, value)

data/test/custom_parsers/my_custom_date_parser.rb

@@ -3,12 +3,12 @@ module MyCustomDateParser
   extend self
 
   def localize(value)
-    I18n.localize value, :format => :custom
+    I18n.localize value, format: :custom
   end
 
   protected
 
   def i18n_format
-    I18n.t(:custom, :scope => [:date, :formats])
+    I18n.t(:custom, scope: [:date, :formats])
   end
 end

data/test/db/test_schema.rb

@@ -1,6 +1,6 @@
 ActiveRecord::Base.establish_connection(
-  :adapter  => "sqlite3",
-  :database => ":memory:"
+  adapter: "sqlite3",
+  database: ":memory:"
 )
 
 ActiveRecord::Schema.define do

data/test/i18n_alchemy/proxy/attributes_parsing_test.rb

@@ -4,7 +4,7 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
   # Attributes
   def test_initializes_proxy_with_attributes
     @localized = @product.localized(
-      :name => "Banana", :price => "0,99", :released_at => "28/02/2011")
+      name: "Banana", price: "0,99", released_at: "28/02/2011")
 
     assert_equal 0.99, @product.price
     assert_equal "0,99", @localized.price
@@ -14,7 +14,7 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
   end
 
   def test_assign_attributes
-    @localized.assign_attributes(:price => '1,99')
+    @localized.assign_attributes(price: '1,99')
     assert_equal "1,99", @localized.price
   end
 
@@ -31,7 +31,7 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
   end
 
   def test_attributes_assignment
-    @localized.attributes = { :price => '1,99' }
+    @localized.attributes = { price: '1,99' }
     assert_equal "1,99", @localized.price
   end
 
@@ -41,27 +41,45 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
     end
   end
 
-  def test_update_attributes
-    @localized.update_attributes(:price => '2,88')
+  def test_update
+    @localized.update(price: '2,88')
     assert_equal '2,88', @localized.price
     assert_equal 2.88, @product.reload.price
   end
 
-  def test_update_attributes_does_not_change_given_attributes_hash
+  def test_update_does_not_change_given_attributes_hash
     assert_attributes_hash_is_unchanged do |attributes|
-      @localized.update_attributes(attributes)
+      @localized.update(attributes)
     end
   end
 
-  def test_update_attributes!
-    @localized.update_attributes!(:price => '2,88')
+  def test_update!
+    @localized.update!(price: '2,88')
     assert_equal '2,88', @localized.price
     assert_equal 2.88, @product.reload.price
   end
 
-  def test_update_attributes_bang_does_not_change_given_attributes_hash
+  def test_update_bang_does_not_change_given_attributes_hash
     assert_attributes_hash_is_unchanged do |attributes|
-      @localized.update_attributes!(attributes)
+      @localized.update!(attributes)
+    end
+  end
+
+  if I18n::Alchemy.support_update_attributes?
+    def test_update_attributes
+      silence_deprecations {
+        @localized.update_attributes(price: '2,88')
+      }
+      assert_equal '2,88', @localized.price
+      assert_equal 2.88, @product.reload.price
+    end
+
+    def test_update_attributes!
+      silence_deprecations {
+        @localized.update_attributes!(price: '2,88')
+      }
+      assert_equal '2,88', @localized.price
+      assert_equal 2.88, @product.reload.price
     end
   end
 
@@ -73,40 +91,40 @@ class ProxyAttributesParsingTest < I18n::Alchemy::ProxyTestCase
 
   # Nested Attributes
   def test_should_assign_for_nested_attributes_for_collection_association
-    @supplier_localized.assign_attributes(:products_attributes => [{:price => '1,99'}, {:price => '2,93'}])
+    @supplier_localized.assign_attributes(products_attributes: [{ price: '1,99' }, { price: '2,93' }])
     assert_equal 2, @supplier_localized.products.size
     assert_equal '1,99', @supplier_localized.products.first.localized.price
     assert_equal '2,93', @supplier_localized.products.last.localized.price
   end
 
   def test_should_assign_for_nested_attributes_passing_a_hash_for_collection_with_unique_keys
-    @supplier_localized.assign_attributes(:products_attributes => {"0" => {:price => '2,93', "_destroy"=>"false"}, "1" => {:price => '2,85', "_destroy" => "false"}})
+    @supplier_localized.assign_attributes(products_attributes: { '0' => { price: '2,93', _destroy: 'false' }, '1' => { price: '2,85', _destroy: 'false' }})
     prices = @supplier.products.map { |p| p.localized.price }.sort
     assert_equal ['2,85', '2,93'], prices
   end
 
   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'})
+    @supplier_localized.assign_attributes(account_attributes: { account_number: 10, total_money: '100,87' })
     account = @supplier_localized.account
     assert_equal '10', account.account_number.to_s
     assert_equal '100,87', account.localized.total_money
   end
 
-  def test_update_attributes_for_nested_attributes
-    @supplier_localized.update_attributes(:account_attributes => {:total_money => '99,87'})
+  def test_update_for_nested_attributes
+    @supplier_localized.update(account_attributes: { total_money: '99,87' })
     assert_equal '99,87', @supplier_localized.account.localized.total_money
   end
 
   def test_attributes_assignment_for_nested
-    @supplier_localized.attributes = {:account_attributes => {:total_money => '88,12'}}
+    @supplier_localized.attributes = { account_attributes: { total_money: '88,12' }}
     assert_equal '88,12', @supplier_localized.account.localized.total_money
   end
 
   private
 
   def assert_attributes_hash_is_unchanged
-    attributes = { :quantity => 1 }
+    attributes = { quantity: 1 }
     yield attributes
-    assert_equal({ :quantity => 1 }, attributes)
+    assert_equal({ quantity: 1 }, attributes)
   end
 end

data/test/i18n_alchemy/proxy_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 class ProxyTest < I18n::Alchemy::ProxyTestCase
   def test_delegates_orm_methods_to_target_object
     assert @product.new_record?
-    assert @localized.save!(:name => "foo", :price => 1.99)
+    assert @localized.save!(validate: false)
     assert !@product.new_record?
   end
 
@@ -32,6 +32,7 @@ class ProxyTest < I18n::Alchemy::ProxyTestCase
   end
 
   def test_to_param
+    @product.id = 1
     assert_equal @product.to_param, @localized.to_param
   end
 

data/test/models/product.rb

@@ -1,9 +1,9 @@
 class Product < ActiveRecord::Base
   include I18n::Alchemy
-  localize :total, :using => :number
-  localize :estimated_delivery_at, :using => :date
-  localize :estimated_last_comission_payment_at, :using => :timestamp
-  localize :released_month, :using => MyCustomDateParser
+  localize :total, using: :number
+  localize :estimated_delivery_at, using: :date
+  localize :estimated_last_comission_payment_at, using: :timestamp
+  localize :released_month, using: MyCustomDateParser
 
   belongs_to :supplier
 

data/test/models/supplier.rb

@@ -9,5 +9,5 @@ class Supplier < ActiveRecord::Base
 end
 
 class AnotherSupplier < Supplier
-  localize :created_at, :using => :timestamp
+  localize :created_at, using: :timestamp
 end

data/test/models/user.rb

@@ -2,5 +2,5 @@ class User
   include I18n::Alchemy
   attr_accessor :created_at
 
-  localize :created_at, :using => :date
+  localize :created_at, using: :date
 end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ begin
   Minitest.autorun
   MiniTestCase = Minitest::Test
 rescue LoadError
-  # Rails 4.0/3.2
+  # Rails 4.0
   require 'minitest/unit'
   MiniTest::Unit.autorun
   MiniTestCase = MiniTest::Unit::TestCase
@@ -49,5 +49,15 @@ module I18n::Alchemy
     def teardown
       I18n.locale = :en
     end
+
+    private
+
+    def silence_deprecations
+      old_silenced = ActiveSupport::Deprecation.silenced
+      ActiveSupport::Deprecation.silenced = true
+      yield
+    ensure
+      ActiveSupport::Deprecation.silenced = old_silenced
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n_alchemy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Carlos Antonio da Silva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,74 +16,74 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +102,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
 description: I18n date/number parsing/localization
@@ -152,7 +152,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,9 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: i18n_alchemy
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: I18n date/number parsing/localization
 test_files: