acts_as_historical 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/acts_as_historical.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_historical}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hasclass"]
@@ -31,7 +31,8 @@ Gem::Specification.new do |s|
      "test/acts_as_historical_test.rb",
      "test/database.yml",
      "test/schema.rb",
-     "test/test_helper.rb"
+     "test/test_helper.rb",
+     "test/weekday_test.rb"
   ]
   s.homepage = %q{http://github.com/hasclass/acts_as_historical}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -41,7 +42,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/acts_as_historical_test.rb",
      "test/schema.rb",
-     "test/test_helper.rb"
+     "test/test_helper.rb",
+     "test/weekday_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/acts_as_historical.rb

@@ -69,9 +69,11 @@ module ActsAsHistorical
           :limit => 1
       }}
 
+      # between(older_date, newer_date)
+      #
       named_scope :between, lambda {|*args|
         from, to = args
-        range = from.to_date..to.to_date
+        range = (from.to_date..to.to_date)
         { :conditions => {self.historical_date_col => range } }
       }
 
@@ -80,7 +82,7 @@ module ActsAsHistorical
       #
       named_scope :nearest, lambda {|*args| 
         date, tolerance = args
-        range = self.tolerance_to_range(date.to_date, tolerance)
+        range = self.tolerance_to_range(date, tolerance)
         {
           :conditions => {self.historical_date_col => range},
           :order => ["ABS(DATEDIFF(#{self.historical_date_col_sql}, '#{date.to_date.to_s(:db)}')) ASC"]
@@ -148,14 +150,21 @@ module ActsAsHistorical
       true
     end
 
-    def previous; find_record_at(to_date - 1);   end
-    def next;     find_record_at(to_date + 1);   end
+    def previous; find_record_at(snapshot_date - 1);   end
+    def next;     find_record_at(snapshot_date + 1);   end
+
+    # override with your date implementation. eg. Weekday
+    #
+    #def snapshot_date
+    #  self[self.class.historical_date_col]
+    #end
 
     def to_date
-      self.send(self.class.historical_date_col)
+      snapshot_date.to_date
     end
 
     private
+
     def find_record_at(date)
       self.class.on_date(date).same_scope(self).find(:first)
     end

data/test/schema.rb

@@ -1,8 +1,8 @@
 ActiveRecord::Schema.define(:version => 0) do  
   create_table :records, :force => true do |t|     
-    t.string :snapshot_date  
+    t.date :snapshot_date  
   end 
   create_table :record_weekdays, :force => true do |t|     
-    t.string :snapshot_date  
+    t.date :snapshot_date  
   end 
 end

data/test/weekday_test.rb

@@ -0,0 +1,62 @@
+require 'date_ext'
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class ActsAsHistoricalWeekdayTest < ActiveSupport::TestCase
+  load_schema 
+
+  
+  class Record < ActiveRecord::Base
+    acts_as_historical
+    def snapshot_date
+      date = super
+      date and date.to_weekday
+    end
+  end
+
+  context 'named_scopes with 5 weekdays' do
+    setup {
+      Record.delete_all
+      @fri = Weekday.new(2009,11,27)
+      @mon = Weekday.new(2009,11,30)
+      @tue = Weekday.new(2009,12,1)
+      @wed = Weekday.new(2009,12,2)
+      @thu = Weekday.new(2009,12,3)
+    
+      @r_fri = Record.create! :snapshot_date => @fri
+      @r_mon = Record.create! :snapshot_date => @mon
+      @r_tue = Record.create! :snapshot_date => @tue
+      @r_wed = Record.create! :snapshot_date => @wed
+      @r_thu = Record.create! :snapshot_date => @thu
+    }
+
+    context "snapshot_date" do
+      should "return weekday" do
+        assert_equal @mon, Record.find(@r_mon).snapshot_date
+      end
+    end
+
+    context "snapshots over weekend" do
+      should "return friday as previous of monday" do
+        assert_equal @r_fri, @r_mon.previous
+      end
+
+      should "return monday as next of friday" do
+        assert_equal @r_mon, @r_fri.next
+      end
+
+      should "include friday, monday, tuesday for nearest(monday, 1)" do
+        results = Record.nearest(@mon,1)
+        assert_equal 3, results.length
+        assert results.include?(@r_mon)
+        assert results.include?(@r_tue)
+        assert results.include?(@r_fri)
+      end
+    end
+    
+    context "tolerance over week" do
+      should "work" do
+        Record.tolerance_to_range(@mon, 1).include?(@fri)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_historical
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - hasclass
@@ -47,6 +47,7 @@ files:
 - test/database.yml
 - test/schema.rb
 - test/test_helper.rb
+- test/weekday_test.rb
 has_rdoc: true
 homepage: http://github.com/hasclass/acts_as_historical
 licenses: []
@@ -79,3 +80,4 @@ test_files:
 - test/acts_as_historical_test.rb
 - test/schema.rb
 - test/test_helper.rb
+- test/weekday_test.rb