tod 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd0d2d6c4e128195e0162e4516a89be2ceb08d42787e114e9a03a094e2d24f35
-  data.tar.gz: 1a879241486d84fb99744a23688e48b3d9cd1da0d42019d221ab332c145aaea6
+  metadata.gz: 4c1822f3d5a2b798f5b61037371706e54b7588491c9470d8072ad93212239662
+  data.tar.gz: c9d25f0ec776493e5afe4cd2194b6d6d2226f43663842891c65efaef6224fc10
 SHA512:
-  metadata.gz: df47cc6c284da3c00d8faa6b6fa064cd2d0e69fd696e2ef3be7e4a8a88823d82713de5e70407aea76d71f12dded69e8fb3f1fad45dfd2ccda2f223c48f76d7b1
-  data.tar.gz: a9e9cd0823b2870e8ec4d2dd687b3ec963132a5c795a50d4bb16fbcc0f7117212bc188885f951acdf61806c2e6bb1fc6caf3937d91747857e9e184682b4157ed
+  metadata.gz: be10cd8868990590e93d07e97a8eb4861facbeb708fbf61a1b0b01a6aaaec8f84189a38d276d04133aeadd6aec199342dcb1be893b6a1ed19a68135c0fc9aa1d
+  data.tar.gz: 8c31766d217e42c06ada0cc193af5231c33d73a45b81ed62abe5a3e7c6ea11fb0e9c159d60322a242b5c9706936710390e880e0d72503911a698b10d455c38ad

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 3.1.2 (January 12, 2024)
+
+* Add Tod::TimeOfDay#to_fs for Rails 7 compatibility (Igor S. Morozov)
+* Shift internally calls second_of_day instead of to_i on objects that should quack like a Tod::TimeOfDay. This makes silent errors caused by passing a bad argument less likely.
+
+# 3.1.1 (June 11, 2023)
+
+* Allow use in Rails forms with time_select (Bill Pearce)
+* Prevent error when comparing a range to nil (Chris Northwood)
+
 # 3.1.0 (December 20, 2021)
 
 * Allow / ignore parsing milliseconds (Eli Fatsi)

data/Gemfile.lock

@@ -1,40 +1,54 @@
 PATH
   remote: .
   specs:
