l10n 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7f3cc16fbc921b6681758f6c4ff7f3d2f783052
-  data.tar.gz: 617e2a3795ac781d6ba43c0d66288aa2f872afb8
+  metadata.gz: 8ee3166182fab8062a381f32dcd1f00a07aa4574
+  data.tar.gz: a0b4263d5bb0a39fc49c0ce978ba6ba56748189e
 SHA512:
-  metadata.gz: 701003456bee2225f62ac1951c5a2432303ec43b671f6fdf1f00fbab1b97783b84eff05ef0d9f21faf3892a8e867562b5c63e64bbe326a5c95b6bad9361dbe70
-  data.tar.gz: c19dc9321a710cc84dd2f0a5b087b8995c995e01aabb703d13fe9381431a68a2644eea6c64c144f97ba2c96e89de4453fb601fd972d3ef28cfc62b96febe2149
+  metadata.gz: 2950f6aab544f5f8e11b1cfa28be14d300625f064cabf34fb21f335c3c95f4ee59f92cd0cd10b6c5607b93583e01b852b236010f15e040d4a2b8c5d5211bf393
+  data.tar.gz: 960c3a947e1527a1458a168b0b15674b3278ad8b8a1873dd36b3fbe4866fd2e13a2b920b9de4d2c225678dabf02a5385471e41e8a496c60b28fe8849a2e0da7d

data/lib/l10n.rb

@@ -5,17 +5,17 @@ require 'action_view'
 require 'action_dispatch'
 require 'active_support/all'
 
-require 'l10n/version'
-require 'l10n/core_extensions'
-require 'l10n/i18n_extensions'
-require 'l10n/inflections'
-require 'l10n/numeric_column_conversions'
-require 'l10n/column_translation'
-require 'l10n/translation_validator'
-require 'l10n/forms'
-require 'l10n/javascript_helper'
-require 'l10n/request'
-require 'l10n/engine'
+require_relative 'l10n/version'
+require_relative 'l10n/core_extensions'
+require_relative 'l10n/i18n_extensions'
+require_relative 'l10n/inflections'
+require_relative 'l10n/numeric_column_conversions'
+require_relative 'l10n/column_translation'
+require_relative 'l10n/translation_validator'
+require_relative 'l10n/forms'
+require_relative 'l10n/javascript_helper'
+require_relative 'l10n/request'
+require_relative 'l10n/engine'
 
 files = Dir[File.join(File.dirname(__FILE__), 'locales/*.yml')]
 I18n.load_path.concat(files)

data/lib/l10n/core_extensions.rb

@@ -4,9 +4,3 @@ require 'l10n/core_extensions/symbol_ext'
 require 'l10n/core_extensions/date_time_ext'
 require 'l10n/core_extensions/numeric_ext'
 require 'l10n/core_extensions/big_decimal_ext'
-
-
-
-
-
-

data/lib/l10n/core_extensions/big_decimal_ext.rb

@@ -1,20 +1,17 @@
 module L10n
   module CoreExtensions
     module BigDecimalExt
-      extend ActiveSupport::Concern
-      
-      included do
-        alias_method :_active_support_to_formatted_s, :to_formatted_s
-        alias_method :to_s, :_active_support_to_formatted_s
-        alias_method :to_formatted_s, :_l10n_to_formatted_s
+
+      def to_localized_s
+        Numeric.localize(self)
       end
-      
-      def _l10n_to_formatted_s(*args)
+
+      def to_formatted_s(*args)
         L10n.number_to_rounded(self, *args)
       end
-      #
+
     end
   end
 end
 
-BigDecimal.class_eval { include L10n::CoreExtensions::BigDecimalExt }
+BigDecimal.prepend L10n::CoreExtensions::BigDecimalExt

data/lib/l10n/core_extensions/numeric_ext.rb

@@ -1,12 +1,6 @@
 module L10n
   module CoreExtensions
     module NumericExt
-      extend ActiveSupport::Concern
-      
-      included do
-        alias_method :_active_support_to_formatted_s, :to_formatted_s
-        alias_method :to_formatted_s, :_l10n_to_formatted_s
-      end
       
       module ClassMethods
         def delocalize(value)
@@ -17,28 +11,42 @@ module L10n
         end
         
         def localize(value)
