sequel_bitemporal 0.4.10 → 0.4.11

data/lib/sequel/plugins/bitemporal.rb

@@ -1,30 +1,32 @@
 module Sequel
   module Plugins
     module Bitemporal
+      THREAD_POINT_IN_TIME_KEY = :sequel_plugins_bitemporal_point_in_time
       def self.as_we_knew_it(time)
+        previous = Thread.current[THREAD_POINT_IN_TIME_KEY]
         raise ArgumentError, "requires a block" unless block_given?
-        key = :sequel_plugins_bitemporal_point_in_time
-        previous, Thread.current[key] = Thread.current[key], time.to_time
-        result = yield
-        Thread.current[key] = previous
-        result
+        Thread.current[THREAD_POINT_IN_TIME_KEY] = time.to_time
+        yield
+      ensure
+        Thread.current[THREAD_POINT_IN_TIME_KEY] = previous
       end
 
       def self.point_in_time
-        Thread.current[:sequel_plugins_bitemporal_point_in_time] || Time.now
+        Thread.current[THREAD_POINT_IN_TIME_KEY] || Time.now
       end
 
-      def self.at(time)
+      THREAD_NOW_KEY = :sequel_plugins_bitemporal_now
+      def self.at(time)                                            
+        previous = Thread.current[THREAD_NOW_KEY]
         raise ArgumentError, "requires a block" unless block_given?
-        key = :sequel_plugins_bitemporal_now
-        previous, Thread.current[key] = Thread.current[key], time.to_time
-        result = yield
-        Thread.current[key] = previous
-        result
+        Thread.current[THREAD_NOW_KEY] = time.to_time
+        yield
+      ensure
+        Thread.current[THREAD_NOW_KEY] = previous
       end
 
       def self.now
-        Thread.current[:sequel_plugins_bitemporal_now] || Time.now
+        Thread.current[THREAD_NOW_KEY] || Time.now
       end
 
       def self.configure(master, opts = {})

data/sequel_bitemporal.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "sequel_bitemporal"
-  s.version     = "0.4.10"
+  s.version     = "0.4.11"
   s.authors     = ["Joseph HALTER", "Jonathan TRON"]
   s.email       = ["joseph.halter@thetalentbox.com", "jonathan.tron@thetalentbox.com"]
   s.homepage    = "https://github.com/TalentBox/sequel_bitemporal"

data/spec/bitemporal_date_spec.rb

@@ -387,6 +387,21 @@ describe "Sequel::Plugins::Bitemporal" do
       end
     end
   end
+  it "correctly reset time if failure when going back in time" do
+    before = Sequel::Plugins::Bitemporal.now
+    lambda do
+      Sequel::Plugins::Bitemporal.at(Date.today+2) do
+        raise StandardError, "error during back in time"
+      end
+    end.should raise_error StandardError
+    Sequel::Plugins::Bitemporal.now.should == before
+    lambda do
+      Sequel::Plugins::Bitemporal.as_we_knew_it(Date.today+2) do
+        raise StandardError, "error during back in time"
+      end
+    end.should raise_error StandardError
+    Sequel::Plugins::Bitemporal.now.should == before
+  end
   it "allows eager loading with conditions on current or future versions" do
     master = @master_class.new
     master.update_attributes name: "Single Standard", price: 98

data/spec/bitemporal_time_spec.rb

@@ -309,6 +309,21 @@ describe "Sequel::Plugins::Bitemporal" do
       master.current_version(true).price.should == 98
     end
   end
+  it "correctly reset time if failure when going back in time" do
+    before = Sequel::Plugins::Bitemporal.now
+    lambda do
+      Sequel::Plugins::Bitemporal.at(Time.now+1*hour) do
+        raise StandardError, "error during back in time"
+      end
+    end.should raise_error StandardError
+    Sequel::Plugins::Bitemporal.now.should == before
+    lambda do
+      Sequel::Plugins::Bitemporal.as_we_knew_it(Time.now-1*hour) do
+        raise StandardError, "error during back in time"
+      end
+    end.should raise_error StandardError
+    Sequel::Plugins::Bitemporal.now.should == before
+  end
   it "allows eager loading with conditions on current or future versions" do
     master = @master_class.new
     master.update_attributes name: "Single Standard", price: 98

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2831244389033292323
+      hash: -3307599890657545799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2831244389033292323
+      hash: -3307599890657545799
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24