delocalize 0.4.0 → 1.0.0

data/lib/delocalize/parsers/number.rb

@@ -0,0 +1,15 @@
+# TODO Rethink: Shouldn't this return numbers instead of reformatted strings?
+module Delocalize
+  module Parsers
+    class Number
+      # Parse numbers removing unneeded characters and replacing decimal separator
+      # through I18n. This will return a valid Ruby Numeric value (as String).
+      def parse(value)
+        return value unless value.is_a?(String)
+
+        separator, delimiter = I18n.t([:separator, :delimiter], :scope => :'number.format')
+        value.gsub(delimiter, '').gsub(separator, '.')
+      end
+    end
+  end
+end

data/lib/delocalize/railtie.rb

@@ -1,15 +1,15 @@
 module Delocalize
   class Railtie < Rails::Railtie
     initializer "delocalize" do |app|
-      ActiveSupport.on_load :active_record do
-        require 'delocalize/rails_ext/active_record'
+      ActiveSupport.on_load :action_controller do
+        # By default, we use ActionController::Parameters provided by strong_parameters. If it's
+        # not there, we fall back to our own replacement (Delocalize::Parameters).
+        if defined?(ActionController::Parameters)
+          ActionController::Parameters.send(:include, Delocalize::ParameterDelocalizing)
+        else
+          ActionController::Base.send(:include, Delocalize::DelocalizableParameters)
+        end
       end
-
-      ActiveSupport.on_load :action_view do
-        require 'delocalize/rails_ext/action_view'
-      end
-
-      require 'delocalize/rails_ext/time_zone'
     end
   end
 end

data/lib/delocalize/version.rb

@@ -0,0 +1,3 @@
+module Delocalize
+  VERSION = "1.0.0"
+end

data/test/date_time_parser_test.rb

@@ -0,0 +1,56 @@
+# encoding: utf-8
+
+require 'test_helper'
+require 'active_support/time'
+
+describe Delocalize::Parsers::DateTime do
+  before do
+    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)
+  end
+
+  after do
+    Timecop.return
+  end
+
+  # date
+  it "parses a date from a string" do
+    date = Date.civil(2009, 10, 19)
+    @date_parser.parse('19. Oktober 2009').must_equal date
+    @date_parser.parse('19.10.2009').must_equal date
+  end
+
+  it "parses a date without a year from a string, defaulting to the current year" do
+    date = Date.civil(Date.today.year, 10, 19)
+    @date_parser.parse('19. Okt.').must_equal date
+    @date_parser.parse('19.10.').must_equal date
+  end
+
+  # datetime
+  it "parses a datetime from a string" do
+    time = Time.zone.local(2009, 3, 1, 12, 0, 0)
+    @time_parser.parse('Sonntag, 1. März 2009, 12:00 Uhr').must_equal time
+    @time_parser.parse('1. März 2009, 12:00 Uhr').must_equal time
+  end
+
+  it "parses a datetime without a year from a string, defaulting to the current year" do
+    time = Time.zone.local(Time.now.year, 3, 1, 12, 0, 0)
+    @time_parser.parse('1. März, 12:00 Uhr').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
+    time = Time.zone.local(2009, 3, 1, 9, 0, 0, 0)
+    @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)
+
+    @date_parser.parse(date).must_equal date
+    @time_parser.parse(time).must_equal time
+  end
+end

data/test/number_parser_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+describe Delocalize::Parsers::Number do
+  before do
+    @parser = Delocalize::Parsers::Number.new
+  end
+
+  it "parses a number from a string" do
+    @parser.parse('1.299,99').must_equal '1299.99'
+  end
+
+  it "parses a negative number from a string" do
+    @parser.parse('-1.299,99').must_equal '-1299.99'
+  end
+
+  it "parses an integer from a string" do
+    @parser.parse('1.299').must_equal '1299'
+  end
+
+  it "parses a negative integer from a string" do
+    @parser.parse('-1.299').must_equal '-1299'
+  end
+
+  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).must_equal 1299
+    @parser.parse(-1299).must_equal -1299
+  end
+end