-          return value unless value.is_a?(Numeric) or value.is_a?(String)
+          return value unless value.is_a?(Numeric) || value.is_a?(String)
           separator = I18n.t(:'number.format.separator')
           delimiter = I18n.t(:'number.format.delimiter')
           value.to_s.gsub('.', 's').gsub(',', delimiter).gsub('s', separator)
         end
-      end       
+      end
 
-      def to_localized_s
-        Numeric.localize(self)
+      module Localization
+        def to_localized_s
+          Numeric.localize(self)
+        end
       end
       
-      # Provide l10n signature
-      def _l10n_to_formatted_s(format = :rounded, options = nil)
-        if options.nil? && format.is_a?(Hash)
-          options = format
-          format = :rounded
+      module Formatting
+        # un-deprecate method
+        def to_formatted_s(format = :rounded, options = nil)
+          if options.nil? && format.is_a?(Hash)
+            options = format
+            format = :rounded
+          end
+          to_s(format, options || {})
         end
-        _active_support_to_formatted_s(format, options || {})
       end
       
     end
   end
 end
 
-Numeric.class_eval { include L10n::CoreExtensions::NumericExt }
+Numeric.extend L10n::CoreExtensions::NumericExt::ClassMethods
+
+# Ruby 2.4+ unifies Fixnum & Bignum into Integer.
+numerics = 0.class == Integer ? [Integer] : [Fixnum, Bignum]
+numerics << Float
+numerics << Rational
+
+numerics.each do |klass|
+  klass.include L10n::CoreExtensions::NumericExt::Localization
+  klass.prepend L10n::CoreExtensions::NumericExt::Formatting
+end

data/lib/l10n/core_extensions/object_ext.rb

@@ -8,4 +8,4 @@ module L10n
   end
 end
 
-Object.send :include, L10n::CoreExtensions::ObjectExt
+Object.send :include, L10n::CoreExtensions::ObjectExt

data/lib/l10n/numeric_column_conversions.rb

@@ -7,7 +7,7 @@ module L10n
   
     def write_attribute(attr_name, value)
       column = column_for_attribute(attr_name.to_s)
-      if column && column.number? && value.is_a?(String)
+      if column && [:integer, :float, :decimal].include?(column.type) && value.is_a?(String)
         value = Numeric.delocalize(value)
       end
       super(attr_name, value)
@@ -17,4 +17,4 @@ module L10n
   
 end
 
-ActiveRecord::Base.class_eval { include L10n::NumericColumnConversions }
+ActiveRecord::Base.prepend L10n::NumericColumnConversions

data/lib/l10n/numericality_validator.rb

@@ -0,0 +1,29 @@
+module L10n
+  module NumericalityValidatorExt
+    
+    protected
+
+    def parse_raw_value_as_a_number(raw_value)
+      return if raw_value =~ /\A0[xX]/
+      if raw_value.is_a?(String)
+        return unless raw_value =~ numeric_exp_for_current_locale
+        raw_value = Numeric.delocalize(raw_value)
+      end
+      Kernel.Float(raw_value)
+    rescue ArgumentError, TypeError
+      nil
+    end
+    
+    private
+    
+    def numeric_exp_for_current_locale
+      separator = I18n.t(:'number.format.separator')
+      delimiter = I18n.t(:'number.format.delimiter')
+      @numeric_exp ||= {}
+      @numeric_exp[[delimiter, separator]] ||= /\A[+-]?\d{1,3}(#{Regexp.escape(delimiter)}?\d\d\d)*(#{Regexp.escape(separator)}\d\d*)?\z/
+    end
+    
+  end
+end
+
+ActiveModel::Validations::NumericalityValidator.prepend L10n::NumericalityValidatorExt

data/lib/l10n/version.rb

@@ -1,3 +1,3 @@
 module L10n
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: l10n
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Matthias Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -30,70 +30,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.10
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,7 @@ files:
 - lib/l10n/inflections.rb
 - lib/l10n/javascript_helper.rb
 - lib/l10n/numeric_column_conversions.rb
+- lib/l10n/numericality_validator.rb
 - lib/l10n/request.rb
 - lib/l10n/translation_validator.rb
 - lib/l10n/version.rb
@@ -186,8 +187,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: I18n that roarrrs
+summary: Make I18n roar again
 test_files: []