time_distribution 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b9aff57e043eeec93dc76993c9242035a9388f3
-  data.tar.gz: 5a9dcff82cb40cbbc5c55a3721e43a1556898be8
+  metadata.gz: ca61f02b3f75d9e133ad3d1b67f0772608d3b632
+  data.tar.gz: de0caf7ebe59a0f171d6e320cde5a6ec2e9fd823
 SHA512:
-  metadata.gz: 0cf34b6ff59a5badb478fa88812e582fcf098817bf6f2451bd1ea748c6429ba79c9ffb956e9b9cf0eac270719afb36f8ba7730320fc5ca536297824c0d2c399d
-  data.tar.gz: 5134c0979595a6f6838800482e3f10e1ce7b366a42a29aca0d4d6a07e2ca9659af3a0fec117982bc7e4af6b1565849be4e958f714d276c51cd96162190421bec
+  metadata.gz: ea6124b5235f268aa59db971b0562129d0a330f0e481af4f5fda3f1683ade077dc03ba8da9bb118c8fe0ed8457ecdbe27da9e62c1fd7d9102a8bb641c70d2297
+  data.tar.gz: 0c1a08594abed6da6335186e0279a806eb2b186c50b4ab2a926af4dcfb1b762ff808704d9cbc6216f0b22895052e823d7993bb4c3384b2a4c978e2355df418df

data/lib/time_distribution/smart_duration.rb

@@ -10,12 +10,15 @@ module TimeDistribution
     def self.parse(time_period)
       # If the time period has is something like 1:00pm to 1:30pm or 1-2, interpret it as a range
       time_of_day_pattern = '\d+:?\d*[ap]?m?'
+      date_to_avoid_dsl_problems = '1/01/0001'
 
       Duration.new(
         if time_period.to_s.downcase.match(
           /(#{time_of_day_pattern})\s*(to|-)\s*(#{time_of_day_pattern})/
         )
-          Chronic.parse($1).count_forward_to(Chronic.parse($3))
+          Chronic.parse("#{date_to_avoid_dsl_problems} #{$1}").count_forward_to(
+            Chronic.parse("#{date_to_avoid_dsl_problems} #{$3}")
+          )
         else
           ChronicDuration.parse(time_period)
         end

data/lib/time_distribution/time.rb

@@ -1,13 +1,14 @@
 require 'chronic'
+require 'ruby-duration'
 
 module TimeDistribution
   module TimeRefinement
     refine Time do
       def count_forward_to(time)
-        if self > time
-          (Chronic.parse('11:59:59pm') - self) + (time - Chronic.parse('12:00:00am')) + 1
+        (time - self) + if self > time
+          24 * 60 * 60
         else
-          time - self
+          0
         end
       end
     end

data/lib/time_distribution/version.rb

@@ -1,3 +1,3 @@
 module TimeDistribution
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

data/spec/smart_duration_spec.rb

@@ -2,19 +2,27 @@ require_relative 'support/spec_helper'
 
 require 'time_distribution/smart_duration'
 
+def hours_in_seconds(hours)
+  return hours * 60 * 60
+end
+
+def minutes_in_seconds(minutes)
+  return minutes * 60
+end
+
 include TimeDistribution
 describe SmartDuration do
   describe '::parse' do
     describe 'can interpret a range of times' do
       it 'written with "to"' do
-        SmartDuration.parse('10am to 11:30am').total.must_equal 1.5.hours
+        SmartDuration.parse('10am to 11:30am').total.must_equal hours_in_seconds(1.5)
       end
       it 'written with "-"' do
-        SmartDuration.parse('10am-11:11am').total.must_equal 1.hours + 11.minutes
+        SmartDuration.parse('10am-11:11am').total.must_equal hours_in_seconds(1) + minutes_in_seconds(11)
       end
     end
     it 'can interpret an explicit range' do
-      SmartDuration.parse('1 hour 30 minutes').total.must_equal 1.5.hours
+      SmartDuration.parse('1 hour 30 minutes').total.must_equal hours_in_seconds(1.5)
     end
   end
 end

data/spec/time_spec.rb

@@ -5,19 +5,25 @@ require 'chronic'
 include TimeDistribution
 using TimeRefinement
 
+def hours_in_seconds(hours)
+  return hours * 60 * 60
+end
+
+DATE_TO_AVOID_DSL_PROBLEMS = '1/01/0001'
+
 describe Time do
   describe '#count_forward_to' do
     it 'counts duration properly when both times are in AM' do
-      Chronic.parse('10am').count_forward_to(Chronic.parse('11:30am')).must_equal 1.5.hours
+      Chronic.parse("#{DATE_TO_AVOID_DSL_PROBLEMS} 10am").count_forward_to(Chronic.parse("#{DATE_TO_AVOID_DSL_PROBLEMS} 11:30am")).must_equal hours_in_seconds(1.5)
     end
     it 'counts duration properly when both times are in PM' do
-      Chronic.parse('10pm').count_forward_to(Chronic.parse('11:30pm')).must_equal 1.5.hours
+      Chronic.parse("#{DATE_TO_AVOID_DSL_PROBLEMS} 10pm").count_forward_to(Chronic.parse("#{DATE_TO_AVOID_DSL_PROBLEMS} 11:30pm")).must_equal hours_in_seconds(1.5)
     end
     it 'counts duration properly when it crosses from AM to PM' do
-      Chronic.parse('11am').count_forward_to(Chronic.parse('12:30pm')).must_equal 1.5.hours
+      Chronic.parse("#{DATE_TO_AVOID_DSL_PROBLEMS} 11am").count_forward_to(Chronic.parse("#{DATE_TO_AVOID_DSL_PROBLEMS} 12:30pm")).must_equal hours_in_seconds(1.5)
     end
     it 'counts duration properly when it crosses from PM to AM' do
-      Chronic.parse('11pm').count_forward_to(Chronic.parse('12:30am')).must_equal 1.5.hours
+      Chronic.parse("#{DATE_TO_AVOID_DSL_PROBLEMS} 11pm").count_forward_to(Chronic.parse("#{DATE_TO_AVOID_DSL_PROBLEMS} 12:30am")).must_equal hours_in_seconds(1.5)
     end
   end
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: time_distribution
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Dustin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: ruby-duration
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
 - !ruby/object:Gem::Dependency
   name: pry-rescue
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Gem for creating time distribution management systems
@@ -129,7 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -159,17 +159,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Gem for creating time distribution management systems