data/test/parameters_test.rb

@@ -0,0 +1,171 @@
+require 'test_helper'
+
+parameters_classes = [Delocalize::Parameters]
+
+if defined?(ActionController::Parameters)
+  # FIXME Can this happen automatically, e.g. by loading the Railtie?
+  ActionController::Parameters.send(:include, Delocalize::ParameterDelocalizing)
+  parameters_classes << ActionController::Parameters
+end
+
+parameters_classes.each do |parameters_class|
+  describe parameters_class do
+    before do
+      Time.zone = 'Berlin' # make sure everything works as expected with TimeWithZone
+    end
+
+    it "delocalizes top level params based on the given options" do
+      params = parameters_class.new(:released_on => '21. Mai 1986', :available_until => '25. Dezember 2013, 23:59 Uhr', :price => '1.299,99')
+
+      delocalized_params = params.delocalize(:released_on => :date, :available_until => :time, :price => :number)
+
+      delocalized_params[:released_on].must_equal Date.civil(1986, 5, 21)
+      delocalized_params[:available_until].must_equal Time.zone.local(2013, 12, 25, 23, 59)
+      delocalized_params[:price].must_equal '1299.99'
+    end
+
+    it "delocalizes nested params based on the given options" do
+      params = parameters_class.new(:product => { :released_on => '21. Mai 1986', :available_until => '25. Dezember 2013, 23:59 Uhr', :price => '1.299,99' })
+
+      delocalized_params = params.delocalize(:product => { :released_on => :date, :available_until => :time, :price => :number })
+
+      delocalized_params[:product][:released_on].must_equal Date.civil(1986, 5, 21)
+      delocalized_params[:product][:available_until].must_equal Time.zone.local(2013, 12, 25, 23, 59)
+      delocalized_params[:product][:price].must_equal '1299.99'
+    end
+
+    it "delocalizes field-for type params based on the given options" do
+      params = parameters_class.new(
+          :product => {
+              variant_attributes: {
+                  "0" => { :released_on => '21. Mai 1986', :available_until => '25. Dezember 2013, 23:59 Uhr', :price => '1.299,99' },
+                  "1" => { :released_on => '1. Juni 2001', :available_until => '12. November 2014, 00:00 Uhr', :price => '1.099,01' },
+              }
+          }
+      )
+
+      delocalized_params = params.delocalize(:product => { :variant_attributes => { :released_on => :date, :available_until => :time, :price => :number } })
+
+      delocalized_params[:product][:variant_attributes]['0'][:released_on].must_equal Date.civil(1986, 5, 21)
+      delocalized_params[:product][:variant_attributes]['0'][:available_until].must_equal Time.zone.local(2013, 12, 25, 23, 59)
+      delocalized_params[:product][:variant_attributes]['0'][:price].must_equal '1299.99'
+
+      delocalized_params[:product][:variant_attributes]['1'][:released_on].must_equal Date.civil(2001, 6, 1)
+      delocalized_params[:product][:variant_attributes]['1'][:available_until].must_equal Time.zone.local(2014, 11, 12, 00, 00)
+      delocalized_params[:product][:variant_attributes]['1'][:price].must_equal '1099.01'
+    end
+
+    it "delocalizes nested params on the key itself based on the given options" do
+      params = parameters_class.new(:product => { :released_on => '21. Mai 1986', :available_until => '25. Dezember 2013, 23:59 Uhr', :price => '1.299,99' })
+
+      product_params = params[:product].delocalize(:released_on => :date, :available_until => :time, :price => :number)
+
+      product_params[:released_on].must_equal Date.civil(1986, 5, 21)
+      product_params[:available_until].must_equal Time.zone.local(2013, 12, 25, 23, 59)
+      product_params[:price].must_equal '1299.99'
+    end
+
+    it "delocalizes deeply nested params for one-to-one based on the given  options" do
+      params = parameters_class.new(:parent => { :child => { :child_date => '21. Mai 1986', :child_time => '25. Dezember 2013, 23:59 Uhr', :child_number => '1.299,99' } })
+
+      delocalized_params = params.delocalize(:parent => { :child => { :child_date => :date, :child_time => :time, :child_number => :number } })
+
+      delocalized_params[:parent][:child][:child_date].must_equal Date.civil(1986, 5, 21)
+      delocalized_params[:parent][:child][:child_time].must_equal Time.zone.local(2013, 12, 25, 23, 59)
+      delocalized_params[:parent][:child][:child_number].must_equal '1299.99'
+    end
+
+    it "delocalizes deeply nested params for one-to-one on the key itself based on the given  options" do
+      params = parameters_class.new(:parent => { :child => { :child_date => '21. Mai 1986', :child_time => '25. Dezember 2013, 23:59 Uhr', :child_number => '1.299,99' } })
+
+      parent_params = params[:parent].delocalize(:child => { :child_date => :date, :child_time => :time, :child_number => :number })
+
+      parent_params[:child][:child_date].must_equal Date.civil(1986, 5, 21)
+      parent_params[:child][:child_time].must_equal Time.zone.local(2013, 12, 25, 23, 59)
+      parent_params[:child][:child_number].must_equal '1299.99'
+    end
+
+    it "delocalizes all the things at all the levels of all the types" do
+      delocalize_options = {
+        :top_level_date => :date,
+        :top_level_time => :time,
+        :top_level_number => :number,
+        :parent => {
+          :parent_date => :date,
+          :parent_time => :time,
+          :parent_number => :number,
+          :child => {
+            :child_date => :date,
+            :child_time => :time,
+            :child_number => :number
+          }
+        }
+      }
+
+      params = parameters_class.new(
+        :top_level_date => '21. Mai 1986',
+        :top_level_time => '25. Dezember 2013, 23:59 Uhr',
+        :top_level_number => '1.299,99',
+        :parent => {
+          :parent_date => '21. Mai 2004',
+          :parent_time => '24. Dezember 2013, 23:59 Uhr',
+          :parent_number => '999,99',
+          :child => {
+            :child_date => '21. Mai 2011',
+            :child_time => '31. Dezember 2013, 23:59 Uhr',
+            :child_number => '9.999'
+          }
+        }
+      )
+
+      delocalized_params = params.delocalize(delocalize_options)
+
+      delocalized_params[:top_level_date].must_equal Date.civil(1986, 5, 21)
+      delocalized_params[:top_level_time].must_equal Time.zone.local(2013, 12, 25, 23, 59)
+      delocalized_params[:top_level_number].must_equal '1299.99'
+
+      delocalized_params[:parent][:parent_date].must_equal Date.civil(2004, 5, 21)
+      delocalized_params[:parent][:parent_time].must_equal Time.zone.local(2013, 12, 24, 23, 59)
+      delocalized_params[:parent][:parent_number].must_equal '999.99'
+
+      delocalized_params[:parent][:child][:child_date].must_equal Date.civil(2011, 5, 21)
+      delocalized_params[:parent][:child][:child_time].must_equal Time.zone.local(2013, 12, 31, 23, 59)
+      delocalized_params[:parent][:child][:child_number].must_equal '9999'
+    end
+
+    # TODO Figure out deeply nested params for one-to-many relations.
+    # The problem is that one-to-many relations may be given as a hash or an array. Delocalize should
+    # be able both cases just fine.
+
+    it "fails for a non-existent type" do
+      params = parameters_class.new(:available_until => '25. Dezember 2013, 23:59 Uhr')
+
+      ->{ params.delocalize(:available_until => :datetime) }.must_raise(Delocalize::ParserNotFound)
+    end
+
+    it "keeps unconfigured parameters as they are while still delocalizing others" do
+      params = parameters_class.new(:released_on => '1986-05-21', :price => '1.299,99')
+
+      delocalized_params = params.delocalize(:price => :number)
+
+      delocalized_params[:released_on].must_equal '1986-05-21'
+      delocalized_params[:price].must_equal '1299.99'
+    end
+    
+    it "doesn't raise when nested params given and which aren't defined in options" do
+      params = parameters_class.new(:parent => { :parent_date => '21. Mai 2004' })
+
+      ## Should not throw an error:
+      delocalized_params = params.delocalize({})
+    end
+
+    it "delocalizes arrays" do
+      params = parameters_class.new(:location => ['13,456', '51,234'], :interval => ['25. Dezember 2013', '31. Januar 2014'])
+
+      delocalized_params = params.delocalize(:location => [:number], interval: [:date])
+
+      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
+  end
+end

