american_date 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d6fc099c8faff7f7a245c01f54bcc32c4770fa8d
+  data.tar.gz: 0b072c3a750fc6fb6ac0bc81c730ff1fae5e6889
+SHA512:
+  metadata.gz: deff8c7fd14b1b48d4e88fd6f3257931623206746cdd2f8947f329ec441edf136fe94b3fce081cecfb4e2601563669b0bdc5ed33288a06e690ce14fefa8e4803
+  data.tar.gz: 1a9b4920b7396ba32f4589168943fa1870d256e3ef6fa5c7ed529fc396fc9d05d32f53513b8cff6a4b61f893c2ddd7292276a7b2a90058dbcf95a4f869b29377

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== HEAD
+
+* Don't freeze the regular expression used, to allow easier overrides (jeremyevans)
+
+* Raise TypeError if passed object not implicitly convertible to String (jeremyevans) (#6)
+
 === 1.0.0 (2011-12-12)
 
 * Initial public release

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Jeremy Evans
+Copyright (c) 2011,2013 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/README.rdoc

@@ -28,7 +28,7 @@ That may change in the future if it is determined to be safe.
 
 == Tested ruby versions
 
-* ruby 1.8.6, 1.8.7, 1.9.2, 1.9.3
+* ruby 1.8.6, 1.8.7, 1.9.2, 1.9.3, 2.0.0
 * rubinius 1.2.4
 * jruby 1.6.5 (both --1.8 and --1.9 modes)
 

data/lib/american_date.rb

@@ -4,7 +4,7 @@ if RUBY_VERSION >= '1.9'
   # Modify parsing methods to handle american date format correctly.
   class << Date
     # American date format detected by the library.
-    AMERICAN_DATE_RE = %r_\A\s*(\d{1,2})/(\d{1,2})/(\d{4}|\d{2})_.freeze
+    AMERICAN_DATE_RE = %r_\A\s*(\d{1,2})/(\d{1,2})/(\d{4}|\d{2})_
 
     # Alias for stdlib Date._parse
     alias _parse_without_american_date _parse
@@ -28,6 +28,17 @@ if RUBY_VERSION >= '1.9'
 
     # Transform american date fromat into ISO format.
     def convert_american_to_iso(string)
+      unless string.is_a?(String)
+        if string.respond_to?(:to_str)
+          str = string.to_str
+          unless str.is_a?(String)
+            raise TypeError, "no implicit conversion of #{string.inspect} into String"
+          end
+          string = str
+        else
+          raise TypeError, "no implicit conversion of #{string.inspect} into String"
+        end
+      end
       string.sub(AMERICAN_DATE_RE){|m| "#$3-#$1-#$2"}
     end
   end

data/spec/american_date_spec.rb

@@ -26,6 +26,26 @@ describe "Date.parse" do
   specify "should ignore preceding whitespace" do
     Date.parse('  01/02/2003').should == Date.new(2003, 1, 2)
   end
+
+  if RUBY_VERSION > '1.9'
+    specify "should raise TypeError for invalid values" do
+      [nil, 1, 1.0, [], {}].each do |x|
+        proc{Date.parse(x)}.should raise_error(TypeError)
+      end
+    end
+
+    specify "should handle values implicitly convertible to String" do
+      o = Object.new
+      def o.to_str() '01/02/2003' end
+      Date.parse(o).should == Date.new(2003, 1, 2)
+    end
+
+    specify "should handle values implicitly convertible to String" do
+      o = Object.new
+      def o.to_str() 1 end
+      proc{Date.parse(o)}.should raise_error(TypeError)
+    end
+  end
 end
 
 describe "DateTime.parse" do
@@ -57,6 +77,26 @@ describe "DateTime.parse" do
   specify "should work with times" do
     DateTime.parse('01/02/2003 10:20:30').should == DateTime.new(2003, 1, 2, 10, 20, 30)
   end
+
+  if RUBY_VERSION > '1.9'
+    specify "should raise TypeError for invalid values" do
+      [nil, 1, 1.0, [], {}].each do |x|
+        proc{DateTime.parse(x)}.should raise_error(TypeError)
+      end
+    end
+
+    specify "should handle values implicitly convertible to String" do
+      o = Object.new
+      def o.to_str() '01/02/2003' end
+      DateTime.parse(o).should == DateTime.new(2003, 1, 2)
+    end
+
+    specify "should handle values implicitly convertible to String" do
+      o = Object.new
+      def o.to_str() 1 end
+      proc{DateTime.parse(o)}.should raise_error(TypeError)
+    end
+  end
 end
 
 describe "Time.parse" do
@@ -87,6 +127,26 @@ describe "Time.parse" do
   specify "should work with times" do
     Time.parse('01/02/2003 10:20:30').should == Time.local(2003, 1, 2, 10, 20, 30)
   end
+
+  if RUBY_VERSION > '1.9'
+    specify "should raise TypeError for invalid values" do
+      [nil, 1, 1.0, [], {}].each do |x|
+        proc{Time.parse(x)}.should raise_error(TypeError)
+      end
+    end
+
+    specify "should handle values implicitly convertible to String" do
+      o = Object.new
+      def o.to_str() '01/02/2003' end
+      Time.parse(o).should == Time.local(2003, 1, 2)
+    end
+
+    specify "should handle values implicitly convertible to String" do
+      o = Object.new
+      def o.to_str() 1 end
+      proc{Time.parse(o)}.should raise_error(TypeError)
+    end
+  end
 end
 
 describe "Date._parse" do
@@ -118,4 +178,24 @@ describe "Date._parse" do
   specify "should work with times" do
     DateTime._parse('01/02/2003 10:20:30').should == {:year=>2003, :mon=>1, :mday=>2, :hour=>10, :min=>20, :sec=>30}
   end
+
+  if RUBY_VERSION > '1.9'
+    specify "should raise TypeError for invalid values" do
+      [nil, 1, 1.0, [], {}].each do |x|
+        proc{DateTime._parse(x)}.should raise_error(TypeError)
+      end
+    end
+
+    specify "should handle values implicitly convertible to String" do
+      o = Object.new
+      def o.to_str() '01/02/2003' end
+      DateTime._parse(o).should == {:year=>2003, :mon=>1, :mday=>2}
+    end
+
+    specify "should handle values implicitly convertible to String" do
+      o = Object.new
+      def o.to_str() 1 end
+      proc{DateTime._parse(o)}.should raise_error(TypeError)
+    end
+  end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: american_date
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies: []
 description: American style month/day/year date parsing for ruby 1.9
 email: code@jeremyevans.net
@@ -28,33 +27,32 @@ files:
 - lib/american_date.rb
 homepage: https://github.com/jeremyevans/ruby-american_date
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --quiet
 - --inline-source
 - --line-numbers
 - --title
-- ! 'american_date: American style month/day/year date parsing for ruby 1.9'
+- 'american_date: American style month/day/year date parsing for ruby 1.9'
 - --main
 - README.rdoc
 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.11
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: American style month/day/year date parsing for ruby 1.9
 test_files: []