relativity 0.0.8 → 0.0.9

data/Changelog.rdoc

@@ -1,3 +1,7 @@
+0.0.9 2012-03-01:
+* make compatible with ruby 1.9.2
+* refactor seconds_since_midnight
+
 0.0.8 2012-02-15:
 * DayTime.normalize
 * DayTimeRange.normalize

data/lib/relativity/day_time/conversions.rb

@@ -1,3 +1,5 @@
+require 'bigdecimal'
+
 module DayTime::Conversions
 
   def hours
@@ -22,6 +24,10 @@ module DayTime::Conversions
     [hours, minutes, seconds].map{|e| rjust_2_0(e.to_s)}.join(self.class.default_separator)
   end
 
+  def self.seconds_since_midnight(hh, mm, ss, nn)
+    ((hh * 3600) + (mm * 60) + ss + BigDecimal("#{nn}")/1000000000)%(24*3600)
+  end
+
 private
 
   def rjust_2_0(s)

data/lib/relativity/day_time/new.rb

@@ -21,7 +21,7 @@ module DayTime::New
       ss = t.sec
       nn = t.nsec
     end
-    @seconds_since_midnight = ((hh * 3600) + (mm * 60) + ss + BigDecimal(nn)/BigDecimal(1000000000))%(24*3600)
+    @seconds_since_midnight = DayTime::Conversions.seconds_since_midnight(hh,mm,ss,nn)
   end
 
 private

data/lib/relativity/version.rb

@@ -1,3 +1,3 @@
 module Relativity
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/relativity/week_time.rb

@@ -1,6 +1,5 @@
 class WeekTime
 
-  require 'bigdecimal'
   require 'time'
 
   attr_reader :seconds_since_sunday_midnight
@@ -22,8 +21,8 @@ class WeekTime
       nn = t.nsec
     end
 
-    seconds_since_midnight = ((hh * 3600) + (mm * 60) + ss + BigDecimal(nn)/BigDecimal(1000000000))%(24*3600)
-    @seconds_since_sunday_midnight = week_day_d * 24 * 3600 + seconds_since_midnight
+    day_time = DayTime.new(hh,mm,ss,nn)
+    @seconds_since_sunday_midnight = (week_day_d * 24 * 3600) + day_time.seconds_since_midnight
   end
 
 end

data/spec/day_time/conversions_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'bigdecimal/util'
 
 describe DayTime do
 
@@ -31,11 +32,34 @@ describe DayTime do
   end
 
   it "seconds_since_midnight" do
-    lambda { subject.seconds_since_midnight }.should_not raise_error
+    subject.seconds_since_midnight # should_not raise_error
   end
 
   it "seconds_since_midnight should be BigDecimal" do
     subject.seconds_since_midnight.should be_kind_of(BigDecimal)
   end
 
+  context "seconds since midnight" do
+
+    it "zero is correct" do
+      DayTime::Conversions.seconds_since_midnight(0,0,0,0).should == "0".to_d
+    end
+
+    it "hours are correct" do
+      DayTime::Conversions.seconds_since_midnight(1,0,0,0).should == "3600".to_d
+    end
+
+    it "minutes are correct" do
+      DayTime::Conversions.seconds_since_midnight(0,1,0,0).should == "60".to_d
+    end
+
+    it "seconds are correct" do
+      DayTime::Conversions.seconds_since_midnight(0,0,1,0).should == "1".to_d
+    end
+
+    it "nanoseconds are correct" do
+      DayTime::Conversions.seconds_since_midnight(0,0,0,1000).should == "0.000001".to_d
+    end
+
+  end
 end

data/spec/exception_spec.rb

@@ -21,8 +21,7 @@ module Relativity
     end
 
     it "InvalidRangeFormatError accepts a hash with separator" do
-      lambda {e = Relativity::InvalidRangeFormatError.new(:separator => "abcd")}.
-        should_not raise_error
+      Relativity::InvalidRangeFormatError.new(:separator => "abcd") #should_not raise_error
     end
 
     it "InvalidRangeFormatError gives a tailured message" do

data/spec/week_time/week_time_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe WeekTime do
 
   it "new builds a WeekTime" do
-    lambda { subject }.should_not raise_error
+    subject # should_not raise_error
   end
 
   it "seconds_since_sunday_midnight" do
-    lambda { subject.seconds_since_sunday_midnight }.should_not raise_error
+    subject.seconds_since_sunday_midnight # should_not raise_error
   end
 
   it "new creates a WeekTime close to now" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relativity
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
+date: 2012-03-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83122250 !ruby/object:Gem::Requirement
+  requirement: &79883760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *83122250
+  version_requirements: *79883760
 description: time and time_ranges relative to day, week, month, quarter etc.
 email:
 - peter@vandenabeele.com