activerecord_chronological_records 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/activerecord_chronological_records.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "activerecord_chronological_records"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Toms Mikoss"]
-  s.date = "2012-11-13"
+  s.date = "2012-11-14"
   s.description = "Provides a set of helper methods for dealing with chronological records that have common primary key and date columns denoting when the record is active (example: Oracle EBS tables)."
   s.email = "toms.mikoss@gmail.com"
   s.extra_rdoc_files = [

data/lib/activerecord_chronological_records.rb

@@ -6,9 +6,15 @@ module ActiverecordChronologicalRecords
       start_column, end_column = options[0], options[1]
     end
 
+    dealing_with_dates = columns.select{|c| [start_column, end_column].map(&:to_s).include? c.name}.all?{|c| c.type == :date}
+
+    query_start_column = "#{table_name}.#{start_column}"
+    query_end_column   = "#{table_name}.#{end_column}"
+    same_record_lookup = "#{self}.where(:#{primary_key} => self.#{primary_key})"
+
     self.instance_eval <<-EOS
       def effective_at(date)
-        where("(#{start_column} <= :date OR #{start_column} IS NULL) AND (#{end_column} >= :date OR #{end_column} IS NULL)", :date => date)
+        where("(#{query_start_column} <= :date OR #{query_start_column} IS NULL) AND (#{query_end_column} >= :date OR #{query_end_column} IS NULL)", :date => #{dealing_with_dates ? 'date.to_date' : 'date'})
       end
 
       def current
@@ -18,23 +24,15 @@ EOS
 
     self.class_eval <<-EOS
       def effective_at(date)
-        #{self}.effective_at(date).where(:#{primary_key} => self.#{primary_key}).first
-      end
-
-      def current
-        effective_at(Time.now)
-      end
-
-      def current?
-        (#{start_column}.blank? || #{start_column}.to_time <= Time.now) && (#{end_column}.blank? || #{end_column}.to_time >= Time.now)
+        #{same_record_lookup}.effective_at(date).first
       end
 
       def earliest
-        #{self}.where(:#{primary_key} => self.#{primary_key}).order("#{start_column} ASC").first
+        #{same_record_lookup}.order("#{query_start_column} ASC").first
       end
 
       def latest
-        #{self}.where(:#{primary_key} => self.#{primary_key}).order("#{start_column} DESC").first
+        #{same_record_lookup}.order("#{query_start_column} DESC").first
       end
 
       def previous
@@ -44,6 +42,14 @@ EOS
       def next
         effective_at(#{end_column} + 1.day)
       end
+
+      def current
+        effective_at(Time.now)
+      end
+
+      def current?
+        (#{start_column}.blank? || #{start_column}.to_time <= Time.now) && (#{end_column}.blank? || #{end_column}.to_time >= Time.now)
+      end
 EOS
   end
 end

data/spec/activerecord_chronological_records_spec.rb

@@ -1,29 +1,22 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "ActiverecordChronologicalRecords" do
+describe ActiverecordChronologicalRecords do
   def make_employee(attributes)
     Employee.new(attributes).tap{ |e| e.id = 1; e.save! }
   end
 
-  before(:all) do
-    Employee.rebuild_table do |t|
-      t.date :start_date
-      t.date :end_date
-    end
-
-    Employee.has_chronological_records
-  end
-
   shared_examples "scopes" do
     specify { Employee.current.all.should eq [@current_record] }
-    specify { Employee.effective_at(Date.today).all.should eq [@current_record] }
-    specify { Employee.effective_at(Date.today - 2.months).all.should eq [@first_record] }
-    specify { Employee.effective_at(Date.today + 2.months).all.should eq [@last_record] }
+    specify { Employee.effective_at(Date.today).should eq [@current_record] }
+    specify { Employee.effective_at(Date.today - 2.months).should eq [@first_record] }
+    specify { Employee.effective_at(Date.today + 2.months).should eq [@last_record] }
+    specify { Employee.effective_at(Date.today - 2.years).should be_empty }
   end
 
   shared_examples "navigation methods" do
     specify { @first_record.current.should eq @current_record }
     specify { @first_record.effective_at(Date.today).should eq @current_record }
+    specify { @first_record.effective_at(Date.today - 2.years).should be_nil }
     specify { @current_record.earliest.should eq @first_record }
     specify { @current_record.latest.should eq @last_record }
     specify { @current_record.previous.should eq @first_record }
@@ -37,7 +30,7 @@ describe "ActiverecordChronologicalRecords" do
 
   context "When start and end dates are present" do
     before(:all) do
-      Employee.destroy_all
+      Employee.delete_all
       @first_record   = make_employee(:start_date => Date.today - 1.year, :end_date => Date.today - 1.month - 1.day)
       @current_record = make_employee(:start_date => Date.today - 1.month, :end_date => Date.today + 1.month)
       @last_record    = make_employee(:start_date => Date.today + 1.month + 1.day, :end_date => Date.today + 1.year)
@@ -46,11 +39,13 @@ describe "ActiverecordChronologicalRecords" do
     include_examples "scopes"
     include_examples "navigation methods"
     include_examples "helper methods"
+
+    specify { Employee.effective_at(Date.today + 1.year + 1.day).should be_empty }
   end
 
   context "When last record does not have end date" do
     before(:all) do
-      Employee.destroy_all
+      Employee.delete_all
       @first_record   = make_employee(:start_date => Date.today - 1.year, :end_date => Date.today - 1.month - 1.day)
       @current_record = make_employee(:start_date => Date.today - 1.month, :end_date => Date.today + 1.month)
       @last_record    = make_employee(:start_date => Date.today + 1.month + 1.day, :end_date => nil)
@@ -60,4 +55,39 @@ describe "ActiverecordChronologicalRecords" do
     include_examples "navigation methods"
     include_examples "helper methods"
   end
+
+  context "when used in join and colums with same name are defined on both tables" do
+    before(:all) do
+      Project.delete_all
+      Employee.delete_all
+
+      @project = Project.create
+
+      @first_record   = make_employee(:project => @project, :start_date => Date.today - 1.year, :end_date => Date.today - 1.month - 1.day)
+      @current_record = make_employee(:project => @project, :start_date => Date.today - 1.month, :end_date => Date.today + 1.month)
+    end
+
+    specify { expect { @project.employees.current.all }.not_to raise_error }
+    specify { Employee.joins(:project).current.should eq [@current_record] }
+    specify { Employee.joins(:project).effective_at(Date.today - 2.months).should eq [@first_record] }
+  end
+
+  context "dealing with inclusion" do
+    before do
+      Employee.delete_all
+      Mood.delete_all
+    end
+
+    it "when end_date is date, current scope should include records that end today" do
+      employee = make_employee(:start_date => Date.today - 1.day, :end_date => Date.today)
+      sleep 1
+      Employee.current.should eq [employee]
+    end
+
+    it "when end_date is time, current scope should include records that have ended" do
+      mood = Mood.create(:start_time => Time.now - 1.minute, :end_time => Time.now)
+      sleep 1
+      Mood.current.should be_empty
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -13,17 +13,46 @@ ActiveRecord::Base.establish_connection(
   :database => "#{File.dirname(__FILE__)}/activerecord_chronological_records.db"
 )
 
+ActiveRecord::Schema.define do
+  self.verbose = false
+
+  create_table :projects, :force => true do |t|
+    t.date :start_date
+    t.date :end_date
+  end
+
+  create_table :employees, :force => true, :id => false do |t|
+    t.integer :id
+    t.references :project
+    t.date :start_date
+    t.date :end_date
+  end
+
+  create_table :moods, :force => true, :id => false do |t|
+    t.integer :id
+    t.references :employee
+    t.datetime :start_time
+    t.datetime :end_time
+  end
+end
+
+class Project < ActiveRecord::Base
+  has_many :employees
+end
+
 class Employee < ActiveRecord::Base
   self.primary_key = :id
 
-  def self.rebuild_table
-    ActiveRecord::Schema.define do
-      self.verbose = false
+  belongs_to :project
+  has_many :moods
 
-      create_table :employees, :force => true, :id => false do |t|
-        t.integer :id
-        yield t
-      end
-    end
-  end
+  has_chronological_records
+end
+
+class Mood < ActiveRecord::Base
+  self.primary_key = :id
+
+  belongs_to :employee
+
+  has_chronological_records :start_time, :end_time
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_chronological_records
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-13 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -126950927
+      hash: 829829455
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: