delocalize 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/delocalize/localized_numeric_parser.rb

@@ -0,0 +1,17 @@
+# TODO:
+#   * proper documentation (comments)
+module Delocalize
+  class LocalizedNumericParser
+    class << self
+      # Parse numbers removing unneeded characters and replacing decimal separator
+      # through I18n. This will return a valid Ruby Numeric value (as String).
+      def parse(value)
+        if value.is_a?(String)
+          separator = I18n.t(:'number.format.separator')
+          value = value.gsub(/[^0-9\-#{separator}]/, '').gsub(separator, '.')
+        end
+        value
+      end
+    end
+  end
+end

data/lib/delocalize/rails_ext/active_record.rb

@@ -7,10 +7,6 @@ ActiveRecord::ConnectionAdapters::Column.class_eval do
   def time?
     klass == Time
   end
-
-  def decimal?
-    klass == BigDecimal
-  end
 end
 
 ActiveRecord::Base.class_eval do
@@ -20,9 +16,8 @@ ActiveRecord::Base.class_eval do
         value = Date.parse_localized(value)
       elsif column.time?
         value = Time.parse_localized(value)
-      elsif column.decimal?
-        value = convert_number_column_value_with_localization(value)
-        value = BigDecimal(value) if value.is_a?(String)
+      elsif column.number?
+        value = column.type_cast(convert_number_column_value_with_localization(value))
       end
     end
     write_attribute_without_localization(attr_name, value)
@@ -45,9 +40,7 @@ ActiveRecord::Base.class_eval do
 
   def convert_number_column_value_with_localization(value)
     value = convert_number_column_value_without_localization(value)
-    if I18n.delocalization_enabled? && value.is_a?(String)
-      value = value.gsub(/[^0-9\-#{I18n.t(:'number.format.separator')}]/, '').gsub(I18n.t(:'number.format.separator'), '.')
-    end
+    value = Numeric.parse_localized(value) if I18n.delocalization_enabled?
     value
   end
   alias_method_chain :convert_number_column_value, :localization

data/lib/delocalize/ruby_ext.rb

@@ -1,3 +1,4 @@
 require 'delocalize/ruby_ext/date'
 require 'delocalize/ruby_ext/datetime'
-require 'delocalize/ruby_ext/time'
+require 'delocalize/ruby_ext/time'
+require 'delocalize/ruby_ext/numeric'

data/lib/delocalize/ruby_ext/numeric.rb

@@ -0,0 +1,9 @@
+require 'delocalize/localized_numeric_parser'
+
+Numeric.class_eval do
+  class << self
+    def parse_localized(value)
+      Delocalize::LocalizedNumericParser.parse(value)
+    end
+  end
+end

data/test/delocalize_test.rb

@@ -14,20 +14,24 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     assert_equal -1299.99, @product.price
   end
 
-  test "delocalizes localized date" do
+  test "delocalizes localized date with year" do
     date = Date.civil(2009, 10, 19)
 
     @product.released_on = '19. Oktober 2009'
     assert_equal date, @product.released_on
 
-    @product.released_on = '19. Okt'
+    @product.released_on = '19.10.2009'
     assert_equal date, @product.released_on
+  end
 
-    @product.released_on = '19.10.2009'
+  test "delocalizes localized date without year" do
+    date = Date.civil(Date.today.year, 10, 19)
+
+    @product.released_on = '19. Okt'
     assert_equal date, @product.released_on
   end
 
-  test "delocalizes localized datetime" do
+  test "delocalizes localized datetime with year" do
     time = Time.local(2009, 3, 1, 12, 0, 0)
 
     @product.published_at = 'Sonntag, 1. März 2009, 12:00 Uhr'
@@ -35,6 +39,10 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
 
     @product.published_at = '1. März 2009, 12:00 Uhr'
     assert_equal time, @product.published_at
+  end
+
+  test "delocalizes localized datetime without year" do
+    time = Time.local(Date.today.year, 3, 1, 12, 0, 0)
 
     @product.published_at = '1. März, 12:00 Uhr'
     assert_equal time, @product.published_at
@@ -116,6 +124,13 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     @product.price = "10,34"
     assert @product.price_changed?
   end
+
+  test "dirty attributes must detect changes in float columns" do
+    @product.weight = 10
+    @product.save
+    @product.weight = "10,34"
+    assert @product.weight_changed?
+  end
 end
 
 class DelocalizeActionViewTest < ActionView::TestCase

data/test/rails_app/app/controllers/application_controller.rb

@@ -0,0 +1,10 @@
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  helper :all # include all helpers, all the time
+  protect_from_forgery # See ActionController::RequestForgeryProtection for details
+
+  # Scrub sensitive parameters from your log
+  filter_parameter_logging :password
+end

data/test/rails_app/config/boot.rb

@@ -0,0 +1,110 @@
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
+
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+
+module Rails
+  class << self
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
+
+    def booted?
+      defined? Rails::Initializer
+    end
+
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
+
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
+
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
+
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
+
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
+    end
+  end
+
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
+      else
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
+    end
+
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion rescue nil
+      end
+
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+
+      def load_rubygems
+        min_version = '1.3.2'
+        require 'rubygems'
+        unless rubygems_version >= min_version
+          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+
+      rescue LoadError
+        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        exit 1
+      end
+
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
+    end
+  end
+end
+
+# All that for this:
+Rails.boot!

data/test/rails_app/config/environment.rb

@@ -0,0 +1,17 @@
+# Be sure to restart your server when you modify this file
+
+# Specifies gem version of Rails to use when vendor/rails is not present
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+
+# Bootstrap the Rails environment, frameworks, and default configuration
+require File.join(File.dirname(__FILE__), 'boot')
+
+Rails::Initializer.run do |config|
+  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+  # Run "rake -D time" for a list of tasks for finding time zone names.
+  # config.time_zone = 'UTC'
+
+  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
+  # config.i18n.default_locale = :en
+end

data/test/rails_app/config/environments/test.rb

@@ -0,0 +1,28 @@
+# Settings specified here will take precedence over those in config/environment.rb
+
+# The test environment is used exclusively to run your application's
+# test suite.  You never need to work with it otherwise.  Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs.  Don't rely on the data there!
+config.cache_classes = true
+
+# Log error messages when you accidentally call methods on nil.
+config.whiny_nils = true
+
+# Show full error reports and disable caching
+config.action_controller.consider_all_requests_local = true
+config.action_controller.perform_caching             = false
+config.action_view.cache_template_loading            = true
+
+# Disable request forgery protection in test environment
+config.action_controller.allow_forgery_protection    = false
+
+# Tell Action Mailer not to deliver emails to the real world.
+# The :test delivery method accumulates sent emails in the
+# ActionMailer::Base.deliveries array.
+config.action_mailer.delivery_method = :test
+
+# Use SQL instead of Active Record's schema dumper when creating the test database.
+# This is necessary if your schema can't be completely dumped by the schema dumper,
+# like if you have constraints or database-specific column types
+# config.active_record.schema_format = :sql

data/test/rails_app/config/initializers/new_rails_defaults.rb

@@ -0,0 +1,21 @@
+# Be sure to restart your server when you modify this file.
+
+# These settings change the behavior of Rails 2 apps and will be defaults
+# for Rails 3. You can remove this initializer when Rails 3 is released.
+
+if defined?(ActiveRecord)
+  # Include Active Record class name as root for JSON serialized output.
+  ActiveRecord::Base.include_root_in_json = true
+
+  # Store the full class name (including module namespace) in STI type column.
+  ActiveRecord::Base.store_full_sti_class = true
+end
+
+ActionController::Routing.generate_best_match = false
+
+# Use ISO 8601 format for JSON serialized times and dates.
+ActiveSupport.use_standard_json_time_format = true
+
+# Don't escape HTML entities in JSON, leave that for the #json_escape helper.
+# if you're including raw json in an HTML page.
+ActiveSupport.escape_html_entities_in_json = false

data/test/rails_app/config/initializers/session_store.rb

@@ -0,0 +1,15 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying cookie session data integrity.
+# If you change this key, all old sessions will become invalid!
+# Make sure the secret is at least 30 characters and all random, 
+# no regular words or you'll be exposed to dictionary attacks.
+ActionController::Base.session = {
+  :key         => '_rails_app_session',
+  :secret      => '89e8147901a0d7c221ac130e0ded3eeab6dab4a97127255909f08fedaae371918b41dec9d4d75c5b27a55c3772d43c2b6a3cbac232c5cc2ce4b8ec22242f5e60'
+}
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rake db:sessions:create")
+# ActionController::Base.session_store = :active_record_store

data/test/rails_app/config/routes.rb

@@ -0,0 +1,4 @@
+ActionController::Routing::Routes.draw do |map|
+  map.connect ':controller/:action/:id'
+  map.connect ':controller/:action/:id.:format'
+end

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
+#require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
+require File.expand_path(File.dirname(__FILE__) + "/rails_app/config/environment")
 require 'test_help'
 
 require 'rubygems'
@@ -58,7 +59,7 @@ end
 class Product < ActiveRecord::Base
 end
 
-config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+config = YAML.load_file(File.dirname(__FILE__) + '/database.yml')
 ActiveRecord::Base.establish_connection(config['test'])
 
 ActiveRecord::Base.connection.create_table :products do |t|
@@ -67,5 +68,6 @@ ActiveRecord::Base.connection.create_table :products do |t|
   t.datetime :published_at
   t.time :cant_think_of_a_sensible_time_field
   t.decimal :price
+  t.float :weight
   t.integer :times_sold
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: delocalize
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Clemens Kofler
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-25 00:00:00 +01:00
+date: 2010-01-17 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - lib/delocalize.rb
 - lib/delocalize/i18n_ext.rb
 - lib/delocalize/localized_date_time_parser.rb
+- lib/delocalize/localized_numeric_parser.rb
 - lib/delocalize/rails_ext.rb
 - lib/delocalize/rails_ext/action_view.rb
 - lib/delocalize/rails_ext/active_record.rb
@@ -37,6 +38,7 @@ files:
 - 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
 - tasks/distribution.rb
 - tasks/documentation.rb
@@ -71,4 +73,11 @@ specification_version: 3
 summary: Localized date/time and number parsing
 test_files: 
 - test/delocalize_test.rb
+- test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/config/boot.rb
+- test/rails_app/config/environment.rb
+- test/rails_app/config/environments/test.rb
+- test/rails_app/config/initializers/new_rails_defaults.rb
+- test/rails_app/config/initializers/session_store.rb
+- test/rails_app/config/routes.rb
 - test/test_helper.rb