-    tod (3.1.0)
+    tod (3.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activerecord (6.1.3)
-      activemodel (= 6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (7.1.2)
+      activesupport (= 7.1.2)
+    activerecord (7.1.2)
+      activemodel (= 7.1.2)
+      activesupport (= 7.1.2)
+      timeout (>= 0.4.0)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+    base64 (0.2.0)
+    bigdecimal (3.1.5)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    i18n (1.8.9)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
+    drb (2.2.0)
+      ruby2_keywords
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.14.4)
-    pry (0.13.1)
+    mini_portile2 (2.8.5)
+    minitest (5.21.1)
+    mutex_m (0.2.0)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rake (13.0.3)
-    sqlite3 (1.4.2)
-    tzinfo (2.0.4)
+      pry (>= 0.13, < 0.15)
+    rake (13.1.0)
+    ruby2_keywords (0.0.5)
+    sqlite3 (1.7.0)
+      mini_portile2 (~> 2.8.0)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/README.markdown

@@ -201,8 +201,8 @@ Overlaps?
 
 Contains?
 --------------------
-    workday = Shift.new(TimeOfDay.new(9), TimeOfDay.new(17))
-    lunch = Shift.new(TimeOfDay.new(10), TimeOfDay.new(14))
+    workday = Tod::Shift.new(Tod::TimeOfDay.new(9), Tod::TimeOfDay.new(17))
+    lunch = Tod::Shift.new(Tod::TimeOfDay.new(10), Tod::TimeOfDay.new(14))
     workday.contains?(lunch) # => true
     lunch.contains?(workday) # => false
 
@@ -244,6 +244,18 @@ order = Order.create(time: Tod::TimeOfDay.new(9,30))
 order.time                                      # => 09:30:00
 ```
 
+In Rails, this can be used with `time_select` in forms like so:
+
+```ruby
+f.time_select :time, ignore_date: true
+```
+
+Or with **simple_form**:
+
+```ruby
+f.input :time, as: :time, ignore_date: true
+```
+
 MongoDB Support
 ===============
 

data/lib/tod/shift.rb

@@ -16,10 +16,10 @@ module Tod
       @ending = ending
       @exclude_end = exclude_end
 
-      normalized_ending = ending.to_i
-      normalized_ending += TimeOfDay::NUM_SECONDS_IN_DAY if normalized_ending < beginning.to_i
+      normalized_ending = ending.second_of_day
+      normalized_ending += TimeOfDay::NUM_SECONDS_IN_DAY if normalized_ending < beginning.second_of_day
 
-      @range = Range.new(beginning.to_i, normalized_ending, @exclude_end)
+      @range = Range.new(beginning.second_of_day, normalized_ending, @exclude_end)
 
       freeze # Shift instances are value objects
     end
@@ -30,7 +30,7 @@ module Tod
 
     # Returns true if the time of day is inside the shift, false otherwise.
     def include?(tod)
-      second = tod.to_i
+      second = tod.second_of_day
       second += TimeOfDay::NUM_SECONDS_IN_DAY if second < @range.first
       @range.cover?(second)
     end
@@ -88,11 +88,11 @@ module Tod
     end
 
     def ==(other)
-      @range == other.range
+      !other.nil? && @range == other.range
     end
 
     def eql?(other)
-      @range.eql?(other.range)
+      !other.nil? && @range.eql?(other.range)
     end
 
     def hash

data/lib/tod/time_of_day.rb

@@ -107,6 +107,7 @@ module Tod
       end
     end
     alias_method :to_s, :to_formatted_s
+    alias_method :to_fs, :to_formatted_s
 
     def value_for_database
       to_s

data/lib/tod/time_of_day_type.rb

@@ -4,7 +4,7 @@ module Tod
       if value.is_a? Hash
           # rails multiparam attribute
           # get hour, minute and second and construct new TimeOfDay object
-        ::Tod::TimeOfDay.new(value[4], value[5], value[6])
+        ::Tod::TimeOfDay.new(value[4], value[5], value[6] || 0)
       else
         # return nil, if input is not parsable
         Tod::TimeOfDay(value){}

data/lib/tod/version.rb

@@ -1,3 +1,3 @@
 module Tod
-  VERSION = "3.1.0"
+  VERSION = "3.1.2"
 end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'bundler/setup'
+require 'active_support'
 require 'active_support/time'
 require 'tod'
 require 'tod/core_extensions'

data/test/tod/shift_test.rb

@@ -295,6 +295,13 @@ describe "Shift" do
       shift2 = Tod::Shift.new tod1, tod2, true
       assert !(shift1 == shift2)
     end
+
+    it "is false when one side is nil" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift = Tod::Shift.new tod1, tod2
+      assert !(shift == nil)
+    end
   end
 
   describe "#eql?" do
@@ -329,6 +336,13 @@ describe "Shift" do
       shift2 = Tod::Shift.new tod1, tod2, true
       assert !shift1.eql?(shift2)
     end
+
+    it "is false when one side is nil" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift = Tod::Shift.new tod1, tod2
+      assert !shift.eql?(nil )
+    end
   end
 
   describe "#hash" do

data/test/tod/time_of_day_attribute_test.rb

@@ -24,6 +24,11 @@ describe "TimeOfDay with ActiveRecord Attribute" do
     assert_equal Tod::TimeOfDay.new(8,6,5), order.time
   end
 
+  it "works with multiparam time arguments without seconds" do
+    order = Order.create!({"time(4i)" => "8", "time(5i)" => "6"})
+    assert_equal Tod::TimeOfDay.new(8,6,0), order.time
+  end
+
   it "should not raise Exception on access of unparsable values" do
     order = Order.new(time: 'unparsable')
     order.time

data/test/tod/time_of_day_test.rb

@@ -190,6 +190,13 @@ describe "TimeOfDay" do
     end
   end
 
+  describe "to_fs" do
+    it "is aliased to to_formatted_s" do
+      t = Tod::TimeOfDay.new(8,15,30)
+      assert_equal t.to_formatted_s, t.to_s
+    end
+  end
+
   describe "inspect" do
     it "is friendly representation" do
       t = Tod::TimeOfDay.new(12,15,05)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tod
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Jack Christensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Supplies TimeOfDay and Shift class