tod 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 859e21d92e38e6ed8e88f2ccde4ba7b65ece6386
-  data.tar.gz: 7e329ea20c81ffb0cd5018d4cd008f4e257a9cfc
+  metadata.gz: cb8660843c84b0445056017a9e55c4e24a26759d
+  data.tar.gz: af34e5365fdcc5fed74129ffcf1c46dd5476414a
 SHA512:
-  metadata.gz: f7cff04a19eaca1af690f985541192e0070e6a5e0a11b25a5ed03ac10f149180f3e3df9ff19bdb55a58fe9f39878c2fb987313f42b202a8ec73f323306167240
-  data.tar.gz: 60a3e8f699de9196d90c1d99027b8cd9e6f6c3c4b6d4f3259455439ddaa15b0d9203ea8af53c91bbe4a6a6d238e3d71af1757e7d765a3e6790af470ea8501a48
+  metadata.gz: 091d891b412086559a229fa04407f200315b01fc39f0a79c7305a0847b865f8d4e20252d53fe77bd0f1290d1b0cceea31f90d681f00a1bb8a39c2f2bd3942ea8
+  data.tar.gz: f29c38d109354008fad673e1ad7c3afcb78510992c70f96b4bfe8aab512a3b132e8d6a6674e185aa8aed4ae46dec39ae44cfb840169d82459543a3b38ed8de1c

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 rvm:
+  - 2.2.0
+  - 2.1.5
   - 2.0.0
   - 1.9.3
 gemfile:
-  - gemfiles/3.0.gemfile
-  - gemfiles/3.1.gemfile
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile

data/CHANGELOG.md

@@ -0,0 +1,37 @@
+# 1.5.0 (January 15, 2015)
+
+* Fix: return nil unless other is comparable (Peter Yates)
+* Parse "noon" as "12pm" and "midnight" as "12am" (Michael Righi)
+
+# 1.4.0 (April 3, 2014)
+
+* Add try_parse (Stuart Olivera)
+* Add parse? (Stuart Olivera)
+
+# 1.3.0 (December 9, 2013)
+
+* Add Shift class (Pablo Russo)
+
+# 1.2.2 (November 16, 2013)
+
+* Fix dumping nil or empty string to PostgreSQL time column (Maik Arnold)
+
+# 1.2.1 (September 30, 2013)
+
+* Added DateTime#to_time_of_day (Jonathan Pares)
+
+# 1.2.0 (July 16, 2013)
+
+* Added ActiveRecord TimeOfDay serialization to time column (Maxim-Filimonov)
+
+# 1.1.1 (April 12, 2013)
+
+* Added to_i and from_i as aliases of second_of_day and from_second_of_day (Johnny Shields)
+
+# 1.1.0 (February 13, 2013)
+
+* Added Rails time zone support
+
+# 1.0.0 (December 29, 2010)
+
+* Initial Release

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tod (1.3.0)
+    tod (1.4.0)
 
 GEM
   remote: https://rubygems.org/

data/README.markdown

@@ -44,6 +44,8 @@ are all optional.
     TimeOfDay.parse "3:25:58"                      # => 03:25:58
     TimeOfDay.parse "515p"                         # => 17:15:00
     TimeOfDay.parse "151253"                       # => 15:12:53
+    TimeOfDay.parse "noon"                         # => 12:00:00
+    TimeOfDay.parse "midnight"                     # => 00:00:00
 
 TimeOfDay.parse raises an ArgumentError is the argument to parse is not
 parsable. TimeOfDay.try_parse will instead return nil if the argument is not
@@ -158,47 +160,11 @@ order.time                                      # => 09:30:00
 Compatibility
 =============
 
