acts_as_historical 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/acts_as_historical.gemspec

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

data/lib/acts_as_historical.rb

@@ -16,7 +16,6 @@ module ActsAsHistorical
     def acts_as_historical(opts = {})
       configuration = { 
         :date_column => "snapshot_date",
-        :
         :scope => nil
       }
       configuration.update(opts) if opts.is_a?(Hash)
@@ -90,24 +89,24 @@ module ActsAsHistorical
       # Does not include date
       # 
       named_scope :upto, lambda {|date| 
-        raise "passed parameter does not respond_to? to_date" if date.respond_to?(:to_date)
+        raise "passed parameter does not respond_to? to_date" unless 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)
+        raise "passed parameter does not respond_to? to_date" unless 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)
+        raise "passed parameter does not respond_to? to_date" unless 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)
+        raise "passed parameter does not respond_to? to_date" unless date.respond_to?(:to_date)
         { :conditions => ["#{self.historical_date_col_sql} >= ?", date.to_date] }
       }
 
@@ -147,9 +146,9 @@ module ActsAsHistorical
       end
       true
     end
-    
-    def previous; find_record_at(prev_day);   end
-    def next;     find_record_at(next_day);   end
+
+    def previous; find_record_at(to_date - 1);   end
+    def next;     find_record_at(to_date + 1);   end
 
     def to_date
       self.send(self.class.historical_date_col)
@@ -159,17 +158,6 @@ module ActsAsHistorical
     def find_record_at(date)
       self.class.at_date(date).same_scope(self).find(:first)
     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)
-        date + step_size
-      end
-    end
   end
 end
 

data/test/acts_as_historical_test.rb

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class ActsAsHistoricalTest < ActiveSupport::TestCase
   load_schema 
+
   
   class Record < ActiveRecord::Base
     acts_as_historical
@@ -35,7 +36,42 @@ class ActsAsHistoricalTest < ActiveSupport::TestCase
     should "create 5 records" do
       assert_equal 5, Record.count
     end
-    
+
+    context "upto" do
+      should "return records upto date excluding date" do
+        assert Record.upto(@tue).include?(@r_mon)
+        assert !Record.upto(@tue).include?(@r_tue)
+        assert !Record.upto(@tue).include?(@r_wed)
+      end
+    end
+
+    context "upto_including" do
+      should "return records upto and including given date" do
+        records = Record.upto_including(@tue)
+        assert  records.include?(@r_mon)
+        assert  records.include?(@r_tue)
+        assert !records.include?(@r_wed)
+      end
+    end
+
+    context "from_including" do
+      should "return records from including given date" do
+        records = Record.from_including(@tue)
+        assert !records.include?(@r_mon)
+        assert  records.include?(@r_tue)
+        assert  records.include?(@r_wed)
+      end
+    end
+
+    context "from" do
+      should "return records from excluding given date" do
+        records = Record.from(@tue)
+        assert !records.include?(@r_mon)
+        assert !records.include?(@r_tue)
+        assert  records.include?(@r_wed)
+      end
+    end
+
     context "nearest" do
       should "always return monday no matter what tolerance range" do
         assert_equal @r_mon, Record.nearest(@mon-1, 1).first
@@ -51,7 +87,7 @@ class ActsAsHistoricalTest < ActiveSupport::TestCase
       end
     end
   
-    context "within" do
+    context "between" do
       setup { @records = Record.between(@tue, @wed)}
       
       should "include only days within range" do
@@ -63,7 +99,7 @@ class ActsAsHistoricalTest < ActiveSupport::TestCase
       end
       
       should "return record when range start and end are the same" do
-        assert  Record.between(@mon, @mon).include?(@r_mon)
+        assert Record.between(@mon, @mon).include?(@r_mon)
       end
     end
   end

data/test/test_helper.rb

@@ -31,4 +31,8 @@ def load_schema
 
   load(File.dirname(__FILE__) + "/schema.rb")
   require File.dirname(__FILE__) + '/../rails/init.rb'
-end
+end
+
+class Date
+  def to_date(); self; end
+end

metadata

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