delocalize 0.2.2 → 0.2.3

data/Rakefile

@@ -8,3 +8,11 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'tasks/testing'))
 
 desc 'Default: run unit tests.'
 task :default => :test
+
+desc 'Run unit tests against Rails 2 and 3.'
+task :test_all do
+  puts "\n * Running tests against Rails 2...\n\n"
+  sh "rake test"
+  puts "\n * Running tests against Rails 3...\n\n"
+  sh "rake test RAILS_VERSION=3"
+end

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/delocalize/localized_date_time_parser.rb

@@ -57,7 +57,7 @@ module Delocalize
           gsub('%a', "(#{Date::ABBR_DAYNAMES.join('|')})").           # short day name
           gsub('%Y', "(\\d{4})").                                     # long year
           gsub('%y', "(\\d{2})").                                     # short year
-          gsub('%e', "(\\w?\\d{1,2})").                               # short day
+          gsub('%e', "(\\s?\\d{1,2})").                               # short day
           gsub('%d', "(\\d{2})").                                     # full day
           gsub('%H', "(\\d{2})").                                     # hour (24)
           gsub('%M', "(\\d{2})").                                     # minute

data/lib/delocalize/rails_ext/action_view.rb

@@ -25,7 +25,7 @@ ActionView::Helpers::InstanceTag.class_eval do
           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) && !object.errors.invalid?(method_name)
+          if object.respond_to?(:errors) && !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

data/lib/delocalize/rails_ext/active_record.rb

@@ -45,12 +45,7 @@ ActiveRecord::Base.class_eval do
     value
   end
   alias_method_chain :convert_number_column_value, :localization
-end
-
-# The dirty module has been moved to ActiveModel in Rails 3
-dirty_module = defined?(ActiveRecord::Dirty) ? ActiveRecord::Dirty : ActiveModel::Dirty
 
-dirty_module.module_eval do
   def field_changed?(attr, old, value)
     if column = column_for_attribute(attr)
       if column.number? && column.null && (old.nil? || old == 0) && value.blank?

data/test/delocalize_test.rb

@@ -238,9 +238,11 @@ class DelocalizeActionViewTest < ActionView::TestCase
   end
 
   test "doesn't convert the value if field has errors" do
+    error_class = Rails.version =~ /^3/ ? 'field_with_errors' : 'fieldWithErrors'
+
     @product = ProductWithValidation.new(:price => 'this is not a number')
     @product.valid?
-    assert_dom_equal '<div class="fieldWithErrors"><input id="product_price" name="product[price]" size="30" type="text" value="this is not a number" /></div>',
+    assert_dom_equal %(<div class="#{error_class}"><input id="product_price" name="product[price]" size="30" type="text" value="this is not a number" /></div>),
       text_field(:product, :price)
   end
 

data/test/{rails_app → rails2_app}/config/environment.rb

@@ -1,7 +1,7 @@
 # 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
+RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

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

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/test/rails3_app/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/test/rails3_app/config/application.rb

@@ -0,0 +1,44 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module Rails3App
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # 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. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # 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}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    config.paths.config.database = File.expand_path(File.dirname(__FILE__) + '../../../database.yml')
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/test/rails3_app/config/boot.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path('../../Gemfile', __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)

data/test/rails3_app/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+Rails3App::Application.initialize!

data/test/rails3_app/config/environments/test.rb

@@ -0,0 +1,35 @@
+Rails3App::Application.configure do
+  # 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.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # 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
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/test/test_helper.rb

@@ -1,14 +1,15 @@
 # encoding: utf-8
 
 ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.join(File.dirname(__FILE__), 'rails_app/config/environment'))
-require 'test_help'
+rails_version = ENV["RAILS_VERSION"] || 2
 
-require 'rubygems'
-require 'active_record'
-require 'active_record/test_case'
-require 'action_view'
-require 'action_view/test_case'
+if rails_version.to_i == 2
+  require File.expand_path(File.join(File.dirname(__FILE__), "rails2_app/config/environment"))
+  require 'test_help'
+else
+  require File.expand_path(File.join(File.dirname(__FILE__), "rails3_app/config/environment"))
+  require 'rails/test_help'
+end
 
 I18n.backend.store_translations :de, {
   :date => {

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Clemens Kofler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-26 00:00:00 +02:00
+date: 2010-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -80,11 +80,17 @@ 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/rails2_app/app/controllers/application_controller.rb
+- test/rails2_app/config/boot.rb
+- test/rails2_app/config/environment.rb
+- test/rails2_app/config/environments/test.rb
+- test/rails2_app/config/initializers/new_rails_defaults.rb
+- test/rails2_app/config/initializers/session_store.rb
+- test/rails2_app/config/routes.rb
+- test/rails3_app/app/controllers/application_controller.rb
+- test/rails3_app/app/helpers/application_helper.rb
+- test/rails3_app/config/application.rb
+- test/rails3_app/config/boot.rb
+- test/rails3_app/config/environment.rb
+- test/rails3_app/config/environments/test.rb
 - test/test_helper.rb