tod 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07c87817736be833dd3bc8ce83a55f075cdf79d9
-  data.tar.gz: 6eec299d0c6fe1b0c4c9385d555d9bf60e794ae1
+  metadata.gz: 5546b071b1fedc06fb6af4b11dff091e05ffc98d
+  data.tar.gz: bda08b0019d1af90e0a4cb31f5d86833b096737d
 SHA512:
-  metadata.gz: ac687afb2c4bf51aeb96143f955d68abcf5c1e4e9d82cd1fbd782131f4fbfa30c1992927f19715ef348fa05c8bb0732dc58a4cae24ea84dd41bc17f5bafbc06c
-  data.tar.gz: f1c51e6615f4b1961f5ce874a878a66cd258d30ff3069bd8b3fe3b265412e36273b333286c4ea7ed0ce3046255cbba64e307f4e113e72f06dde63419cdd9934b
+  metadata.gz: 1c6993e9088d273ca572061ee93d80c5549e418dc7d720833dbba5d2ea68d199707e65d459657c3d6af961e4a1bb1c0cdce3b10ee31699c9b769e30e93bed335
+  data.tar.gz: 73c8d5a8b90b06de86d327abf54eac4ce6ee877609595977cbedb3da7322d06eeb1159fcc478eaa34ae7a7541e7fd7052d4407d687cb94a35b99e735f271133d

data/.gitignore

@@ -5,3 +5,4 @@ nbproject
 *.swp
 .rvmrc
 vendor/
+.idea

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
 rvm:
-  - 2.3.1
-  - 2.2.5
-  - 2.1.10
+  - 2.3.3
+  - 2.2.6
 gemfile:
-  - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile
   - gemfiles/4.1.gemfile
   - gemfiles/4.2.gemfile
+  - gemfiles/5.0.gemfile

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.1.1 (April 14, 2017)
+
+* Fix serialize Ruby Time to Tod::TimeOfDay (Ryan Dick)
+* Fix TimeOfDay.from_second_of_day when passed float (Jack Christensen)
+* Fix Rails 5 multi-param assignment (Miklos Fazekas)
+
 # 2.1.0 (May 9, 2016)
 
 * Fix date extensions requiring date (ambirdsall)

data/Gemfile.lock

@@ -1,39 +1,36 @@
 PATH
   remote: .
   specs:
-    tod (2.1.0)
+    tod (2.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
-      builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
-      arel (~> 6.0)
-    activesupport (4.2.3)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
+      arel (~> 7.0)
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.2)
-    builder (3.2.2)
-    coderay (1.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
+    arel (7.1.4)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.5)
+    i18n (0.8.1)
     method_source (0.8.2)
-    minitest (5.7.0)
-    pry (0.10.1)
+    minitest (5.10.1)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.4.2)
+    rake (12.0.0)
     slop (3.6.0)
-    sqlite3 (1.3.10)
-    thread_safe (0.3.5)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -51,4 +48,4 @@ DEPENDENCIES
   tzinfo
 
 BUNDLED WITH
-   1.11.2
+   1.14.6

data/README.markdown

@@ -89,6 +89,15 @@ Format strings are passed to Time#strftime.
     Tod::TimeOfDay.new(17,15).strftime("%I:%M %p")      # => "05:15 PM"
     Tod::TimeOfDay.new(22,5,15).strftime("%I:%M:%S %p") # => "10:05:15 PM"
 
+Rounding
+----------
+
+Round to the given nearest number of seconds.
+
+    Tod::TimeOfDay.new(8,15,31).round(5)     # => "08:15:30"
+    Tod::TimeOfDay.new(8,15,34).round(60)    # => "08:16:00"
+    Tod::TimeOfDay.new(8,02,29).round(300)   # => "08:00:00"
+
 Convenience methods for dates and times
 ---------------------------------------
 
