delocalize 0.3.2 → 0.4.0

data/README.markdown

@@ -1,16 +1,20 @@
-delocalize
-==========
+# delocalize
 
 [![Build Status](https://secure.travis-ci.org/clemens/delocalize.png)](http://travis-ci.org/clemens/delocalize)
 
 delocalize provides localized date/time and number parsing functionality for Rails.
 
-Installation
-------------
+## 1.0 Beta
+
+Check out the [1-0-beta branch](https://github.com/clemens/delocalize/tree/1-0-beta) for an unfinished/unreleased improved version of delocalize. The goal is to get rid of all the nasty hacks and have a library that doesn't break with every new release of Rails.
+
+Also check out the [ongoing discussion the wiki](https://github.com/clemens/delocalize/wiki/delocalize-1.0) and feel free to put in your opinion there.
+
+## Installation
 
 You can use delocalize as a gem (preferred). Using delocalize as a Rails plugin has been discontinued and is no supported. If you want/need to use delocalize as a gem (I really don't see a reason why you'd want to), consider using the `0-2-stable` branch.
 
-### Rails 3
+### Rails 3 and Rails 4
 
 To use delocalize, put the following gem requirement in your `Gemfile`:
 
@@ -20,7 +24,7 @@ gem "delocalize"
 
 ### Rails 2
 
-Note: Support for Rails 2 has been discontinued. This version is only considered stable for Rails 3. If you need Rails 2 support, please use the `0.2.x` versions or the `0-2-stable` branch respectively.
+Note: Support for Rails 2 has been discontinued. This version is only considered stable for Rails >= 3. If you need Rails 2 support, please use the `0.2.x` versions or the `0-2-stable` branch respectively.
 
 To use delocalize, put the following gem requirement in your `environment.rb`:
 
@@ -30,8 +34,7 @@ config.gem "delocalize", :source => 'http://gemcutter.org'
 
 In Rails 2.3, alternatively, you can use it with Bundler. See http://gembundler.com/rails23.html for instructions.
 
-What does it do? And how do I use it?
---------------------------------------
+## What does it do? And how do I use it?
 
 Delocalize, just as the name suggest, does pretty much the opposite of localize.
 
@@ -96,8 +99,8 @@ delocalize then overrides `to_input_field_tag` in ActionView's `InstanceTag` so
 
 In this example, a user can enter the release date and the price just like he's used to in his language, for example:
 
->  Name: "Couch"  
->  Released on: "12. Oktober 2009"  
+>  Name: "Couch"
+>  Released on: "12. Oktober 2009"
 >  Price: "2.999,90"
 
 When saved, ActiveRecord automatically converts these to a regular Ruby date and number.
@@ -107,11 +110,11 @@ Edit forms then also show localized dates/numbers. By default, dates and times a
 You can also customize the output using some options:
 
   The price should always show two decimal digits and we don't need the delimiter:
-  
+
 ```erb
 <%= f.text_field :price, :precision => 2, :delimiter => '' %>
 ```
-  
+
   The `released_on` date should be shown in the `:full` format:
 
 ```erb
@@ -124,7 +127,7 @@ You can also customize the output using some options:
 <%= f.text_field :released_on, :format => "%B %Y" %>
 ```
 
-### Ruby 1.9 + Psych YAML Parser
+## Ruby 1.9 + Psych YAML Parser
 
 You will need to adjust the localization formatting when using the new YAML parser Psych.  Below is an example error message you may receive in your logs as well as an example of acceptable formatting and helpful links for reference:
 
@@ -208,7 +211,7 @@ en:
       - :year
   time:
     input:
-      formats: 
+      formats:
         - :default
         - :long
         - :short
@@ -222,26 +225,17 @@ en:
     pm: "pm"
 ```
 
-### Compatibility
+## Compatibility
 
 * Tested with Rails 2.3.5 in Ruby 1.8.7, Ruby 1.9.1 and Ruby 1.9.2 (head)
-* Tested with Rails 3 Beta 3 in Ruby 1.9.2 (head)
-
-### Contributors
+* Tested with Rails 3 in Ruby 1.9.3, Ruby 2.0 and Ruby 2.1 (head)
+* Tested with Rails 4 in Ruby 1.9.3, Ruby 2.0 and Ruby 2.1 (head)
 
-People who have contributed to delocalize (in no particular order):
+## Contributors
 
-* [Fernando Luizao](http://github.com/fernandoluizao)
-* [Stephan Zalewski](http://github.com/stepahn)
-* [Lailson Bandeira](http://github.com/lailsonbm)
-* [Carlos Antonio da Silva](http://github.com/carlosantoniodasilva)
-* [Michele Franzin](http://github.com/michelefranzin)
-* [Raphaela Wrede](https://github.com/rwrede)
-* [Jan De Poorter](https://github.com/DefV)
-* [Blake Lucchesi](https://github.com/BlakeLucchesi)
-* [Ralph von der Heyden](https://github.com/ralph)
+Thanks to [all the people who contributed](https://github.com/clemens/delocalize/graphs/contributors) and submitted issues.
 
-### TODO
+## TODO
 
 * Improve test coverage
 * Separate Ruby/Rails stuff to make it usable outside Rails
@@ -249,6 +243,6 @@ People who have contributed to delocalize (in no particular order):
 * Implement AM/PM support
 * Cleanup, cleanup, cleanup ...
 
-Copyright (c) 2009-2011 Clemens Kofler <clemens@railway.at>
+Copyright (c) 2009-2014 Clemens Kofler <clemens@railway.at>
 <http://www.railway.at/>
 Released under the MIT license

data/lib/delocalize/i18n_ext.rb

@@ -16,15 +16,21 @@ module I18n
     def with_delocalization_disabled(&block)
       old_value = I18n.enable_delocalization
       I18n.enable_delocalization = false
-      yield
-      I18n.enable_delocalization = old_value
+      begin
+        yield
+      ensure
+        I18n.enable_delocalization = old_value
+      end
     end
 
     def with_delocalization_enabled(&block)
       old_value = I18n.enable_delocalization
       I18n.enable_delocalization = true
-      yield
-      I18n.enable_delocalization = old_value
+      begin
+        yield
+      ensure
+        I18n.enable_delocalization = old_value
+      end
     end
   end
-end
+end

data/lib/delocalize/rails_ext/action_view.rb

@@ -1,54 +1,5 @@
-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
+if Gem::Version.new(ActionPack::VERSION::STRING) >= Gem::Version.new('4.0.0.beta')
+  require 'delocalize/rails_ext/action_view_rails4'
+else
+  require 'delocalize/rails_ext/action_view_rails3'
 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_rails3.rb

@@ -0,0 +1,53 @@
+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

@@ -0,0 +1,38 @@
+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.rb

@@ -1,80 +1,5 @@
-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
+if Gem::Version.new(ActionPack::VERSION::STRING) >= Gem::Version.new('4.0.0.beta')
+  require 'delocalize/rails_ext/active_record_rails4'
+else
+  require 'delocalize/rails_ext/active_record_rails3'
 end

data/lib/delocalize/rails_ext/active_record_rails3.rb

@@ -0,0 +1,80 @@
+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

@@ -0,0 +1,72 @@
+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

data/test/delocalize_test.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
 
 require 'test_helper'
-require 'active_record/test_case'
-require 'action_view/test_case'
 
-class DelocalizeActiveRecordTest < ActiveRecord::TestCase
+class DelocalizeActiveRecordTest < ActiveSupport::TestCase
   def setup
     Time.zone = 'Berlin' # make sure everything works as expected with TimeWithZone
     Timecop.freeze(Time.zone.local(2009, 3, 1, 12, 0))
@@ -65,7 +63,7 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
   end
 
   test "delocalizes with fallback locale" do
-    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+    I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
     I18n.fallbacks[:xx] = [:xx, :tt]
 
     I18n.with_locale :xx do
@@ -147,6 +145,14 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     end
   end
 
+  test "properly resets when an error is raised in a with_delocalization_disabled block" do
+    I18n.enable_delocalization = true
+    I18n.with_delocalization_disabled do
+      raise 'error'
+    end rescue nil
+    assert_equal true, I18n.enable_delocalization
+  end
+
   test "uses localized parsing if called with with_delocalization_enabled" do
     I18n.with_delocalization_enabled do
       @product.price = '1.299,99'
@@ -157,6 +163,14 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     end
   end
 
+  test "properly resets when an error is raised in a with_delocalization_enabled block" do
+    I18n.enable_delocalization = false
+    I18n.with_delocalization_enabled do
+      raise 'error'
+    end rescue nil
+    assert_equal false, I18n.enable_delocalization
+  end
+
   test "dirty attributes must detect changes in decimal columns" do
     @product.price = 10
     @product.save
@@ -202,7 +216,7 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
   end
 end
 
-class DelocalizeActionViewTest < ActionView::TestCase
+class DelocalizeActionViewTest < ActiveSupport::TestCase
   include ActionView::Helpers::FormHelper
 
   def setup
@@ -212,62 +226,52 @@ class DelocalizeActionViewTest < ActionView::TestCase
 
   test "shows text field using formatted number" do
     @product.price = 1299.9
-    assert_dom_equal '<input id="product_price" name="product[price]" size="30" type="text" value="1.299,90" />',
-      text_field(:product, :price)
+    assert_match /value="1\.299,90"/, text_field(:product, :price)
   end
 
   test "shows text field using formatted number with options" do
     @product.price = 1299.995
-    assert_dom_equal '<input id="product_price" name="product[price]" size="30" type="text" value="1,299.995" />',
-      text_field(:product, :price, :precision => 3, :delimiter => ',', :separator => '.')
+    assert_match /value="1,299\.995"/, text_field(:product, :price, :precision => 3, :delimiter => ',', :separator => '.')
   end
 
   test "shows text field using formatted number without precision if column is an integer" do
     @product.times_sold = 20
-    assert_dom_equal '<input id="product_times_sold" name="product[times_sold]" size="30" type="text" value="20" />',
-      text_field(:product, :times_sold)
+    assert_match /value="20"/, text_field(:product, :times_sold)
 
     @product.times_sold = 2000
-    assert_dom_equal '<input id="product_times_sold" name="product[times_sold]" size="30" type="text" value="2.000" />',
-      text_field(:product, :times_sold)
+    assert_match /value="2\.000"/, text_field(:product, :times_sold)
   end
 
   test "shows text field using formatted date" do
     @product.released_on = Date.civil(2009, 10, 19)
-    assert_dom_equal '<input id="product_released_on" name="product[released_on]" size="30" type="text" value="19.10.2009" />',
-      text_field(:product, :released_on)
+    assert_match /value="19\.10\.2009"/, text_field(:product, :released_on)
   end
 
   test "shows text field using formatted date and time" do
     @product.published_at = Time.zone.local(2009, 3, 1, 12, 0, 0)
     # careful - leading whitespace with %e
-    assert_dom_equal '<input id="product_published_at" name="product[published_at]" size="30" type="text" value="Sonntag,  1. März 2009, 12:00 Uhr" />',
-      text_field(:product, :published_at)
+    assert_match /value="Sonntag,  1\. März 2009, 12:00 Uhr"/, text_field(:product, :published_at)
   end
 
   test "shows text field using formatted date with format" do
     @product.released_on = Date.civil(2009, 10, 19)
-    assert_dom_equal '<input id="product_released_on" name="product[released_on]" size="30" type="text" value="19. Oktober 2009" />',
-      text_field(:product, :released_on, :format => :long)
+    assert_match /value="19\. Oktober 2009"/, text_field(:product, :released_on, :format => :long)
   end
 
   test "shows text field using formatted date and time with format" do
     @product.published_at = Time.zone.local(2009, 3, 1, 12, 0, 0)
     # careful - leading whitespace with %e
-    assert_dom_equal '<input id="product_published_at" name="product[published_at]" size="30" type="text" value=" 1. März, 12:00 Uhr" />',
-      text_field(:product, :published_at, :format => :short)
+    assert_match /value=" 1\. März, 12:00 Uhr"/, text_field(:product, :published_at, :format => :short)
   end
 
   test "shows text field using formatted time with format" do
     @product.cant_think_of_a_sensible_time_field = Time.zone.local(2009, 3, 1, 9, 0, 0)
-    assert_dom_equal '<input id="product_cant_think_of_a_sensible_time_field" name="product[cant_think_of_a_sensible_time_field]" size="30" type="text" value="09:00 Uhr" />',
-      text_field(:product, :cant_think_of_a_sensible_time_field, :format => :time)
+    assert_match /value="09:00 Uhr"/, text_field(:product, :cant_think_of_a_sensible_time_field, :format => :time)
   end
 
   test "integer hidden fields shouldn't be formatted" do
     @product.times_sold = 1000
-    assert_dom_equal '<input id="product_times_sold" name="product[times_sold]" type="hidden" value="1000" />',
-      hidden_field(:product, :times_sold)
+    assert_match /value="1000"/, hidden_field(:product, :times_sold)
   end
 
   test "doesn't raise an exception when object is nil" do
@@ -287,28 +291,24 @@ class DelocalizeActionViewTest < ActionView::TestCase
 
   test "delocalizes a given non-string :value" do
     @product.price = 1299.9
-    assert_dom_equal '<input id="product_price" name="product[price]" size="30" type="text" value="1.499,90" />',
-      text_field(:product, :price, :value => 1499.90)
+    assert_match /value="1\.499,90"/, text_field(:product, :price, :value => 1499.90)
   end
 
   test "doesn't override given string :value" do
     @product.price = 1299.9
-    assert_dom_equal '<input id="product_price" name="product[price]" size="30" type="text" value="1.499,90" />',
-      text_field(:product, :price, :value => "1.499,90")
+    assert_match /value="1\.499,90"/, text_field(:product, :price, :value => "1.499,90")
   end
 
   test "doesn't convert the value if field has numericality errors" do
     @product = ProductWithValidation.new(:price => 'this is not a number')
     @product.valid?
-    assert_dom_equal %(<div class="field_with_errors"><input id="product_price" name="product[price]" size="30" type="text" value="this is not a number" /></div>),
-      text_field(:product, :price)
+    assert_match /value="this is not a number"/, text_field(:product, :price)
   end
 
   test "should convert the value if field have non-numericality errors, but have other errors, e.g. business rules" do
     @product = ProductWithBusinessValidation.new(:price => '1.337,66')
     @product.valid?
-    assert_dom_equal %(<div class="field_with_errors"><input id="product_price" name="product[price]" size="30" type="text" value="1.337,66" /></div>),
-      text_field(:product, :price)
+    assert_match /value="1\.337,66"/, text_field(:product, :price)
   end
 
   test "doesn't raise an exception when object isn't an ActiveReccord" do
@@ -324,8 +324,7 @@ class DelocalizeActionViewTest < ActionView::TestCase
   end
 
   test "formats field with default value correctly" do
-    assert_dom_equal '<input id="product_some_value_with_default" name="product[some_value_with_default]" size="30" type="text" value="0,00" />',
-      text_field(:product, :some_value_with_default)
+    assert_match /value="0,00"/, text_field(:product, :some_value_with_default)
   end
 end
 

data/test/test_helper.rb

@@ -6,8 +6,7 @@ require 'bundler'
 Bundler.require(:default, :development)
 
 require 'rails/all'
-
-require 'test/unit'
+require 'rails/test_help'
 
 require 'delocalize/rails_ext/action_view'
 require 'delocalize/rails_ext/active_record'
@@ -66,6 +65,7 @@ tt[:date][:formats][:default] = '%d|%m|%Y'
 I18n.backend.store_translations :de, de
 I18n.backend.store_translations :tt, tt
 
+I18n.enforce_available_locales = false
 I18n.locale = :de
 
 class NonArProduct
@@ -83,11 +83,7 @@ class ProductWithValidation < Product
 end
 
 class ProductWithBusinessValidation < Product
-  validate do |record|
-    if record.price > 10
-      record.errors.add(:price, :invalid)
-    end
-  end
+  validates_numericality_of :price, :less_than => 10
 end
 
 config = YAML.load_file(File.dirname(__FILE__) + '/database.yml')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delocalize
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,9 +19,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,9 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +54,11 @@ files:
 - lib/delocalize/localized_date_time_parser.rb
 - lib/delocalize/localized_numeric_parser.rb
 - lib/delocalize/rails_ext/action_view.rb
+- lib/delocalize/rails_ext/action_view_rails3.rb
+- lib/delocalize/rails_ext/action_view_rails4.rb
 - lib/delocalize/rails_ext/active_record.rb
+- lib/delocalize/rails_ext/active_record_rails3.rb
+- lib/delocalize/rails_ext/active_record_rails4.rb
 - lib/delocalize/rails_ext/time_zone.rb
 - lib/delocalize/railtie.rb
 - lib/delocalize/ruby_ext/date.rb
@@ -75,7 +73,8 @@ files:
 - test/delocalize_test.rb
 - test/test_helper.rb
 homepage: http://github.com/clemens/delocalize
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8