delocalize 0.3.1 → 0.3.2

data/README.markdown

@@ -14,7 +14,9 @@ You can use delocalize as a gem (preferred). Using delocalize as a Rails plugin
 
 To use delocalize, put the following gem requirement in your `Gemfile`:
 
-    gem "delocalize"
+```ruby
+gem "delocalize"
+```
 
 ### Rails 2
 
@@ -22,7 +24,9 @@ Note: Support for Rails 2 has been discontinued. This version is only considered
 
 To use delocalize, put the following gem requirement in your `environment.rb`:
 
-    config.gem "delocalize", :source => 'http://gemcutter.org'
+```ruby
+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.
 
@@ -33,44 +37,48 @@ Delocalize, just as the name suggest, does pretty much the opposite of localize.
 
 In the grey past, if you want your users to be able to input localized data, such as dates and numbers, you had to manually override attribute accessors:
 
-    def price=(price)
-      write_attribute(:price, price.gsub(',', '.'))
-    end
+```ruby
+def price=(price)
+  write_attribute(:price, price.gsub(',', '.'))
+end
+```
 
 delocalize does this under the covers -- all you need is your regular translation data (as YAML or Ruby file) where you need Rails' standard translations:
 
-    de:
-      number:
-        format:
-          separator: ','
-          delimiter: '.'
-      date:
-        input:
-          formats: [:default, :long, :short] # <- this and ...
-
-        formats:
-          default: "%d.%m.%Y"
-          short: "%e. %b"
-          long: "%e. %B %Y"
-          only_day: "%e"
-
-        day_names: [Sonntag, Montag, Dienstag, Mittwoch, Donnerstag, Freitag, Samstag]
-        abbr_day_names: [So, Mo, Di, Mi, Do, Fr, Sa]
-        month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
-        abbr_month_names: [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez]
-        order: [ :day, :month, :year ]
-
-      time:
-        input:
-          formats: [:long, :medium, :short, :default, :time] # <- ... this are the only non-standard keys
-        formats:
-          default: "%A, %e. %B %Y, %H:%M Uhr"
-          short: "%e. %B, %H:%M Uhr"
-          long: "%A, %e. %B %Y, %H:%M Uhr"
-          time: "%H:%M"
-
-        am: "vormittags"
-        pm: "nachmittags"
+```yml
+de:
+  number:
+    format:
+      separator: ','
+      delimiter: '.'
+  date:
+    input:
+      formats: [:default, :long, :short] # <- this and ...
+
+    formats:
+      default: "%d.%m.%Y"
+      short: "%e. %b"
+      long: "%e. %B %Y"
+      only_day: "%e"
+
+    day_names: [Sonntag, Montag, Dienstag, Mittwoch, Donnerstag, Freitag, Samstag]
+    abbr_day_names: [So, Mo, Di, Mi, Do, Fr, Sa]
+    month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
+    abbr_month_names: [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez]
+    order: [ :day, :month, :year ]
+
+  time:
+    input:
+      formats: [:long, :medium, :short, :default, :time] # <- ... this are the only non-standard keys
+    formats:
+      default: "%A, %e. %B %Y, %H:%M Uhr"
+      short: "%e. %B, %H:%M Uhr"
+      long: "%A, %e. %B %Y, %H:%M Uhr"
+      time: "%H:%M"
+
+    am: "vormittags"
+    pm: "nachmittags"
+```
 
 For dates and times, you have to define input formats which are taken from the actual formats. The important thing here is to define input formats sorted by descending complexity; in other words: the format which contains the most (preferably non-numeric) information should be first in the list because it can produce the most reliable match. Exception: If you think there most complex format is not the one that most users will input, you can put the most-used in front so you save unnecessary iterations.
 
@@ -78,12 +86,14 @@ Careful with formats containing only numbers: It's very hard to produce reliable
 
 delocalize then overrides `to_input_field_tag` in ActionView's `InstanceTag` so you can use localized text fields:
 
-    <% form_for @product do |f| %>
-      <%= f.text_field :name %>
-      <%= f.text_field :released_on %>
-      <%= f.text_field :price %>
-    <% end %>
-  
+```erb
+<% form_for @product do |f| %>
+  <%= f.text_field :name %>
+  <%= f.text_field :released_on %>
+  <%= f.text_field :price %>
+<% end %>
+```
+
 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"  
@@ -97,13 +107,22 @@ 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:
-      <%= f.text_field :price, :precision => 2, :delimiter => '' %>
   
-  The `released_on` date should be shown in the `:full` format:
-      <%= f.text_field :released_on, :format => :full %>
+```erb
+<%= f.text_field :price, :precision => 2, :delimiter => '' %>
+```
   
+  The `released_on` date should be shown in the `:full` format:
+
+```erb
+<%= f.text_field :released_on, :format => :full %>
+```
+
   Since `I18n.localize` supports localizing `strftime` strings, we can also do this:
-      <%= f.text_field :released_on, :format => "%B %Y" %>
+
+```erb
+<%= f.text_field :released_on, :format => "%B %Y" %>
+```
 
 ### Ruby 1.9 + Psych YAML Parser
 
@@ -121,85 +140,87 @@ http://pivotallabs.com/users/mkocher/blog/articles/1692-yaml-psych-and-ruby-1-9-
 
 __Psych Preferred Formatting:__
 
-    en:
-      number:
-        format:
-          separator: '.'
-          delimiter: ','
-          precision: 2
-      date:
-        input:
-          formats:
-            - :default
-            - :long
-            - :short
-        formats:
-          default: "%m/%d/%Y"
-          short: "%b %e"
-          long: "%B %e, %Y"
-          only_day: "%e"
-        day_names:
-          - Sunday
-          - Monday
-          - Tuesday
-          - Wednesday
-          - Thursday
-          - Friday
-          - Saturday
-        abbr_day_names:
-          - Sun
-          - Mon
-          - Tue
-          - Wed
-          - Thur
-          - Fri
-          - Sat
-        month_names:
-          - ~
-          - January
-          - February
-          - March
-          - April
-          - May
-          - June
-          - July
-          - August
-          - September
-          - October
-          - November
-          - December
-        abbr_month_names:
-          - ~
-          - Jan
-          - Feb
-          - Mar
-          - Apr
-          - May
-          - Jun
-          - Jul
-          - Aug
-          - Sep
-          - Oct
-          - Nov
-          - Dec
-        order:
-          - :month
-          - :day
-          - :year
-      time:
-        input:
-          formats: 
-            - :default
-            - :long
-            - :short
-            - :time
-        formats:
-          default: "%m/%d/%Y %I:%M%p"
-          short: "%B %e %I:%M %p"
-          long: "%A, %B %e, %Y %I:%M%p"
-          time: "%l:%M%p"
-        am: "am"
-        pm: "pm"
+```yml
+en:
+  number:
+    format:
+      separator: '.'
+      delimiter: ','
+      precision: 2
+  date:
+    input:
+      formats:
+        - :default
+        - :long
+        - :short
+    formats:
+      default: "%m/%d/%Y"
+      short: "%b %e"
+      long: "%B %e, %Y"
+      only_day: "%e"
+    day_names:
+      - Sunday
+      - Monday
+      - Tuesday
+      - Wednesday
+      - Thursday
+      - Friday
+      - Saturday
+    abbr_day_names:
+      - Sun
+      - Mon
+      - Tue
+      - Wed
+      - Thur
+      - Fri
+      - Sat
+    month_names:
+      - ~
+      - January
+      - February
+      - March
+      - April
+      - May
+      - June
+      - July
+      - August
+      - September
+      - October
+      - November
+      - December
+    abbr_month_names:
+      - ~
+      - Jan
+      - Feb
+      - Mar
+      - Apr
+      - May
+      - Jun
+      - Jul
+      - Aug
+      - Sep
+      - Oct
+      - Nov
+      - Dec
+    order:
+      - :month
+      - :day
+      - :year
+  time:
+    input:
+      formats: 
+        - :default
+        - :long
+        - :short
+        - :time
+    formats:
+      default: "%m/%d/%Y %I:%M%p"
+      short: "%B %e %I:%M %p"
+      long: "%A, %B %e, %Y %I:%M%p"
+      time: "%l:%M%p"
+    am: "am"
+    pm: "pm"
+```
 
 ### Compatibility
 

data/lib/delocalize/localized_date_time_parser.rb

@@ -53,9 +53,15 @@ module Delocalize
       end
 
       def translate_month_and_day_names(datetime)
-        translated = I18n.t([:month_names, :abbr_month_names, :day_names, :abbr_day_names], :scope => :date).flatten.compact
+        # Note: This should be a bulk lookup but due to a bug in i18n it doesn't work properly with fallbacks.
+        # See https://github.com/svenfuchs/i18n/issues/104.
+        # TODO Make it a bulk lookup again at some point in the future when the bug is fixed in i18n.
+        translated = [:month_names, :abbr_month_names, :day_names, :abbr_day_names].map do |key|
+          I18n.t(key, :scope => :date)
+        end.flatten.compact
+
         original = (Date::MONTHNAMES + Date::ABBR_MONTHNAMES + Date::DAYNAMES + Date::ABBR_DAYNAMES).compact
-        translated.each_with_index { |name, i| datetime.gsub!(name, original[i]) }
+        translated.each_with_index { |name, i| datetime.gsub!(/\b#{name}\b/, original[i]) }
       end
 
       def input_formats(type)

data/lib/delocalize/rails_ext/action_view.rb

@@ -10,30 +10,27 @@ ActionView::Helpers::InstanceTag.class_eval do
   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? && object.respond_to?(:column_for_attribute) && column = object.column_for_attribute(method_name)
-      # a little verbose
-      if column.number? || column.date? || column.time?
-        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 errors
-          if object.respond_to?(:errors) && !Array(object.errors[method_name]).try(:any?)
-            # 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
+    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
 
@@ -44,7 +41,7 @@ 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)
@@ -54,3 +51,4 @@ end
 #     original_text_field_tag(name, value, options)
 #   end
 # end
+

data/lib/delocalize/rails_ext/active_record.rb

@@ -39,7 +39,8 @@ ActiveRecord::Base.class_eval do
   end
   alias_method_chain :convert_number_column_value, :localization
 
-  def field_changed?(attr, old, value)
+
+  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.
@@ -53,7 +54,6 @@ ActiveRecord::Base.class_eval do
         value = column.type_cast(value)
       end
     end
-
     old != value
   end
 end

data/test/delocalize_test.rb

@@ -11,6 +11,10 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     @product = Product.new
   end
 
+  def teardown
+    Timecop.return
+  end
+
   test "delocalizes localized number" do
     @product.price = '1.299,99'
     assert_equal 1299.99, @product.price
@@ -43,6 +47,7 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
   end
 
   test "delocalizes localized date without year" do
+    Timecop.return
     date = Date.civil(Date.today.year, 10, 19)
 
     @product.released_on = '19. Okt'
@@ -59,6 +64,17 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     assert_equal time, @product.published_at
   end
 
+  test "delocalizes with fallback locale" do
+    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+    I18n.fallbacks[:xx] = [:xx, :tt]
+
+    I18n.with_locale :xx do
+      @product.released_on = '10|11|2009'
+      date = Date.civil(2009, 11, 10)
+      assert_equal date, @product.released_on
+    end
+  end
+
   test "delocalizes localized datetime without year" do
     time = Time.zone.local(Date.today.year, 3, 1, 12, 0, 0)
 
@@ -66,21 +82,9 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     assert_equal time, @product.published_at
   end
 
-  # TODO can I somehow do this smarter? or should I use another zone w/o DST?
-  if Time.current.dst?
-    test "delocalizes localized time (DST)" do
-      now = Date.today
-      time = Time.zone.local(now.year, now.month, now.day, 9, 0, 0)
-      @product.cant_think_of_a_sensible_time_field = '09:00 Uhr'
-      assert_equal time, @product.cant_think_of_a_sensible_time_field
-    end
-  else
-    test "delocalizes localized time (non-DST)" do
-      now = Date.today
-      time = Time.zone.local(now.year, now.month, now.day, 8, 0, 0)
-      @product.cant_think_of_a_sensible_time_field = '08:00 Uhr'
-      assert_equal time, @product.cant_think_of_a_sensible_time_field
-    end
+  test "delocalizes localized time (DST)" do
+    @product.cant_think_of_a_sensible_time_field = '09:00 Uhr'
+    assert_equal '09:00', @product.cant_think_of_a_sensible_time_field.strftime('%H:%M')
   end
 
   test "invalid dates should be delocalized to nil" do
@@ -179,6 +183,23 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     assert_equal @product.price, 0
     assert_equal @product.price_before_type_cast, "asd"
   end
+
+  test 'it should gsub only whole translated words and not mess up the original string' do
+    orig_march = I18n.t('date.month_names')[3]
+    orig_monday = I18n.t('date.abbr_day_names')[1]
+
+    #Simulate Dutch
+    I18n.t('date.month_names')[3] = 'Maart'
+    I18n.t('date.abbr_day_names')[1] = 'Ma'
+
+    subject = '30 Maart 2011'
+    Delocalize::LocalizedDateTimeParser.send(:translate_month_and_day_names, subject)
+
+    assert_equal subject, '30 March 2011'
+
+    I18n.t('date.month_names')[3] = orig_march
+    I18n.t('date.abbr_day_names')[1] = orig_monday
+  end
 end
 
 class DelocalizeActionViewTest < ActionView::TestCase
@@ -264,19 +285,32 @@ class DelocalizeActionViewTest < ActionView::TestCase
     }
   end
 
-  test "doesn't override given :value" do
+  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)
+  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")
   end
 
-  test "doesn't convert the value if field has errors" do
+  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)
   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)
+  end
+
   test "doesn't raise an exception when object isn't an ActiveReccord" do
     @product = NonArProduct.new
     assert_nothing_raised {
@@ -294,3 +328,4 @@ class DelocalizeActionViewTest < ActionView::TestCase
       text_field(:product, :some_value_with_default)
   end
 end
+

data/test/test_helper.rb

@@ -5,6 +5,8 @@ require 'bundler'
 
 Bundler.require(:default, :development)
 
+require 'rails/all'
+
 require 'test/unit'
 
 require 'delocalize/rails_ext/action_view'
@@ -47,6 +49,13 @@ de = {
       :separator => ',',
       :delimiter => '.'
     }
+  },
+  :activerecord => {
+    :errors => {
+      :messages => {
+        :not_a_number => 'is not a number'
+      }
+    }
   }
 }
 
@@ -73,6 +82,14 @@ class ProductWithValidation < Product
   validates_presence_of :price
 end
 
+class ProductWithBusinessValidation < Product
+  validate do |record|
+    if record.price > 10
+      record.errors.add(:price, :invalid)
+    end
+  end
+end
+
 config = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
 ActiveRecord::Base.establish_connection(config['test'])
 
@@ -86,3 +103,4 @@ ActiveRecord::Base.connection.create_table :products do |t|
   t.integer :times_sold
   t.decimal :some_value_with_default, :default => 0, :precision => 20, :scale => 2
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delocalize
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-22 00:00:00.000000000Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2160177200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: *2160177200
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2160175980 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
-  type: :development
-  prerelease: false
-  version_requirements: *2160175980
+        version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2160174480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,12 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2160174480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 description: Delocalize is a tool for parsing localized dates/times and numbers.
 email: clemens@railway.at
 executables: []
@@ -51,10 +56,6 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- MIT-LICENSE
-- Rakefile
-- VERSION
-- lib/delocalize.rb
 - lib/delocalize/i18n_ext.rb
 - lib/delocalize/localized_date_time_parser.rb
 - lib/delocalize/localized_numeric_parser.rb
@@ -62,12 +63,14 @@ files:
 - lib/delocalize/rails_ext/active_record.rb
 - lib/delocalize/rails_ext/time_zone.rb
 - lib/delocalize/railtie.rb
-- lib/delocalize/ruby_ext.rb
 - lib/delocalize/ruby_ext/date.rb
 - lib/delocalize/ruby_ext/datetime.rb
 - lib/delocalize/ruby_ext/numeric.rb
 - lib/delocalize/ruby_ext/time.rb
+- lib/delocalize/ruby_ext.rb
+- lib/delocalize.rb
 - README.markdown
+- MIT-LICENSE
 - test/database.yml
 - test/delocalize_test.rb
 - test/test_helper.rb
@@ -92,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Localized date/time and number parsing

data/Rakefile

@@ -1,14 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
-
-desc 'Test the delocalize gem.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/delocalize_test.rb'
-  t.verbose = true
-end
-
-desc 'Default: run unit tests.'
-task :default => :test

data/VERSION

@@ -1 +0,0 @@
-0.3.1