working_hours 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2504840e341046d817df5de9c4e7d8271e192177
-  data.tar.gz: 2a97bd89965b04bd6b68c1bdcaf90a27ca0ae2ec
+  metadata.gz: af58b9235b85d46bc35cc76ceb72bf755c074923
+  data.tar.gz: dd5e22bc13e5659507f189ed586327a9ad199f5b
 SHA512:
-  metadata.gz: 213aed1c4be42b0ff98a9e926253941da1cc4e05bfc85be8d3ca77e51082b87da00da0169410e16c3045366eaf0c202fd7c352d000df19d0edeee3c4b89fa976
-  data.tar.gz: 016639b14b4a5ec24be13ea3415223fef1c7743c04654e23c2346ecaaef4d83c9985c3a63f4786c4430e4b087a3b95b0a04b5ae80ab538dfe186ce4ac26d294f
+  metadata.gz: e09fc30b112ad6a69e45b64b6b0559ab82a4b09137c89a5598b86c22e3a2bc4f371790d9a941d0fb5bf993ed18248e8975c4ca01310ff0099bc88c3b734298fe
+  data.tar.gz: e6312bdfccd80b1a19ffe5f8bb48a0c461bc71f0fa821fa1cd9b203780f72ab72c7c023e5bfa7e0b730eca3a1d596ddb312782d3c83a08326f83bd32107af010

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Unreleased
 
-[Compare master with v1.0.0](https://github.com/intrepidd/working_hours/compare/v1.0.0...master)
+[Compare master with v1.0.1](https://github.com/intrepidd/working_hours/compare/v1.0.1...master)
+
+# v1.0.1
+
+* Fix bug when calling ``1.working.hour.ago`` would return a time in your system zone instead of the configured time zone. This was due to a conversion to Time that loses the timezone information. We'll now return an ``ActiveSupport::TimeWithZone``.
+
+_10/10/2014_
 
 # v1.0.0
 
@@ -12,4 +18,4 @@ _15/09/2014_
 
 * First beta release
 
-_24/08/2014_
+_24/08/2014_

data/lib/working_hours/computation.rb

@@ -187,7 +187,6 @@ module WorkingHours
       case original
       when Date then time.to_date
       when DateTime then time.to_datetime
-      when Time then time.to_time
       else time
       end
     end

data/lib/working_hours/version.rb

@@ -1,3 +1,3 @@
 module WorkingHours
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/working_hours/computation_spec.rb

@@ -130,6 +130,11 @@ describe WorkingHours::Computation do
       expect(advance_to_working_time(Time.new(2014, 4, 7, 0, 0, 0 , "-09:00"))).to eq(Time.utc(2014, 4, 7, 9))
       expect(advance_to_working_time(Time.new(2014, 4, 7, 22, 0, 0 , "+02:00"))).to eq(Time.utc(2014, 4, 8, 9))
     end
+
+    it 'returns time in config zone' do
+      WorkingHours::Config.time_zone = 'Tokyo'
+      expect(advance_to_working_time(Time.new(2014, 4, 7, 0, 0, 0)).zone).to eq('JST')
+    end
   end
 
   describe '#return_to_working_time' do
@@ -162,6 +167,11 @@ describe WorkingHours::Computation do
       expect(return_to_working_time(Time.new(2014, 4, 7, 1, 0, 0 , "-09:00"))).to eq(Time.utc(2014, 4, 7, 10))
       expect(return_to_working_time(Time.new(2014, 4, 7, 22, 0, 0 , "+02:00"))).to eq(Time.utc(2014, 4, 7, 17))
     end
+
+    it 'returns time in config zone' do
+      WorkingHours::Config.time_zone = 'Tokyo'
+      expect(return_to_working_time(Time.new(2014, 4, 7, 1, 0, 0)).zone).to eq('JST')
+    end
   end
 
   describe '#working_day?' do

data/spec/working_hours/duration_spec.rb

@@ -57,6 +57,11 @@ describe WorkingHours::Duration do
     it "accepts reference time as argument" do
       expect(1.working.day.since(Time.utc(1991, 11, 15, 21))).to eq(Time.utc(1991, 11, 18, 21))
     end
+
+    it 'returns time in config zone' do
+      WorkingHours::Config.time_zone = 'Tokyo'
+      expect(7.working.days.from_now.zone).to eq('JST')
+    end
   end
 
   describe '#until' do
@@ -73,6 +78,11 @@ describe WorkingHours::Duration do
     it "accepts reference time as argument" do
       expect(7.working.day.until(Time.utc(1991, 11, 15, 21))).to eq(Time.utc(1991, 11, 6, 21))
     end
+
+    it 'returns time in config zone' do
+      WorkingHours::Config.time_zone = 'Tokyo'
+      expect(7.working.days.ago.zone).to eq('JST')
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: working_hours
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adrien Jarthon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport