tod 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95ba589cb9d03ce67ad336aa64c8484a78c3d672
-  data.tar.gz: 193bf73e7b5a5382d5e71a40822e3d22663f8325
+  metadata.gz: 07c87817736be833dd3bc8ce83a55f075cdf79d9
+  data.tar.gz: 6eec299d0c6fe1b0c4c9385d555d9bf60e794ae1
 SHA512:
-  metadata.gz: 2319de23fd179e408185c1fc0ac6aa9452090b87166f2bd590fd9611a6880f8257cad3eb0b7f3f0d1f789d6861ec99bd6eeaa3484e757823549e65c5e7a3bb9a
-  data.tar.gz: 53df47600a0139bd3f30a3dd6931385b7850283d875c7988a90784b300b54a568e1e75f466d9dd21af309872ea347c01567dfb2e3c116f8208e53e1f353ed12b
+  metadata.gz: ac687afb2c4bf51aeb96143f955d68abcf5c1e4e9d82cd1fbd782131f4fbfa30c1992927f19715ef348fa05c8bb0732dc58a4cae24ea84dd41bc17f5bafbc06c
+  data.tar.gz: f1c51e6615f4b1961f5ce874a878a66cd258d30ff3069bd8b3fe3b265412e36273b333286c4ea7ed0ce3046255cbba64e307f4e113e72f06dde63419cdd9934b

data/.gitignore

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

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-  - 2.2.0
-  - 2.1.5
-  - 2.0.0
-  - 1.9.3
+  - 2.3.1
+  - 2.2.5
+  - 2.1.10
 gemfile:
   - gemfiles/3.2.gemfile
   - gemfiles/4.0.gemfile

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 2.1.0 (May 9, 2016)
+
+* Fix date extensions requiring date (ambirdsall)
+* Add subtraction to TimeOfDay (Hiroki Shirai)
+* Add equality comparison for shifts (Greg Beech)
+* Add arel_extensions for TimeOfDay (Paul Tyng)
+* Support for shifts that span to other days (kennyeni)
+
+# 2.0.2 (May 21, 2015)
+
+* Fix ActiveRecord serialization when core extensions not loaded
+
 # 2.0.1 (May 8, 2015)
 
 * Fix Tod::TimeOfDay() without core extensions

data/Gemfile.lock

@@ -1,31 +1,31 @@
 PATH
   remote: .
   specs:
-    tod (2.0.2)
+    tod (2.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
       arel (~> 6.0)
-    activesupport (4.2.0)
+    activesupport (4.2.3)
       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.0)
+    arel (6.0.2)
     builder (3.2.2)
     coderay (1.1.0)
     i18n (0.7.0)
-    json (1.8.2)
+    json (1.8.3)
     method_source (0.8.2)
-    minitest (5.5.1)
+    minitest (5.7.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -33,7 +33,7 @@ GEM
     rake (10.4.2)
     slop (3.6.0)
     sqlite3 (1.3.10)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -42,9 +42,13 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 3.0.0)
+  arel
   minitest
   pry
   rake
   sqlite3
   tod!
   tzinfo
+
+BUNDLED WITH
+   1.11.2

data/lib/tod/arel_extensions.rb

@@ -0,0 +1,25 @@
+require 'arel'
+
+module Tod
+  module ArelDepthFirstExtensions
+    def self.included(base)
+      base.send :alias_method, :visit_Tod_TimeOfDay, :terminal
+    end
+  end
+
+  module ArelDotExtensions
+    def self.included(base)
+      base.send :alias_method, :visit_Tod_TimeOfDay, :visit_String
+    end
+  end
+
+  module ArelToSqlExtensions
+    def visit_Tod_TimeOfDay(o, collector=nil)
+      quote Tod::TimeOfDay.dump(o)
+    end
+  end
+end
+
+Arel::Visitors::DepthFirst.send :include, Tod::ArelDepthFirstExtensions
+Arel::Visitors::Dot.send :include, Tod::ArelDotExtensions
+Arel::Visitors::ToSql.send :include, Tod::ArelToSqlExtensions

data/lib/tod/date_extensions.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module Tod
   module DateExtensions
     # Returns a local Time instance with this date and time_of_day

data/lib/tod/shift.rb

@@ -33,9 +33,20 @@ module Tod
 
     # Returns true if ranges overlap, false otherwise.
     def overlaps?(other)
+      max_seconds = TimeOfDay::NUM_SECONDS_IN_DAY
+
+      # Standard case, when Shifts are on the same day
       a, b = [self, other].map(&:range).sort_by(&:first)
       op = a.exclude_end? ? :> : :>=
-      a.last.send(op, b.first)
+      return true if a.last.send(op, b.first)
+
+      # Special cases, when Shifts span to the next day
+      return false if (a.last < max_seconds) && (b.last < max_seconds)
+
+      a = Range.new(a.first, a.last - max_seconds, a.exclude_end?) if a.last > max_seconds
+      b = Range.new(b.first, b.last - max_seconds, b.exclude_end?) if b.last > max_seconds
+      a, b = [a, b].sort_by(&:last)
+      b.last.send(op, a.last) && a.last.send(op, b.first)
     end
 
     def contains?(shift)
@@ -51,5 +62,22 @@ module Tod
     def exclude_end?
       @exclude_end
     end
+
+    def ==(other)
+      @range == other.range
+    end
+
+    def eql?(other)
+      @range.eql?(other.range)
+    end
+
+    def hash
+      @range.hash
+    end
+
+    # Move start and end by a number of seconds and return new shift.
+    def slide(seconds)
+      self.class.new(beginning + seconds, ending + seconds, exclude_end?)
+    end
   end
 end

data/lib/tod/time_of_day.rb

@@ -78,8 +78,12 @@ module Tod
 
     # Return a new TimeOfDay num_seconds less than self. It will wrap around
     # at midnight.
-    def -(num_seconds)
-      TimeOfDay.from_second_of_day @second_of_day - num_seconds
+    def -(other)
+      if other.instance_of?(TimeOfDay)
+        TimeOfDay.from_second_of_day @second_of_day - other.second_of_day
+      else
+        TimeOfDay.from_second_of_day @second_of_day - other
+      end
     end
 
     # Returns a Time instance on date using self as the time of day

data/lib/tod/version.rb

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

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require 'bundler/setup'
 require 'active_support/time'
 require 'tod'
 require 'tod/core_extensions'
+require 'tod/arel_extensions'
 require 'minitest/autorun'
 require 'pry'
 

data/test/tod/shift_test.rb

@@ -43,12 +43,49 @@ describe "Shift" do
       shift1 = Tod::Shift.new(Tod::TimeOfDay.new(12), Tod::TimeOfDay.new(18))
       shift2 = Tod::Shift.new(Tod::TimeOfDay.new(13), Tod::TimeOfDay.new(15))
       assert shift1.overlaps?(shift2)
+
+      # Additional Testing for Shifts that span from one day to another
+      cases = [
+        [5, 8, 7, 2],
+        [7, 2, 1, 8],
+        [7, 2, 5, 8],
+        [4, 8, 1, 5],
+        [1, 5, 4, 8],
+        [7, 2, 1, 4],
+        [1, 4, 7, 2],
+        [1, 4, 3, 2],
+        [5, 8, 7, 2],
+        [7, 2, 8, 3],
+        [7, 2, 6, 3],
+        [7, 2, 1, 8]
+      ]
+
+      cases.each do |c|
+        shift1 = Tod::Shift.new(Tod::TimeOfDay.new(c[0]), Tod::TimeOfDay.new(c[1]))
+        shift2 = Tod::Shift.new(Tod::TimeOfDay.new(c[2]), Tod::TimeOfDay.new(c[3]))
+        assert shift1.overlaps?(shift2), "Failed with args: #{c}"
+      end
     end
 
     it "is false when shifts don't overlap" do
       shift1 = Tod::Shift.new(Tod::TimeOfDay.new(1), Tod::TimeOfDay.new(5))
       shift2 = Tod::Shift.new(Tod::TimeOfDay.new(9), Tod::TimeOfDay.new(12))
       refute shift1.overlaps?(shift2)
+
+      # Additional Testing for Shifts that span from one day to another
+      cases = [
+        [7, 8, 1, 5],
+        [1, 5, 7, 8],
+        [7, 2, 3, 4],
+        [3, 4, 5, 2],
+        [1, 5, 9, 12]
+      ]
+
+      cases.each do |c|
+        shift1 = Tod::Shift.new(Tod::TimeOfDay.new(c[0]), Tod::TimeOfDay.new(c[1]))
+        shift2 = Tod::Shift.new(Tod::TimeOfDay.new(c[2]), Tod::TimeOfDay.new(c[3]))
+        refute shift1.overlaps?(shift2), "Failed with args: #{c}"
+      end
     end
 
     it "is true when shifts touch with inclusive end" do
@@ -166,4 +203,153 @@ describe "Shift" do
       assert shift.include?(value)
     end
   end
+
+  describe "#==" do
+    it "is true when the beginning time, end time, and exclude end are the same" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new tod1, tod2
+      assert shift1 == shift2
+    end
+
+    it "is false when the beginning time is different" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new tod1, Tod::TimeOfDay.new(14,00)
+      assert !(shift1 == shift2)
+    end
+
+    it "is false when the ending time is different" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new Tod::TimeOfDay.new(9,30), tod2
+      assert !(shift1 == shift2)
+    end
+
+    it "is false when exclude end is different" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new tod1, tod2, true
+      assert !(shift1 == shift2)
+    end
+  end
+
+  describe "#eql?" do
+    it "is true when the beginning time, end time, and exclude end are the same" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new tod1, tod2
+      assert shift1.eql?(shift2)
+    end
+
+    it "is false when the beginning time is different" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new tod1, Tod::TimeOfDay.new(14,00)
+      assert !shift1.eql?(shift2)
+    end
+
+    it "is false when the ending time is different" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new Tod::TimeOfDay.new(9,30), tod2
+      assert !shift1.eql?(shift2)
+    end
+
+    it "is false when exclude end is different" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new tod1, tod2, true
+      assert !shift1.eql?(shift2)
+    end
+  end
+
+  describe "#hash" do
+    it "is the same when the beginning time, end time, and exclude end are the same" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new tod1, tod2
+      assert_equal shift1.hash, shift2.hash
+    end
+
+    it "is usually different when the beginning time is different" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new tod1, Tod::TimeOfDay.new(14,00)
+      assert shift1.hash != shift2.hash
+    end
+
+    it "is usually different when the ending time is different" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new Tod::TimeOfDay.new(9,30), tod2
+      assert shift1.hash != shift2.hash
+    end
+
+    it "is usually different when exclude end is different" do
+      tod1 = Tod::TimeOfDay.new 8,30
+      tod2 = Tod::TimeOfDay.new 13,00,30
+      shift1 = Tod::Shift.new tod1, tod2
+      shift2 = Tod::Shift.new tod1, tod2, true
+      assert shift1.hash != shift2.hash
+    end
+  end
+
+  describe "slide" do
+    it "handles positive numbers" do
+      slide = 30 * 60 # 30 minutes in seconds
+
+      beginning_expected = Tod::TimeOfDay.new 10, 30
+      ending_expected = Tod::TimeOfDay.new 16, 30
+
+      beginning  = Tod::TimeOfDay.new 10
+      ending  = Tod::TimeOfDay.new 16
+      shift = Tod::Shift.new(beginning, ending, false).slide(slide)
+
+      assert_equal beginning_expected, shift.beginning
+      assert_equal ending_expected, shift.ending
+      refute shift.exclude_end?
+    end
+
+    it "handles negative numbers" do
+      slide = -30 * 60 # -30 minutes in seconds
+
+      beginning_expected = Tod::TimeOfDay.new 9, 30
+      ending_expected = Tod::TimeOfDay.new 15, 30
+
+      beginning  = Tod::TimeOfDay.new 10
+      ending  = Tod::TimeOfDay.new 16
+      shift = Tod::Shift.new(beginning, ending, false).slide(slide)
+
+      assert_equal beginning_expected, shift.beginning
+      assert_equal ending_expected, shift.ending
+      refute shift.exclude_end?
+    end
+
+    it "handles ActiveSupport::Duration" do
+      slide = 30.minutes
+
+      beginning_expected = Tod::TimeOfDay.new 10, 30
+      ending_expected = Tod::TimeOfDay.new 16, 30
+
+      beginning  = Tod::TimeOfDay.new 10
+      ending  = Tod::TimeOfDay.new 16
+      shift = Tod::Shift.new(beginning, ending, false).slide(slide)
+
+      assert_equal beginning_expected, shift.beginning
+      assert_equal ending_expected, shift.ending
+      refute shift.exclude_end?
+    end
+  end
 end

data/test/tod/time_of_day_serializable_attribute_test.rb

@@ -30,4 +30,13 @@ describe "TimeOfDay with ActiveRecord Serializable Attribute" do
       assert_equal order.time, nil
     end
   end
+
+  describe "Order.where" do
+    it "handles TimeOfDay as a parameter" do
+      tod = Tod::TimeOfDay.new(11, 11)
+      expected = Order.create!(time: tod)
+      actual = Order.where(time: tod).first
+      assert_equal expected, actual
+    end
+  end
 end

data/test/tod/time_of_day_test.rb

@@ -151,6 +151,12 @@ describe "TimeOfDay" do
       result = original + 15
       refute_equal original.object_id, result.object_id
     end
+
+    it "handles ActiveSupport::Duration" do
+      original = Tod::TimeOfDay.new(8,0,0)
+      result = original + 10.minutes
+      assert_equal Tod::TimeOfDay.new(8,10,0), result
+    end
   end
 
   describe "subtraction" do
@@ -171,6 +177,19 @@ describe "TimeOfDay" do
       result = original - 15
       refute_equal original.object_id, result.object_id
     end
+
+    it "handles ActiveSupport::Duration" do
+      original = Tod::TimeOfDay.new(8,0,0)
+      result = original - 10.minutes
+      assert_equal Tod::TimeOfDay.new(7,50,0), result
+    end
+
+    it "subtracts Tod::TimeOfDay object" do
+      right_side = Tod::TimeOfDay.new(10,0,0)
+      left_side = Tod::TimeOfDay.new(12,0,30)
+      result = right_side - left_side
+      assert_equal Tod::TimeOfDay.new(21,59,30), result
+    end
   end
 
   describe "from_second_of_day" do

data/tod.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "activerecord", ">= 3.0.0"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "pry"
+  s.add_development_dependency "arel"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tod
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: arel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Supplies TimeOfDay and Shift class that includes parsing, strftime, comparison,
   and arithmetic.
 email:
@@ -115,6 +129,7 @@ files:
 - gemfiles/4.1.gemfile
 - gemfiles/4.2.gemfile
 - lib/tod.rb
+- lib/tod/arel_extensions.rb
 - lib/tod/conversions.rb
 - lib/tod/core_extensions.rb
 - lib/tod/date_extensions.rb
@@ -153,8 +168,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Supplies TimeOfDay and Shift class
-test_files: []
+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