delocalize 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf99ef08d5088f5fd791efc0acf489fa51ea5417
-  data.tar.gz: 013d7f081dea1507d1819b129ffe1697059abea5
+  metadata.gz: 59bab63abe22f6890fbbe6d2d754285d0897b0bf
+  data.tar.gz: d6463916eeb2d036930ec25447ba1ac3e4e92d6d
 SHA512:
-  metadata.gz: a6c5091da9618f1886ddc60472593f84e42bfa2d9392c75d77b069774384811764e0899344f8e37a0cfefcef2291cc464687c7f83d55d1315d896b43de291786
-  data.tar.gz: 18f7bbf54dfc495b934b6a7e8253fbe763dda21b72231a5ecbac47de21e3189ec388edbac91c21137999bbd07fbca681eeb922762e4de356905bd7ffa64b3991
+  metadata.gz: e098d8423fde0322dac888e933df34313e4bd595ddc308dac2e66b9aa2a5fed2c973b6526477a130e62aefa7cca5f2dea045296fee3612dd71de0e2a41afc765
+  data.tar.gz: b9c601788e8fb90a21fde7156c63e7b3630beafe4c96a185e5e3361dc15a4a72df434df38c0b84642664860d4fa767c088e5b6f02ebe0d8f66041d10a2c6a32e

data/README.markdown

@@ -4,24 +4,20 @@
 
 delocalize provides localized date/time and number parsing functionality for Rails.
 
