acts_as_historical 0.0.4 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/acts_as_historical.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_historical}
-  s.version = "0.0.4"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hasclass"]

data/lib/acts_as_historical.rb

@@ -11,13 +11,12 @@ module ActsAsHistorical
     # 
     #
     # @option opts [Symbol] :date_column (:snapshot_date) the database column for the date of the record 
-    # @option opts [Symbol] :days (:all_days) what days are records valid. 
     # @option opts [Symbol] :scope (nil)
     #
     def acts_as_historical(opts = {})
       configuration = { 
-      #  :date_column => "snapshot_date",
-        :days => :all_days,
+        :date_column => "snapshot_date",
+        :
         :scope => nil
       }
       configuration.update(opts) if opts.is_a?(Hash)
@@ -25,12 +24,6 @@ module ActsAsHistorical
       send :include, InstanceMethods
       send :extend, DynamicClassMethods
       
-      case configuration[:days].to_sym
-      when :all_days
-        send :extend, AllDays::ClassMethods
-      when :weekdays
-        send :extend, WeekDays::ClassMethods
-      end
       self.cattr_accessor :historical_date_col, :historical_scope, :only_weekdays
       self.historical_date_col = 'snapshot_date' #configuration[:date_column]
       self.historical_scope    = configuration[:scope]
@@ -71,35 +64,53 @@ module ActsAsHistorical
         end
       }
 
-      named_scope :at_date, lambda {|date| {
-          :conditions => { :snapshot_date => date },
+      named_scope :on_date, lambda {|date| {
+          :conditions => { :snapshot_date => date.to_date },
           :limit => 1
       }}
 
       named_scope :between, lambda {|*args|
         from, to = args
         range = from.to_date..to.to_date
-        {
-          :conditions => {self.historical_date_col => range }
-      }}
-      
-      
+        { :conditions => {self.historical_date_col => range } }
+      }
+
       # nearest(date, 1)
       # nearest(date, (date_from..date_to))
       #
       named_scope :nearest, lambda {|*args| 
-        date = args.first.to_date
-        range = self.tolerance_to_range(date, args[1])
-        
+        date, tolerance = args
+        range = self.tolerance_to_range(date.to_date, tolerance)
         {
           :conditions => {self.historical_date_col => range},
-          :order => ["ABS(DATEDIFF(#{self.historical_date_col_sql}, '#{date.to_s(:db)}')) ASC"]
-      }}
+          :order => ["ABS(DATEDIFF(#{self.historical_date_col_sql}, '#{date.to_date.to_s(:db)}')) ASC"]
+        }
+      }
+
+      # Does not include date
+      # 
+      named_scope :upto, lambda {|date| 
+        raise "passed parameter does not respond_to? to_date" if date.respond_to?(:to_date)
+        { :conditions => ["#{self.historical_date_col_sql} < ?", date.to_date] }
+      }
+
+      # Includes date
+      #
+      named_scope :upto_including, lambda {|date| 
+        raise "passed parameter does not respond_to? to_date" if date.respond_to?(:to_date)
+        { :conditions => ["#{self.historical_date_col_sql} <= ?", date.to_date] }
+      }
+
+      named_scope :from, lambda {|date| 
+        raise "passed parameter does not respond_to? to_date" if date.respond_to?(:to_date)
+        { :conditions => ["#{self.historical_date_col_sql} > ?", date.to_date] }
+      }
+
+      named_scope :from_including, lambda {|date| 
+        raise "passed parameter does not respond_to? to_date" if date.respond_to?(:to_date)
+        { :conditions => ["#{self.historical_date_col_sql} >= ?", date.to_date] }
+      }
 
-      # TODO
-      named_scope :until
-      named_scope :from
-      
       named_scope :opt, lambda {|attributes_for_select| {:select => [:snapshot_date, attributes_for_select].flatten.uniq.join(', ') } }
 
       # validations
@@ -126,16 +137,12 @@ module ActsAsHistorical
 
   module InstanceMethods
     def valid_date?
