sequel_bitemporal 0.3.1 → 0.4.0

data/Gemfile

@@ -1,2 +1,3 @@
 source "http://rubygems.org"
-gemspec
+gemspec
+gem "sequel", git: "https://github.com/jeremyevans/sequel.git"

data/lib/sequel/plugins/bitemporal.rb

@@ -33,10 +33,10 @@ module Sequel
         raise Error, "bitemporal plugin requires the following missing column#{"s" if missing.size>1} on version class: #{missing.join(", ")}" unless missing.empty?
         master.instance_eval do
           @version_class = version
-          @current_version_name = "#{name ? underscore(demodulize(name)) : table_name}_current_version".to_sym
+          @current_version_alias_name = "#{name ? underscore(demodulize(name)) : table_name}_current_version".to_sym
         end
         master.one_to_many :versions, class: version, key: :master_id
-        master.one_to_one master.current_version_name, class: version, key: :master_id, :graph_block=>(proc do |j, lj, js|
+        master.one_to_one :current_version, class: version, key: :master_id, graph_alias_base: master.current_version_alias_name, :graph_block=>(proc do |j, lj, js|
           t = ::Sequel::Plugins::Bitemporal.point_in_time
           n = ::Sequel::Plugins::Bitemporal.now
           e = :expired_at.qualify(j)
@@ -47,7 +47,7 @@ module Sequel
           ds.where{(created_at <= t) & ({expired_at=>nil} | (expired_at > t)) & (valid_from <= n) & (valid_to > n)}
         end
         master.def_dataset_method :with_current_version do
-          eager_graph(model.current_version_name).where({:id.qualify(model.current_version_name) => nil}.sql_negate)
+          eager_graph(:current_version).where({:id.qualify(model.current_version_alias_name) => nil}.sql_negate)
         end
         master.one_to_many :current_or_future_versions, class: version, key: :master_id, :graph_block=>(proc do |j, lj, js|
           t = ::Sequel::Plugins::Bitemporal.point_in_time
@@ -88,7 +88,7 @@ module Sequel
         end
       end
       module ClassMethods
-        attr_reader :version_class, :current_version_name
+        attr_reader :version_class, :current_version_alias_name
       end
       module DatasetMethods
       end
@@ -107,10 +107,6 @@ module Sequel
           end if pending_version && !pending_version.valid?
         end
 
-        def current_version(*args)
-          send(self.class.current_version_name, *args)
-        end
-        
         def pending_or_current_version
           pending_version || current_version
         end

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.3.1"
+  s.version     = "0.4.0"
   s.authors     = ["Joseph HALTER", "Jonathan TRON"]
   s.email       = ["joseph.halter@thetalentbox.com", "jonathan.tron@thetalentbox.com"]
   s.homepage    = "https://github.com/TalentBox/sequel_bitemporal"
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "sequel"
+  s.add_runtime_dependency "sequel", "~> 3.30.0"
 
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec", "~> 2.8.0.rc1" 

data/spec/bitemporal_date_spec.rb

@@ -46,7 +46,7 @@ describe "Sequel::Plugins::Bitemporal" do
   end
   it "checks required columns are present" do
     lambda{
-      @version_class.plugin :bitemporal, :version_class => @master_class
+      @version_class.plugin :bitemporal, version_class: @master_class
     }.should raise_error Sequel::Error, "bitemporal plugin requires the following missing columns on version class: master_id, valid_from, valid_to, created_at, expired_at"
   end
   it "propagates errors from version to master" do
@@ -296,10 +296,10 @@ describe "Sequel::Plugins::Bitemporal" do
     master = @master_class.new
     master.update_attributes name: "Single Standard", price: 98
     master.update_attributes name: "Single Standard", price: 94, valid_from: Date.today+2
-    @master_class.eager_graph(:rooms_current_version).where("rooms_current_version.id IS NOT NULL").first.should be
+    @master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first.should be
     Timecop.freeze Date.today+1
     master.destroy
-    @master_class.eager_graph(:rooms_current_version).where("rooms_current_version.id IS NOT NULL").first.should be_nil
+    @master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first.should be_nil
   end
   it "allows loading masters with a current version" do
     master_destroyed = @master_class.new
@@ -421,7 +421,7 @@ describe "Sequel::Plugins::Bitemporal" do
       plugin :bitemporal, version_class: MyNameVersion
     end
     expect do
-      MyName.eager_graph :my_name_current_version
+      MyName.eager_graph(:current_version).where("my_name_current_version.id IS NOT NULL").first
     end.not_to raise_error
     Object.send :remove_const, :MyName
     Object.send :remove_const, :MyNameVersion

data/spec/bitemporal_time_spec.rb

@@ -297,10 +297,10 @@ describe "Sequel::Plugins::Bitemporal" do
     master = @master_class.new
     master.update_attributes name: "Single Standard", price: 98
     master.update_attributes name: "Single Standard", price: 94, valid_from: Time.now+2*hour
-    @master_class.eager_graph(:current_version).where("current_version.id IS NOT NULL").first.should be
+    @master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first.should be
     Timecop.freeze Time.now+hour
     master.destroy
-    @master_class.eager_graph(:current_version).where("current_version.id IS NOT NULL").first.should be_nil
+    @master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first.should be_nil
   end
   it "allows loading masters with a current version" do
     master_destroyed = @master_class.new
@@ -364,4 +364,4 @@ describe "Sequel::Plugins::Bitemporal" do
     master_with_future.update_attributes name: "Single Standard", price: 94, valid_from: Time.now+2*hour
     @master_class.with_current_or_future_versions.all.should have(2).item
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
+date: 2011-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2154462680 !ruby/object:Gem::Requirement
+  requirement: &70323408143320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.30.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154462680
+  version_requirements: *70323408143320
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2154461840 !ruby/object:Gem::Requirement
+  requirement: &70323408141540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154461840
+  version_requirements: *70323408141540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154461340 !ruby/object:Gem::Requirement
+  requirement: &70323408139620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.8.0.rc1
   type: :development
   prerelease: false
-  version_requirements: *2154461340
+  version_requirements: *70323408139620
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2154460800 !ruby/object:Gem::Requirement
+  requirement: &70323408138300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154460800
+  version_requirements: *70323408138300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154460340 !ruby/object:Gem::Requirement
+  requirement: &70323408148700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154460340
+  version_requirements: *70323408148700
 description: Bitemporal versioning for sequel, fully tested.
 email:
 - joseph.halter@thetalentbox.com
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3713605019709846076
+      hash: -2408522317545363465
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3713605019709846076
+      hash: -2408522317545363465
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10