data/test/test_helper.rb

@@ -5,21 +5,21 @@ require 'bundler'
 
 Bundler.require(:default, :development)
 
-require 'rails/all'
-require 'rails/test_help'
+require 'minitest/autorun'
+require 'minitest/spec'
+require 'mocha/setup'
 
-require 'delocalize/rails_ext/action_view'
-require 'delocalize/rails_ext/active_record'
-require 'delocalize/rails_ext/time_zone'
+require 'rails'
 
 de = {
   :date => {
     :input => {
-      :formats => [:long, :short, :default]
+      :formats => [:long, :short, :short_with_name, :default]
     },
     :formats => {
       :default => "%d.%m.%Y",
-      :short => "%e. %b",
+      :short => "%e.%m.",
+      :short_with_name => "%e. %b.",
       :long => "%e. %B %Y",
       :only_day => "%e"
     },
@@ -65,38 +65,4 @@ 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
-  attr_accessor :name, :price, :times_sold,
-    :cant_think_of_a_sensible_time_field,
-    :released_on, :published_at
-end
-
-class Product < ActiveRecord::Base
-end
-
-class ProductWithValidation < Product
-  validates_numericality_of :price
-  validates_presence_of :price
-end
-
-class ProductWithBusinessValidation < Product
-  validates_numericality_of :price, :less_than => 10
-end
-
-config = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
-ActiveRecord::Base.establish_connection(config['test'])
-
-ActiveRecord::Base.connection.create_table :products do |t|
-  t.string :name
-  t.date :released_on
-  t.datetime :published_at
-  t.time :cant_think_of_a_sensible_time_field
-  t.decimal :price
-  t.float :weight
-  t.integer :times_sold
-  t.decimal :some_value_with_default, :default => 0, :precision => 20, :scale => 2
-end
-

metadata

@@ -1,48 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: delocalize
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Clemens Kofler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        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
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: '0'
 description: Delocalize is a tool for parsing localized dates/times and numbers.
 email: clemens@railway.at
 executables: []
@@ -50,55 +59,54 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- lib/delocalize/i18n_ext.rb
-- lib/delocalize/localized_date_time_parser.rb
-- lib/delocalize/localized_numeric_parser.rb
-- lib/delocalize/rails_ext/action_view.rb
+- MIT-LICENSE
+- README.markdown
+- lib/delocalize.rb
+- lib/delocalize/delocalizable_parameters.rb
+- lib/delocalize/parameter_delocalizing.rb
+- lib/delocalize/parameters.rb
+- 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.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
-- 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
+- lib/delocalize/version.rb
 - test/database.yml
-- test/delocalize_test.rb
+- test/date_time_parser_test.rb
+- test/number_parser_test.rb
+- test/parameters_test.rb
 - test/test_helper.rb
 homepage: http://github.com/clemens/delocalize
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Localized date/time and number parsing
 test_files:
 - test/database.yml
-- test/delocalize_test.rb
+- test/date_time_parser_test.rb
+- test/number_parser_test.rb
+- test/parameters_test.rb
 - test/test_helper.rb