-      if snapshot_date.nil?
-        errors.add_to_base('snapshot_date missing')
+      if self.to_date.nil?
+        errors.add_to_base('date missing')
         return false
       end
-      if self.class.only_weekdays and snapshot_date and snapshot_date.cwday >= 6
-        errors.add_to_base('snapshot_date is not a weekday')
-        return false
-      end
-      if self.snapshot_date >= Date.tomorrow
-        errors.add_to_base('snapshot_date is in future')
+      if self.to_date >= Date.tomorrow
+        errors.add_to_base('date is in future')
         return false
       end
       true
@@ -147,16 +154,16 @@ module ActsAsHistorical
     def to_date
       self.send(self.class.historical_date_col)
     end
-    
+
     private
     def find_record_at(date)
       self.class.at_date(date).same_scope(self).find(:first)
-    end    
-    
+    end
+
     def next_day; self.class.step_date(to_date,  1); end
     def prev_day; self.class.step_date(to_date, -1); end  
   end
-  
+
   module AllDays
     module ClassMethods
       def step_date(date, step_size)
@@ -164,19 +171,6 @@ module ActsAsHistorical
       end
     end
   end
-  
-  module WeekDays
-    module ClassMethods
-      def step_date(date, step_size)
-        date = date + step_size
-        while date.cwday > 5
-          date = step_size < 0 ? date - 1 : date + 1
-        end
-        date
-      end
-    end
-  end
-
 end
 
 ActiveRecord::Base.send :include, ActsAsHistorical

data/test/acts_as_historical_test.rb

@@ -7,10 +7,6 @@ class ActsAsHistoricalTest < ActiveSupport::TestCase
     acts_as_historical
   end
 
-  class RecordWeekday < ActiveRecord::Base
-    acts_as_historical :days => :weekdays
-  end
-  
   def test_schema_has_loaded_correctly 
     assert Record.all
   end 
@@ -71,83 +67,4 @@ class ActsAsHistoricalTest < ActiveSupport::TestCase
       end
     end
   end
-
-  context ":days => :weekdays" do
-    context "day present" do
-      setup {
-        RecordWeekday.delete_all
-        @old = RecordWeekday.create! :snapshot_date => Date.new(2009,12,4)
-        @new = RecordWeekday.create! :snapshot_date => Date.new(2009,12,7)
-      }
-      context "#previous" do
-        should "return record of previous weekday" do
-          assert_equal @old, @new.previous
-        end
-      end
-      context "#next" do
-        should "return record of next weekday" do
-          assert_equal @new, @old.next
-        end
-      end
-    end
-  
-    context "day missing" do
-      setup {
-        RecordWeekday.delete_all
-        @record = RecordWeekday.create! :snapshot_date => Date.new(2009,12,3)
-      }
-      context "#previous" do
-        should "return nil if record on previous weekday" do
-          assert_equal nil, @record.previous
-        end
-      end
-    
-      context "#next" do
-        should "return nil if record on next weekday" do
-          assert_equal nil, @record.next
-        end
-      end
-    end
-  end
-  
-  context ":days => :all_days" do
-    context "day present" do
-      setup {
-        Record.delete_all
-        @old = Record.create! :snapshot_date => Date.new(2009,12,3)
-        @new = Record.create! :snapshot_date => Date.new(2009,12,4)
-      }
-      context "#previous" do
-        should "return record of previous day" do
-          assert_equal @old, @new.previous
-        end
-      end
-      context "#next" do
-        should "return record of next day" do
-          assert_equal @new, @old.next
-        end
-      end
-    end
-  
-    context "day missing" do
-      setup {
-        Record.delete_all
-        @record = Record.create! :snapshot_date => Date.new(2009,12,3)
-      }
-      context "#previous" do
-        should "return nil if record on previous day" do
-          assert_equal nil, @record.previous
-        end
-      end
-    
-      context "#next" do
-        should "return nil if record on next day" do
-          assert_equal nil, @record.next
-        end
-      end
-    end
-  end
-
-
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_historical
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - hasclass