tod 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd0d2d6c4e128195e0162e4516a89be2ceb08d42787e114e9a03a094e2d24f35
-  data.tar.gz: 1a879241486d84fb99744a23688e48b3d9cd1da0d42019d221ab332c145aaea6
+  metadata.gz: 9abbaa919b6c5095de1d85a9e4db5da1160d4d80038515366502c2144d007b75
+  data.tar.gz: 87106d404f688c2ba9997b18874172440f34f7bcacfe35f41c693309693c7654
 SHA512:
-  metadata.gz: df47cc6c284da3c00d8faa6b6fa064cd2d0e69fd696e2ef3be7e4a8a88823d82713de5e70407aea76d71f12dded69e8fb3f1fad45dfd2ccda2f223c48f76d7b1
-  data.tar.gz: a9e9cd0823b2870e8ec4d2dd687b3ec963132a5c795a50d4bb16fbcc0f7117212bc188885f951acdf61806c2e6bb1fc6caf3937d91747857e9e184682b4157ed
+  metadata.gz: a890e3dc2b7aee24401388d8d85214c01e0f730c0547a61f7c46d9a097dce842fccf2a43836d46e52af3eba87f1df2c9aa2bd13fe6f10f5e780b085e43b9741d
+  data.tar.gz: f6bdb357ba0c50aaba4b30f84038378a5418112776452832b2bfa8a53313975c88ca7caea2cdc8f4701acc7206b55dab19dfd08a3eb32214e3cf53f0fa771760

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 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

@@ -6,35 +6,35 @@ PATH
 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.0.5)
+      activesupport (= 7.0.5)
+    activerecord (7.0.5)
+      activemodel (= 7.0.5)
+      activesupport (= 7.0.5)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    i18n (1.8.9)
+    concurrent-ruby (1.2.2)
+    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.2)
+    minitest (5.18.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.0.6)
+    sqlite3 (1.6.3)
+      mini_portile2 (~> 2.8.0)
+    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

@@ -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_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.1"
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tod
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Jack Christensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2023-06-11 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.4.1
 signing_key:
 specification_version: 4
 summary: Supplies TimeOfDay and Shift class