@@ -241,7 +250,7 @@ Compatibility
 
 [![Build Status](https://travis-ci.org/jackc/tod.png)](https://travis-ci.org/jackc/tod)
 
-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.
+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, 5.0.
 
 
 License

data/gemfiles/{3.2.gemfile → 5.0.gemfile}

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "activerecord", "~> 3.2.13"
+gem 'activerecord', '~> 5.0.0.1'
 
 gemspec :path=>"../"

data/lib/tod/time_of_day.rb

@@ -61,6 +61,21 @@ module Tod
       @second_of_day <=> other.second_of_day
     end
 
+    # Rounding to the given nearest number of seconds
+    def round(round_sec = 1)
+      down = self - (self.to_i % round_sec)
+      up = down + round_sec
+
+      difference_down = self - down
+      difference_up = up - self
+
+      if (difference_down < difference_up)
+        return down
+      else
+        return up
+      end
+    end
+
     # Formats identically to Time#strftime
     def strftime(format_string)
       Time.local(2000,1,1, @hour, @minute, @second).strftime(format_string)
@@ -96,6 +111,7 @@ module Tod
     #
     #   TimeOfDay.from_second_of_day(3600) == TimeOfDay.new(1)   # => true
     def self.from_second_of_day(second_of_day)
+      second_of_day = Integer(second_of_day)
       remaining_seconds = second_of_day % NUM_SECONDS_IN_DAY
       hour = remaining_seconds / NUM_SECONDS_IN_HOUR
       remaining_seconds -= hour * NUM_SECONDS_IN_HOUR
@@ -162,10 +178,14 @@ module Tod
     end
 
     def self.dump(time_of_day)
-      if time_of_day.to_s == ''
+      if time_of_day.is_a? Hash
+        # rails multiparam attribute
+        hour,minute,second = time_of_day[4], time_of_day[5], time_of_day[6]
+        ::Tod::TimeOfDay.new(hour, minute, second).to_s
+      elsif time_of_day.to_s == ''
         nil
       else
-        time_of_day.to_s
+        Tod::TimeOfDay(time_of_day).to_s
       end
     end
 

data/lib/tod/version.rb

@@ -1,3 +1,3 @@
 module Tod
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/test/tod/conversion_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require_relative '../test_helper'
 
 describe "TimeOfDay()" do
   it "handles Tod::TimeOfDay" do

data/test/tod/date_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require_relative '../test_helper'
 
 describe "Date extensions" do
   describe "#at" do

data/test/tod/shift_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require_relative '../test_helper'
 
 describe "Shift" do
   describe "#initialize" do

data/test/tod/time_of_day_serializable_attribute_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require_relative '../test_helper'
 require File.expand_path(File.join(File.dirname(__FILE__),'..','support/active_record'))
 
 class Order < ActiveRecord::Base
@@ -14,20 +14,32 @@ describe "TimeOfDay with ActiveRecord Serializable Attribute" do
     it "sets nil as value" do
       Order.create!(time: nil)
     end
+
+    it "works with multiparam time arguments" do
+      order = Order.create!({"time(4i)" => "8", "time(5i)" => "6", "time(6i)" => "5"})
+      assert_equal Tod::TimeOfDay.new(8,6,5), order.time
+    end
   end
 
   describe ".load" do
-    it "loads set time" do
+    it "loads set Tod::TimeOfDay" do
       time_of_day = Tod::TimeOfDay.new(9, 30)
       order = Order.create!(time: time_of_day)
       order.reload
       assert_equal order.time, time_of_day
     end
 
+    it "loads set Time" do
+      time_of_day = Time.new(2015, 10, 21, 16, 29, 0, "-07:00")
+      order = Order.create!(time: time_of_day)
+      order.reload
+      assert_equal order.time, Tod::TimeOfDay.new(16, 29)
+    end
+
     it "returns nil if time is not set" do
       order = Order.create!(time: nil)
       order.reload
-      assert_equal order.time, nil
+      assert_nil order.time
     end
   end
 

data/test/tod/time_of_day_test.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require_relative '../test_helper'
 
 describe "TimeOfDay" do
   describe "#initialize" do
     it "blocks invalid hours" do
-      assert_raises(ArgumentError) { Tod::TimeOfDay.new -1 }
+      assert_raises(ArgumentError) { Tod::TimeOfDay.new(-1) }
       assert_raises(ArgumentError) { Tod::TimeOfDay.new 24 }
     end
 
@@ -50,7 +50,7 @@ describe "TimeOfDay" do
   def self.should_not_parse(parse_string)
     it "does not parse '#{parse_string}'" do
       assert_equal false, Tod::TimeOfDay.parsable?(parse_string)
-      assert_equal nil, Tod::TimeOfDay.try_parse(parse_string)
+      assert_nil Tod::TimeOfDay.try_parse(parse_string)
       assert_raises(ArgumentError) { Tod::TimeOfDay.parse(parse_string) }
     end
   end
@@ -98,12 +98,12 @@ describe "TimeOfDay" do
 
   it "does not parse 'nil'" do
     assert_equal false, Tod::TimeOfDay.parsable?(nil)
-    assert_equal nil, Tod::TimeOfDay.try_parse(nil)
+    assert_nil Tod::TimeOfDay.try_parse(nil)
     assert_raises(ArgumentError) { Tod::TimeOfDay.parse(nil) }
   end
 
   it "provides spaceship operator" do
-    assert_equal -1, Tod::TimeOfDay.new(8,0,0) <=> Tod::TimeOfDay.new(9,0,0)
+    assert_equal(-1, Tod::TimeOfDay.new(8,0,0) <=> Tod::TimeOfDay.new(9,0,0))
     assert_equal 0, Tod::TimeOfDay.new(9,0,0) <=> Tod::TimeOfDay.new(9,0,0)
     assert_equal 1, Tod::TimeOfDay.new(10,0,0) <=> Tod::TimeOfDay.new(9,0,0)
   end
@@ -112,6 +112,20 @@ describe "TimeOfDay" do
     assert_equal Tod::TimeOfDay.new(8,0,0), Tod::TimeOfDay.new(8,0,0)
   end
 
+  describe "round_nearest" do
+    it "rounds to the given nearest number of seconds" do
+      assert_equal Tod::TimeOfDay.new(8,15,30), Tod::TimeOfDay.new(8,15,31).round(5)
+      assert_equal Tod::TimeOfDay.new(8,15,35), Tod::TimeOfDay.new(8,15,33).round(5)
+      assert_equal Tod::TimeOfDay.new(8,16,0), Tod::TimeOfDay.new(8,15,34).round(60)
+      assert_equal Tod::TimeOfDay.new(8,15,0), Tod::TimeOfDay.new(8,15,15).round(60)
+      assert_equal Tod::TimeOfDay.new(8,15,0), Tod::TimeOfDay.new(8,17,15).round(300)
+      assert_equal Tod::TimeOfDay.new(8,20,0), Tod::TimeOfDay.new(8,18,15).round(300)
+      assert_equal Tod::TimeOfDay.new(8,20,0), Tod::TimeOfDay.new(8,20,00).round(300)
+      assert_equal Tod::TimeOfDay.new(9,0,0), Tod::TimeOfDay.new(8,58,00).round(300)
+      assert_equal Tod::TimeOfDay.new(8,0,0), Tod::TimeOfDay.new(8,02,29).round(300)
+      assert_equal Tod::TimeOfDay.new(0,0,0), Tod::TimeOfDay.new(23,58,29).round(300)
+    end
+  end
 
   describe "strftime" do
     it "accepts standard strftime format codes" do
@@ -219,6 +233,10 @@ describe "TimeOfDay" do
     it "has alias from_i" do
       assert_equal Tod::TimeOfDay.method(:from_second_of_day), Tod::TimeOfDay.method(:from_i)
     end
+
+    it "handles floats" do
+      assert_equal Tod::TimeOfDay.new(15,30,0), Tod::TimeOfDay.from_second_of_day(55800.0)
+    end
   end
 
   describe "on" do

data/test/tod/time_of_day_time_zone_with_active_support_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require_relative '../test_helper'
 
 describe "TimeOfDay with ActiveSupport" do
   describe ".time_zone" do

data/test/tod/time_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require_relative '../test_helper'
 
 describe "Time extensions" do
   describe "#to_time_of_day" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tod
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -124,10 +124,10 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- gemfiles/3.2.gemfile
 - gemfiles/4.0.gemfile
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
+- gemfiles/5.0.gemfile
 - lib/tod.rb
 - lib/tod/arel_extensions.rb
 - lib/tod/conversions.rb
@@ -168,17 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Supplies TimeOfDay and Shift class
-test_files:
-- test/support/active_record.rb
-- test/test_helper.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: []