delocalize 0.2.3 → 0.2.5

data/README.markdown

@@ -12,7 +12,7 @@ You can use delocalize either as a gem (preferred) or as a Rails plugin.
 
 To use the gem version, put the following gem requirement in your `Gemfile`:
 
-    gem "delocalize", :source => 'http://gemcutter.org'
+    gem "delocalize"
 
 To install it as a plugin, fire up your terminal, go to your Rails app and type:
 
@@ -131,6 +131,6 @@ People who have contributed to delocalize (in no particular order):
 * Implement AM/PM support
 * Cleanup, cleanup, cleanup ...
 
-Copyright (c) 2009-2010 Clemens Kofler <clemens@railway.at>
+Copyright (c) 2009-2011 Clemens Kofler <clemens@railway.at>
 <http://www.railway.at/>
 Released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.5

data/lib/delocalize/localized_date_time_parser.rb

@@ -3,6 +3,22 @@
 #   * proper documentation (comments)
 module Delocalize
   class LocalizedDateTimeParser
+    # extend/change this according to your needs by merging your custom regexps
+    REGEXPS = {
+      '%B' => "(#{Date::MONTHNAMES.compact.join('|')})",      # long month name
+      '%b' => "(#{Date::ABBR_MONTHNAMES.compact.join('|')})", # short month name
+      '%m' => "(\\d{2})",                                     # numeric month
+      '%A' => "(#{Date::DAYNAMES.join('|')})",                # full day name
+      '%a' => "(#{Date::ABBR_DAYNAMES.join('|')})",           # short day name
+      '%Y' => "(\\d{4})",                                     # long year
+      '%y' => "(\\d{2})",                                     # short year
+      '%e' => "(\\s\\d|\\d{2})",                              # short day
+      '%d' => "(\\d{2})",                                     # full day
+      '%H' => "(\\d{2})",                                     # hour (24)
+      '%M' => "(\\d{2})",                                     # minute
+      '%S' => "(\\d{2})"                                      # second
+    }
+
     class << self
       def parse(datetime, type)
         return unless datetime
@@ -49,19 +65,7 @@ module Delocalize
       end
 
       def apply_regex(format)
-        # maybe add other options as well
-        format.gsub('%B', "(#{Date::MONTHNAMES.compact.join('|')})"). # long month name
-          gsub('%b', "(#{Date::ABBR_MONTHNAMES.compact.join('|')})"). # short month name
-          gsub('%m', "(\\d{2})").                                     # numeric month
-          gsub('%A', "(#{Date::DAYNAMES.join('|')})").                # full day name
-          gsub('%a', "(#{Date::ABBR_DAYNAMES.join('|')})").           # short day name
-          gsub('%Y', "(\\d{4})").                                     # long year
-          gsub('%y', "(\\d{2})").                                     # short year
-          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
-          gsub('%S', "(\\d{2})")                                      # second
+        format.gsub(/(#{REGEXPS.keys.join('|')})/) { |s| REGEXPS[$1] }
       end
     end
   end

data/lib/delocalize/rails_ext/active_record.rb

@@ -54,8 +54,10 @@ ActiveRecord::Base.class_eval do
         # 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
-      else
+      elsif column.number?
         value = column.type_cast(convert_number_column_value_with_localization(value))
+      else
+        value = column.type_cast(value)
       end
     end
 

data/test/delocalize_test.rb

@@ -50,11 +50,21 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     assert_equal time, @product.published_at
   end
 
-  test "delocalizes localized time" do
-    now = Time.current
-    time = Time.gm(now.year, now.month, now.day, 7, 0, 0).in_time_zone
-    @product.cant_think_of_a_sensible_time_field = '09:00 Uhr'
-    assert_equal time, @product.cant_think_of_a_sensible_time_field
+  # 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 = Time.current
+      time = Time.gm(now.year, now.month, now.day, 7, 0, 0).in_time_zone
+      @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 = Time.current
+      time = Time.gm(now.year, now.month, now.day, 7, 0, 0).in_time_zone
+      @product.cant_think_of_a_sensible_time_field = '08:00 Uhr'
+      assert_equal time, @product.cant_think_of_a_sensible_time_field
+    end
   end
 
   test "invalid dates should be delocalized to nil" do
@@ -64,20 +74,39 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     assert_equal date, @product.released_on_before_type_cast
   end
 
-  test "uses default parse if format isn't found" do
-    date = Date.civil(2009, 10, 19)
+  # TODO can I somehow do this smarter? or should I use another zone w/o DST?
+  if Time.current.dst?
+    test "uses default parse if format isn't found (DST)" do
+      date = Date.civil(2009, 10, 19)
 
-    @product.released_on = '2009/10/19'
-    assert_equal date, @product.released_on
+      @product.released_on = '2009/10/19'
+      assert_equal date, @product.released_on
 
-    time = Time.gm(2009, 3, 1, 11, 0, 0).in_time_zone
-    @product.published_at = '2009/03/01 12:00'
-    assert_equal time, @product.published_at
+      time = Time.gm(2009, 3, 1, 11, 0, 0).in_time_zone
+      @product.published_at = '2009/03/01 12:00'
+      assert_equal time, @product.published_at
+
+      now = Time.current
+      time = Time.gm(now.year, now.month, now.day, 7, 0, 0).in_time_zone
+      @product.cant_think_of_a_sensible_time_field = '09:00'
+      assert_equal time, @product.cant_think_of_a_sensible_time_field
+    end
+  else
+    test "uses default parse if format isn't found (non-DST)" do
+      date = Date.civil(2009, 10, 19)
+
+      @product.released_on = '2009/10/19'
+      assert_equal date, @product.released_on
 
-    now = Time.current
-    time = Time.gm(now.year, now.month, now.day, 7, 0, 0).in_time_zone
-    @product.cant_think_of_a_sensible_time_field = '09:00'
-    assert_equal time, @product.cant_think_of_a_sensible_time_field
+      time = Time.gm(2009, 3, 1, 11, 0, 0).in_time_zone
+      @product.published_at = '2009/03/01 12:00'
+      assert_equal time, @product.published_at
+
+      now = Time.current
+      time = Time.gm(now.year, now.month, now.day, 7, 0, 0).in_time_zone
+      @product.cant_think_of_a_sensible_time_field = '08:00'
+      assert_equal time, @product.cant_think_of_a_sensible_time_field
+    end
   end
 
   test "should return nil if the input is empty or invalid" do
@@ -141,6 +170,13 @@ class DelocalizeActiveRecordTest < ActiveRecord::TestCase
     assert @product.weight_changed?
   end
 
+  test "attributes that didn't change shouldn't be marked dirty" do
+    @product.name = "Good cookies, Really good"
+    @product.save
+    @product.name = "Good cookies, Really good"
+    assert !@product.name_changed?
+  end
+
   test "should remember the value before type cast" do
     @product.price = "asd"
     assert_equal @product.price, 0

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: delocalize
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Clemens Kofler
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +02:00
+date: 2011-03-22 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -48,33 +49,52 @@ files:
 - tasks/documentation.rb
 - tasks/testing.rb
 - README.markdown
+- test/delocalize_test.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
 has_rdoc: true
 homepage: http://github.com/clemens/delocalize
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Localized date/time and number parsing