-## Demo Application
-
-Find a demo application [here](https://github.com/clemens/delocalize_demo).
-
-## Compability
+## Compatibility
 
 This gem requires the following versions:
 
-* Ruby >= 1.9.2
-* Rails >= 3.0 (Rails 2 and probably even Rails 1 *should* work but aren't officially supported)
+* Ruby >= 2.1.10 (Ruby >= 1.9.2 *should* work but isn't officially supported)
+* Rails >= 4.2 (earlier versions including probably even Rails 1 *should* work but aren't officially supported)
 
-Check [the Travis configuration](https://github.com/clemens/delocalize/blob/1-0-beta/.travis.yml) in order to see which configurations we are testing.
+Check [the Travis configuration](https://github.com/clemens/delocalize/blob/master/.travis.yml) in order to see which configurations we are testing.
 
 ## Installation
 
 You can use delocalize as a gem. Using delocalize as a Rails plugin has been discontinued and is no supported. If you want/need to use delocalize as a plugin (I really don't see a reason why you'd want to), consider using the `0-2-stable` branch.
 
-### Rails 3
+### Rails 3 and above
 
 To use delocalize, put the following gem requirement in your `Gemfile`:
 
@@ -163,6 +159,6 @@ For dates and times, you have to define input formats which are taken from the a
 
 [Here](https://github.com/clemens/delocalize/graphs/contributors) is a list of all people who ever contributed to delocalize.
 
-Copyright (c) 2009-2015 Clemens Kofler <clemens@railway.at>
+Copyright (c) 2009-2017 Clemens Kofler <clemens@railway.at>
 <http://www.railway.at/>
 Released under the MIT license

data/lib/delocalize/parameter_delocalizing.rb

@@ -24,7 +24,12 @@ module Delocalize
 
     def delocalize_parse(options, key_stack, value)
       parser = delocalize_parser_for(options, key_stack)
-      parser ? parser.parse(value) : value
+      return value unless parser
+      begin
+        parser.parse(value)
+      rescue ArgumentError
+        value
+      end
     end
 
     def delocalize_parser_for(options, key_stack)

data/lib/delocalize/parsers/date_time.rb

@@ -36,7 +36,7 @@ module Delocalize
         input_formats(type).each do |original_format|
           next unless datetime =~ /^#{apply_regex(original_format)}$/
 
-          datetime = ::DateTime.strptime(datetime, original_format)
+          datetime = ::DateTime.strptime(datetime, original_format) rescue break
           return Date == type ?
             datetime.to_date :
             Time.zone.local(datetime.year, datetime.mon, datetime.mday, datetime.hour, datetime.min, datetime.sec)
@@ -51,13 +51,16 @@ module Delocalize
 
         today = Date.current
         parsed = Date._parse(datetime)
-        return if parsed.empty? # the datetime value is invalid
+        raise ArgumentError, "invalid date: #{datetime}" if parsed.empty? # the datetime value is invalid
 
         # set default year, month and day if not found
         parsed.reverse_merge!(:year => today.year, :mon => today.mon, :mday => today.mday)
-        datetime = Time.zone.local(*parsed.values_at(:year, :mon, :mday, :hour, :min, :sec))
 
-        Date == type ? datetime.to_date : datetime
+        if Date == type
+          Date.civil(*parsed.values_at(:year, :mon, :mday))
+        else
+          Time.zone.local(*parsed.values_at(:year, :mon, :mday, :hour, :min, :sec))
+        end
       end
 
       def translate_month_and_day_names(datetime)

data/lib/delocalize/version.rb

@@ -1,3 +1,3 @@
 module Delocalize
-  VERSION = "1.1.0"
+  VERSION = "1.2.0".freeze
 end

data/test/date_time_parser_test.rb

@@ -5,6 +5,7 @@ require 'active_support/time'
 
 describe Delocalize::Parsers::DateTime do
   before do
+    I18n.locale = I18n.default_locale
     Time.zone = 'Berlin' # make sure everything works as expected with TimeWithZone
     @time_parser = Delocalize::Parsers::DateTime.new(Time)
     @date_parser = Delocalize::Parsers::DateTime.new(Date)
@@ -14,6 +15,23 @@ describe Delocalize::Parsers::DateTime do
     Timecop.return
   end
 
+  it "parses a date/time using default parsing" do
+    I18n.locale = :en # force default parsing since we don't have a locale file for en
+
+    date = Date.civil(2009, 2, 28)
+    time = Time.zone.local(2009, 2, 28, 12, 30, 45)
+    @date_parser.parse('2009-02-28').must_equal date
+    @time_parser.parse('2009-02-28 12:30:45').must_equal time
+  end
+
+  it "doesn't parse date/time-like objects" do
+    date = Date.civil(2009, 10, 19)
+    time = Time.zone.local(2009, 3, 1, 12, 0, 0)
+
+    @date_parser.parse(date).must_equal date
+    @time_parser.parse(time).must_equal time
+  end
+
   # date
   it "parses a date from a string" do
     date = Date.civil(2009, 10, 19)
@@ -27,6 +45,23 @@ describe Delocalize::Parsers::DateTime do
     @date_parser.parse('19.10.').must_equal date
   end
 
+  it "fails for an invalid date (same behavior as without delocalize)" do
+    must_raise_invalid_date { @date_parser.parse('29. Februar 2009') }
+  end
+
+  it "rejects invalid dates when using default parsing (Ruby default behavior)" do
+    I18n.locale = :en # force default parsing since we don't have a locale file for en
+
+    must_raise_invalid_date { @date_parser.parse('32.10.2009') }
+  end
+
+
+  it "rejects 29th February in a non leap year when using default parsing (Ruby default behavior)" do
+    I18n.locale = :en # force default parsing since we don't have a locale file for en
+
+    must_raise_invalid_date { @date_parser.parse('29.02.2009') }
+  end
+
   # datetime
   it "parses a datetime from a string" do
     time = Time.zone.local(2009, 3, 1, 12, 0, 0)
@@ -39,6 +74,25 @@ describe Delocalize::Parsers::DateTime do
     @time_parser.parse('1. März, 12:00 Uhr').must_equal time
   end
 
+  it "doesn't fail for an invalid datetime (same behavior as without delocalize)" do
+    time = Time.zone.local(2009, 3, 1, 12, 0)
+    @time_parser.parse('29. Februar 2009, 12:00 Uhr').must_equal time
+  end
+
+  it "shifts invalid dates to the next month when using default parse (mimicking Ruby's default behavior)" do
+    I18n.locale = :en # force default parsing since we don't have a locale file for en
+
+    time = Time.zone.local(2009, 5, 1, 12, 0, 0)
+    @time_parser.parse('31.04.2009 12:00').must_equal time
+  end
+
+  it "shifts 29th February to 1st March in a non leap year when using default parse (mimicking Ruby's default behavior)" do
+    I18n.locale = :en # force default parsing since we don't have a locale file for en
+
+    time = Time.zone.local(2009, 3, 1, 12, 0, 0)
+    @time_parser.parse('29.02.2009 12:00').must_equal time
+  end
+
   # time
   it "parses a time from a string, defaulting to the current day" do
     Timecop.freeze(Time.zone.local(2009, 3, 1, 12, 0, 0)) # prevent DST issues
@@ -46,11 +100,21 @@ describe Delocalize::Parsers::DateTime do
     @time_parser.parse('9:00 Uhr').must_equal time
   end
 
-  it "doesn't parse date/time-like objects" do
-    date = Date.civil(2009, 10, 19)
-    time = Time.zone.local(2009, 3, 1, 12, 0, 0)
+  it "raises ArgumentError when parsing a bad string" do
+    err = proc { @date_parser.parse("asdf") }.must_raise ArgumentError
+    err.message.must_equal "invalid date: asdf"
+  end
 
-    @date_parser.parse(date).must_equal date
-    @time_parser.parse(time).must_equal time
+  it "raises ArgumentError when parsing a bad date" do
+    must_raise_invalid_date { @date_parser.parse("02.0.2017") }
+    must_raise_invalid_date { @date_parser.parse("02.99.2017") }
+  end
+
+  def must_raise_invalid_date
+    begin
+      yield
+    rescue => ex
+      ex.message.must_equal 'invalid date'
+    end
   end
 end

data/test/number_parser_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 describe Delocalize::Parsers::Number do
   before do
+    I18n.locale = I18n.default_locale
     @parser = Delocalize::Parsers::Number.new
   end
 
@@ -23,8 +24,8 @@ describe Delocalize::Parsers::Number do
 
   it "doesn't change a number if it's already a numeric type" do
     @parser.parse(1299.99).must_equal 1299.99
-    @parser.parse(-1299.99).must_equal -1299.99
+    @parser.parse(-1299.99).must_equal(-1299.99)
     @parser.parse(1299).must_equal 1299
-    @parser.parse(-1299).must_equal -1299
+    @parser.parse(-1299).must_equal(-1299)
   end
 end

data/test/parameters_test.rb

@@ -14,6 +14,7 @@ puts "Testing parameter classes: #{parameters_classes.inspect}"
 parameters_classes.each do |parameters_class|
   describe parameters_class do
     before do
+      I18n.locale = I18n.default_locale
       Time.zone = 'Berlin' # make sure everything works as expected with TimeWithZone
     end
 
@@ -159,7 +160,7 @@ parameters_classes.each do |parameters_class|
       params = parameters_class.new(:parent => { :parent_date => '21. Mai 2004' })
 
       ## Should not throw an error:
-      delocalized_params = params.delocalize({})
+      params.delocalize({})
     end
 
     it "delocalizes arrays" do
@@ -170,5 +171,15 @@ parameters_classes.each do |parameters_class|
       delocalized_params[:location].must_equal ['13.456', '51.234']
       delocalized_params[:interval].must_equal [Date.civil(2013, 12, 25), Date.civil(2014, 1, 31)]
     end
+
+    it "keeps invalid dates in the params hash" do
+      params = parameters_class.new(:first_date => "asdf", :second_date => "02.0.2017", :third_date => "02.123.2017")
+
+      delocalized_params = params.delocalize(:first_date => :date, :second_date => :date, :third_date => :date)
+
+      delocalized_params[:first_date].must_equal "asdf"
+      delocalized_params[:second_date].must_equal "02.0.2017"
+      delocalized_params[:third_date].must_equal "02.123.2017"
+    end
   end
 end

data/test/test_helper.rb

@@ -7,9 +7,11 @@ Bundler.require(:default, :development)
 
 require 'minitest/autorun'
 require 'minitest/spec'
-require 'mocha/setup'
 
 require 'rails'
+# We need to explicitly load ActiveSupport's version of Hash#slice since Rails 3.2 somehow loads
+# i18n's version first which is different from Rails' (see https://github.com/svenfuchs/i18n/commit/24e71a9a4901ed18c9cab5c53109fd9bf2416bcb).
+require 'active_support/core_ext/hash/slice'
 
 de = {
   :date => {
@@ -65,4 +67,5 @@ tt[:date][:formats][:default] = '%d|%m|%Y'
 I18n.backend.store_translations :de, de
 I18n.backend.store_translations :tt, tt
 
+I18n.default_locale = :de
 I18n.locale = :de

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delocalize
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Clemens Kofler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -68,10 +54,6 @@ files:
 - lib/delocalize/parsers.rb
 - lib/delocalize/parsers/date_time.rb
 - lib/delocalize/parsers/number.rb
-- lib/delocalize/rails_ext/action_view_rails3.rb
-- lib/delocalize/rails_ext/action_view_rails4.rb
-- lib/delocalize/rails_ext/active_record_rails3.rb
-- lib/delocalize/rails_ext/active_record_rails4.rb
 - lib/delocalize/railtie.rb
 - lib/delocalize/version.rb
 - test/database.yml
@@ -100,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Localized date/time and number parsing

data/lib/delocalize/rails_ext/action_view_rails3.rb

@@ -1,53 +0,0 @@
-require 'action_view'
-
-# TODO: also override other methods like to_check_box_tag since they might contain numeric values?
-# ActionView needs some patching too
-
-ActionView::Helpers::InstanceTag.class_eval do
-  include ActionView::Helpers::NumberHelper
-
-  alias original_to_input_field_tag to_input_field_tag
-  def to_input_field_tag(field_type, options = {})
-    options.symbolize_keys!
-    # numbers and dates/times should be localized unless value is already defined
-    if object && (options[:value].blank? || !options[:value].is_a?(String)) && object.respond_to?(:column_for_attribute) && column = object.column_for_attribute(method_name)
-      value = options[:value] || object.send(method_name)
-
-      if column.number?
-        number_options = I18n.t(:'number.format')
-        separator = options.delete(:separator) || number_options[:separator]
-        delimiter = options.delete(:delimiter) || number_options[:delimiter]
-        precision = options.delete(:precision) || number_options[:precision]
-        opts = { :separator => separator, :delimiter => delimiter, :precision => precision }
-        # integers don't need a precision
-        opts.merge!(:precision => 0) if column.type == :integer
-
-        hidden_for_integer = field_type == 'hidden' && column.type == :integer
-
-        # the number will be formatted only if it has no numericality errors
-        if object.respond_to?(:errors) && !Array(object.errors[method_name]).try(:include?, 'is not a number')
-          # we don't format integer hidden fields because this breaks nested_attributes
-          options[:value] = number_with_precision(value, opts) unless hidden_for_integer
-        end
-      elsif column.date? || column.time?
-        options[:value] = value ? I18n.l(value, :format => options.delete(:format)) : nil
-      end
-    end
-
-    original_to_input_field_tag(field_type, options)
-  end
-end
-
-# TODO: does it make sense to also override FormTagHelper methods?
-# ActionView::Helpers::FormTagHelper.class_eval do
-#   include ActionView::Helpers::NumberHelper
-#
-#   alias original_text_field_tag text_field_tag
-#   def text_field_tag(name, value = nil, options = {})
-#     value = options.delete(:value) if options.key?(:value)
-#     if value.is_a?(Numeric)
-#       value = number_with_delimiter(value)
-#     end
-#     original_text_field_tag(name, value, options)
-#   end
-# end

data/lib/delocalize/rails_ext/action_view_rails4.rb

@@ -1,38 +0,0 @@
-require 'action_view'
-
-# TODO: also override other methods like to_check_box_tag since they might contain numeric values?
-# ActionView needs some patching too
-
-ActionView::Helpers::Tags::TextField.class_eval do
-  include ActionView::Helpers::NumberHelper
-
-  def render_with_localization
-    if object && (@options[:value].blank? || !@options[:value].is_a?(String)) && object.respond_to?(:column_for_attribute) && column = object.column_for_attribute(@method_name)
-      value = @options[:value] || object.send(@method_name)
-
-      if column.number?
-        number_options = I18n.t(:'number.format')
-        separator = @options.delete(:separator) || number_options[:separator]
-        delimiter = @options.delete(:delimiter) || number_options[:delimiter]
-        precision = @options.delete(:precision) || number_options[:precision]
-        opts = { :separator => separator, :delimiter => delimiter, :precision => precision }
-        # integers don't need a precision
-        opts.merge!(:precision => 0) if column.type == :integer
-
-        hidden_for_integer = field_type == 'hidden' && column.type == :integer
-
-        # the number will be formatted only if it has no numericality errors
-        if object.respond_to?(:errors) && !Array(object.errors[@method_name]).try(:include?, 'is not a number')
-          # we don't format integer hidden fields because this breaks nested_attributes
-          @options[:value] = number_with_precision(value, opts) unless hidden_for_integer
-        end
-      elsif column.date? || column.time?
-        @options[:value] = value ? I18n.l(value, :format => @options.delete(:format)) : nil
-      end
-    end
-
-    render_without_localization
-  end
-
-  alias_method_chain :render, :localization
-end

data/lib/delocalize/rails_ext/active_record_rails3.rb

@@ -1,80 +0,0 @@
-require 'active_record'
-
-require 'active_record/connection_adapters/abstract/schema_definitions'
-begin
-  require 'active_record/connection_adapters/column'
-rescue LoadError
-  # Not Rails 3.1, it seems
-end
-
-# let's hack into ActiveRecord a bit - everything at the lowest possible level, of course, so we minimalize side effects
-ActiveRecord::ConnectionAdapters::Column.class_eval do
-  def date?
-    klass == Date
-  end
-
-  def time?
-    klass == Time
-  end
-end
-
-ActiveRecord::Base.class_eval do
-  def write_attribute_with_localization(attr_name, original_value)
-    new_value = original_value
-    if column = column_for_attribute(attr_name.to_s)
-      if column.date?
-        new_value = Date.parse_localized(original_value) rescue original_value
-      elsif column.time?
-        new_value = Time.parse_localized(original_value) rescue original_value
-      end
-    end
-    write_attribute_without_localization(attr_name, new_value)
-  end
-  alias_method_chain :write_attribute, :localization
-
-  def convert_number_column_value_with_localization(value)
-    value = convert_number_column_value_without_localization(value)
-    value = Numeric.parse_localized(value) if I18n.delocalization_enabled?
-    value
-  end
-  alias_method_chain :convert_number_column_value, :localization
-
-
-  define_method( (Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('3.2.9')) ? :field_changed? : :_field_changed? ) do |attr, old, value|
-    if column = column_for_attribute(attr)
-      if column.number? && column.null && (old.nil? || old == 0) && value.blank?
-        # For nullable numeric columns, NULL gets stored in database for blank (i.e. '') values.
-        # Hence we don't record it as a change if the value changes from nil to ''.
-        # If an old value of 0 is set to '' we want this to get changed to nil as otherwise it'll
-        # be typecast back to 0 (''.to_i => 0)
-        value = nil
-      elsif column.number?
-        value = column.type_cast(convert_number_column_value_with_localization(value))
-      else
-        value = column.type_cast(value)
-      end
-    end
-    old != value
-  end
-end
-
-ActiveRecord::Base.instance_eval do
-  def define_method_attribute=(attr_name)
-    if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name])
-      method_body, line = <<-EOV, __LINE__ + 1
-        def #{attr_name}=(original_time)
-          time = original_time
-          unless time.acts_like?(:time)
-            time = time.is_a?(String) ? (I18n.delocalization_enabled? ? Time.zone.parse_localized(time) : Time.zone.parse(time)) : time.to_time rescue time
-          end
-          time = time.in_time_zone rescue nil if time
-          write_attribute(:#{attr_name}, original_time)
-          @attributes_cache["#{attr_name}"] = time
-        end
-      EOV
-      generated_attribute_methods.module_eval(method_body, __FILE__, line)
-    else
-      super
-    end
-  end
-end

data/lib/delocalize/rails_ext/active_record_rails4.rb

@@ -1,72 +0,0 @@
-require 'active_record'
-
-# let's hack into ActiveRecord a bit - everything at the lowest possible level, of course, so we minimalize side effects
-ActiveRecord::ConnectionAdapters::Column.class_eval do
-  def date?
-    klass == Date
-  end
-
-  def time?
-    klass == Time
-  end
-end
-
-module ActiveRecord::AttributeMethods::Write
-  def type_cast_attribute_for_write(column, value)
-    return value unless column
-
-    value = Numeric.parse_localized(value) if column.number? && I18n.delocalization_enabled?
-    column.type_cast_for_write value
-  end
-end
-
-ActiveRecord::Base.class_eval do
-  def write_attribute_with_localization(attr_name, original_value)
-    new_value = original_value
-    if column = column_for_attribute(attr_name.to_s)
-      if column.date?
-        new_value = Date.parse_localized(original_value) rescue original_value
-      elsif column.time?
-        new_value = Time.parse_localized(original_value) rescue original_value
-      end
-    end
-    write_attribute_without_localization(attr_name, new_value)
-  end
-  alias_method_chain :write_attribute, :localization
-
-  define_method :_field_changed? do |attr, old, value|
-    if column = column_for_attribute(attr)
-      if column.number? && column.null && (old.nil? || old == 0) && value.blank?
-        # For nullable numeric columns, NULL gets stored in database for blank (i.e. '') values.
-        # Hence we don't record it as a change if the value changes from nil to ''.
-        # If an old value of 0 is set to '' we want this to get changed to nil as otherwise it'll
-        # be typecast back to 0 (''.to_i => 0)
-        value = nil
-      elsif column.number?
-        value = column.type_cast(Numeric.parse_localized(value))
-      else
-        value = column.type_cast(value)
-      end
-    end
-    old != value
-  end
-
-  def define_method_attribute=(attr_name)
-    if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name])
-      method_body, line = <<-EOV, __LINE__ + 1
-        def #{attr_name}=(original_time)
-          time = original_time
-          unless time.acts_like?(:time)
-            time = time.is_a?(String) ? (I18n.delocalization_enabled? ? Time.zone.parse_localized(time) : Time.zone.parse(time)) : time.to_time rescue time
-          end
-          time = time.in_time_zone rescue nil if time
-          write_attribute(:#{attr_name}, original_time)
-          @attributes_cache["#{attr_name}"] = time
-        end
-      EOV
-      generated_attribute_methods.module_eval(method_body, __FILE__, line)
-    else
-      super
-    end
-  end
-end