workhours 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4afcc2a48122262799dcb7e26fdc3eb35b14bb9f
-  data.tar.gz: cacbd1f4c452697d860d3bdb39e48707eb3f0910
+  metadata.gz: a8c7f5dee953a61e1d670526c3088081f16f453c
+  data.tar.gz: 74efe9fef0d7f6499bf3041bc8965aba35da3bd0
 SHA512:
-  metadata.gz: d08055ca91f5ebd065f653fa153fe9cdcc9779591e496af743a257e21fae6b8eef038fee6426206599143f399c9f36936ba25ab569a32bd7d828ca3f7d9e1280
-  data.tar.gz: 25e9d25e4e0406f3a70c5eb34d1d2f063b3da5b3cbc6c819158901ba3fe2d5331d34ae375d515be1888c2b44cdd5bad7678ee6abf3d89075c3e2b2d30a0b51ce
+  metadata.gz: 8f138d644b682e8dc032de679f4742ac68764f0385fb24ce988b01d73b1c64a130164f37ab906eae55071e62a3bf605fc8ca052c59c44561e1ab38c058b1685f
+  data.tar.gz: b8fb21d8d847938d684b5e918c6876de77e11bcd91fd8f5294580028f76207cc78c4df64f959dfd59782b88fb25131167e9396e3d62bef7a9ff6e19c26363f94

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    workhours (0.1.0)
-      tod
+    workhours (0.2.0)
+      tod (~> 2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/workhours.rb

@@ -1,6 +1,7 @@
 require "workhours/version"
 
 require 'tod'
+require 'tod/core_extensions'
 require "workhours/week"
 require "workhours/period"
 require "workhours/util"

data/lib/workhours/period.rb

@@ -3,12 +3,12 @@ module Workhours
     attr_accessor :wday, :shift
     def initialize(wday, beginning, ending)
       @wday = wday
-      beginning = TimeOfDay.parse(beginning) unless beginning.is_a?(TimeOfDay)
-      ending = TimeOfDay.parse(ending) unless ending.is_a?(TimeOfDay)
+      beginning = Tod::TimeOfDay.parse(beginning) unless beginning.is_a?(Tod::TimeOfDay)
+      ending = Tod::TimeOfDay.parse(ending) unless ending.is_a?(Tod::TimeOfDay)
       if ending.second_of_day != 0 && ending < beginning
         raise MultidayPeriodError.new()
       end
-      @shift = Shift.new(beginning, ending)
+      @shift = Tod::Shift.new(beginning, ending)
     end
 
     def inspect

data/lib/workhours/version.rb

@@ -1,3 +1,3 @@
 module Workhours
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/workhours/week.rb

@@ -31,8 +31,8 @@ module Workhours
           else
             pr = h.split(' ')
             times = pr[1].split('-')
-            beginning = TimeOfDay.parse(times[0])
-            ending = TimeOfDay.parse(times[1])
+            beginning = Tod::TimeOfDay.parse(times[0])
+            ending = Tod::TimeOfDay.parse(times[1])
             if ending < beginning
               [Workhours::Period.new(pr[0], times[0], "0:00"), Workhours::Period.new(Workhours.next_day(pr[0]), "0:00", times[1])]
             else

data/workhours.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "tod"
+  spec.add_dependency "tod", '~> 2.0'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workhours
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - glebtv
@@ -14,16 +14,16 @@ dependencies:
   name: tod
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement