sequel_bitemporal 0.2.0 → 0.3.0

data/lib/sequel/plugins/bitemporal.rb

@@ -31,8 +31,12 @@ module Sequel
         required = [:master_id, :valid_from, :valid_to, :created_at, :expired_at]
         missing = required - version.columns
         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
+        end
         master.one_to_many :versions, class: version, key: :master_id
-        master.one_to_one :current_version, class: version, key: :master_id, :graph_block=>(proc do |j, lj, js|
+        master.one_to_one master.current_version_name, class: version, key: :master_id, :graph_block=>(proc do |j, lj, js|
           t = ::Sequel::Plugins::Bitemporal.point_in_time
           n = ::Sequel::Plugins::Bitemporal.now
           e = :expired_at.qualify(j)
@@ -43,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(:current_version).where({current_version__id: nil}.sql_negate)
+          eager_graph(model.current_version_name).where({:id.qualify(model.current_version_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
@@ -73,9 +77,6 @@ module Sequel
             master.destroy_version self
           end
         end
-        master.instance_eval do
-          @version_class = version
-        end
         unless opts[:delegate]==false
           (version.columns-required-[:id]).each do |column|
             master.class_eval <<-EOS
@@ -87,7 +88,7 @@ module Sequel
         end
       end
       module ClassMethods
-        attr_reader :version_class
+        attr_reader :version_class, :current_version_name
       end
       module DatasetMethods
       end
@@ -105,6 +106,10 @@ module Sequel
             key_errors.each{|error| errors.add key, error}
           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

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.2.0"
+  s.version     = "0.3.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"

data/spec/bitemporal_date_spec.rb

@@ -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(:current_version).where("current_version.id IS NOT NULL").first.should be
+    @master_class.eager_graph(:rooms_current_version).where("rooms_current_version.id IS NOT NULL").first.should be
     Timecop.freeze Date.today+1
     master.destroy
-    @master_class.eager_graph(:current_version).where("current_version.id IS NOT NULL").first.should be_nil
+    @master_class.eager_graph(:rooms_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
@@ -412,4 +412,18 @@ describe "Sequel::Plugins::Bitemporal" do
     master = without_delegation_class.new
     expect{ master.name }.to raise_error NoMethodError
   end
+  it "get current_version association name from class name" do
+    class MyNameVersion < Sequel::Model
+      set_dataset :room_versions
+    end
+    class MyName < Sequel::Model
+      set_dataset :rooms
+      plugin :bitemporal, version_class: MyNameVersion
+    end
+    expect do
+      MyName.eager_graph :my_name_current_version
+    end.not_to raise_error
+    Object.send :remove_const, :MyName
+    Object.send :remove_const, :MyNameVersion
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000 Z
+date: 2011-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2153258540 !ruby/object:Gem::Requirement
+  requirement: &2156745800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153258540
+  version_requirements: *2156745800
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153252000 !ruby/object:Gem::Requirement
+  requirement: &2156745360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153252000
+  version_requirements: *2156745360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153251140 !ruby/object:Gem::Requirement
+  requirement: &2156744860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.8.0.rc1
   type: :development
   prerelease: false
-  version_requirements: *2153251140
+  version_requirements: *2156744860
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2153250720 !ruby/object:Gem::Requirement
+  requirement: &2156744440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153250720
+  version_requirements: *2156744440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153250180 !ruby/object:Gem::Requirement
+  requirement: &2156743920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153250180
+  version_requirements: *2156743920
 description: Bitemporal versioning for sequel, fully tested.
 email:
 - joseph.halter@thetalentbox.com