-[![Build Status](https://travis-ci.org/JackC/tod.png)](https://travis-ci.org/JackC/tod)
+[![Build Status](https://travis-ci.org/jackc/tod.png)](https://travis-ci.org/jackc/tod)
 
-Tod is compatible with Ruby 1.9.3 and 2.0.0 and Rails 3.0, 3.1, 3.2, and 4.0.
+Tod is compatible with Ruby 1.9.3, 2.0.0, 2.1.8, and 2.2.0. It is tested against Rails 3.2, 4.0, 4.1, 4.2.
 
 
-History
-=======
-
-## 1.4.0 (April 3, 2014)
-
-* Add try_parse (Stuart Olivera)
-* Add parse? (Stuart Olivera)
-
-## 1.3.0 (December 9, 2013)
-
-* Add Shift class (Pablo Russo)
-
-## 1.2.2 (November 16, 2013)
-
-* Fix dumping nil or empty string to PostgreSQL time column (Maik Arnold)
-
-## 1.2.1 (September 30, 2013)
-
-* Added DateTime#to_time_of_day (Jonathan Pares)
-
-## 1.2.0 (July 16, 2013)
-
-* Added ActiveRecord TimeOfDay serialization to time column (Maxim-Filimonov)
-
-## 1.1.1 (April 12, 2013)
-
-* Added to_i and from_i as aliases of second_of_day and from_second_of_day (Johnny Shields)
-
-## 1.1.0 (February 13, 2013)
-
-* Added Rails time zone support
-
-## 1.0.0 (December 29, 2010)
-
-* Initial Release
-
 License
 =======
 

data/gemfiles/{3.0.gemfile → 4.1.gemfile}

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.0.20"
-gem "i18n"
+gem "activerecord", "~> 4.1.8"
 
 gemspec :path=>"../"

data/gemfiles/{3.1.gemfile → 4.2.gemfile}

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.1.12"
-gem "i18n"
+gem "activerecord", "~> 4.2.0"
 
 gemspec :path=>"../"

data/lib/tod/time_of_day.rb

@@ -33,6 +33,11 @@ module Tod
       \z
     /x
 
+    WORDS = {
+      "noon" => "12pm",
+      "midnight" => "12am"
+    }
+
     NUM_SECONDS_IN_DAY = 86400
     NUM_SECONDS_IN_HOUR = 3600
     NUM_SECONDS_IN_MINUTE = 60
@@ -52,6 +57,7 @@ module Tod
     end
 
     def <=>(other)
+      return unless other.respond_to?(:second_of_day)
       @second_of_day <=> other.second_of_day
     end
 
@@ -124,6 +130,7 @@ module Tod
       tod_string = tod_string.to_s
       tod_string = tod_string.strip
       tod_string = tod_string.downcase
+      tod_string = WORDS[tod_string] || tod_string
       if PARSE_24H_REGEX =~ tod_string || PARSE_12H_REGEX =~ tod_string
         hour, minute, second, a_or_p = $1.to_i, $2.to_i, $3.to_i, $4
         if hour == 12 && a_or_p == "a"
@@ -166,4 +173,4 @@ module Tod
       end
     end
   end
-end
+end

data/lib/tod/version.rb

@@ -1,3 +1,3 @@
 module Tod
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/test/tod/conversion_test.rb

@@ -32,5 +32,17 @@ class TimeOfDayConversionTest < Test::Unit::TestCase
 
     assert_equal(tod, TimeOfDay.new(12, 01, 02))
   end
+  should "parse 'noon'" do
+    t   = "noon"
+    tod = TimeOfDay(t)
+
+    assert_equal(tod, TimeOfDay.new(12, 00, 00))
+  end
+  should "parse 'midnight'" do
+    t   = "midnight"
+    tod = TimeOfDay(t)
+
+    assert_equal(tod, TimeOfDay.new(0, 00, 00))
+  end
 
 end

data/tod.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/JackC/tod"
   s.summary     = %q{Supplies TimeOfDay and Shift class}
   s.description = %q{Supplies TimeOfDay and Shift class that includes parsing, strftime, comparison, and arithmetic.}
+  s.license     = 'MIT'
 
   s.add_development_dependency "test-unit"
   s.add_development_dependency "shoulda"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tod
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -118,15 +118,16 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- gemfiles/3.0.gemfile
-- gemfiles/3.1.gemfile
 - gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
 - lib/tod.rb
 - lib/tod/conversions.rb
 - lib/tod/date.rb
@@ -147,7 +148,8 @@ files:
 - test/tod/time_test.rb
 - tod.gemspec
 homepage: https://github.com/JackC/tod
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -165,18 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Supplies TimeOfDay and Shift class
-test_files:
-- test/support/active_record.rb
-- test/test_helper.rb
-- test/tod/a_a_a_time_of_day_time_zone_without_active_support_test.rb
-- test/tod/conversion_test.rb
-- test/tod/date_test.rb
-- test/tod/shift_test.rb
-- test/tod/time_of_day_serializable_attribute_test.rb
-- test/tod/time_of_day_test.rb
-- test/tod/time_of_day_time_zone_with_active_support_test.rb
-- test/tod/time_test.rb
+test_files: []