hiccup 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d10125513beb88e0c6c96db75cc928db898ad2f
-  data.tar.gz: fc07262a4ea66ef9d964f69e5a9d69971c2ee557
+  metadata.gz: 86859b5552e51f3c4bb91170033f32fb4cdf2c4e
+  data.tar.gz: 8987c7d7ae39b2c83dc109ac7f409f3f22d5d7dc
 SHA512:
-  metadata.gz: 72ab32b2d1fbaacf611d09063be2f223f322a4de8af2cb83c950a52b723d2ebdc6b6ae31281459d319d063e1a65d84dabd36befd07245909e9d694cf2c1718a3
-  data.tar.gz: bd3b19597a7ff8444ef1a51ac294e5bf1b56ef9d8d4473419d799adb87662638bd602939b8026a2fd0674592d5e3a21648775f57372921144f0580494df9d376
+  metadata.gz: 68dc0bbf57fba21d13aae5c6786ff679761f690fbc1e6ed05c382d698150e59d4501317f74d84e21fdb8825ef47fed0d362215b4d628d9fcf85f9f15905ebc1e
+  data.tar.gz: eb01df9e219e4a0a38fdd79fd7e5c63fae0a8def9ca1c5b0db745a9e562615566154aa03719178ea847a8345ae8586c8b507e943cc326ab90bd8bdf97ac99272

data/lib/hiccup/enumerable.rb

@@ -17,9 +17,6 @@ module Hiccup
     
     
     def occurrences_between(earlier_date, later_date)
-      return [] if ends? && earlier_date > end_date
-      return [] if later_date < start_date
-      
       occurrences = []
       enum = enumerator.new(self, earlier_date)
       while (occurrence = enum.next) && (occurrence <= later_date)
@@ -31,7 +28,6 @@ module Hiccup
     
     
     def first_occurrence_on_or_after(date)
-      return nil if ends? && date > end_date
       enumerator.new(self, date).next
     end
     
@@ -43,7 +39,6 @@ module Hiccup
     
     
     def first_occurrence_on_or_before(date)
-      return nil if date < start_date
       enumerator.new(self, date).prev
     end
     
@@ -67,8 +62,6 @@ module Hiccup
     end
     
     def n_occurrences_on_or_before(limit, date)
-      return [] if date < start_date
-      
       occurrences = []
       enum = enumerator.new(self, date)
       while (occurrence = enum.prev) && occurrences.length < limit
@@ -88,8 +81,6 @@ module Hiccup
     end
     
     def n_occurrences_on_or_after(limit, date)
-      return [] if ends? and date > end_date
-      
       occurrences = []
       enum = enumerator.new(self, date)
       while (occurrence = enum.next) && occurrences.length < limit

data/lib/hiccup/enumerable/annually_enumerator.rb

@@ -7,40 +7,42 @@ module Hiccup
       def initialize(*args)
         super
         @month, @day = start_date.month, start_date.day
-        @february_29 = month == 2 and day == 29
+        
+        if month == 2 and day == 29
+          def self.current_date
+            Date.new(year, 2, leap_year?(year) ? 29 : 28)
+          end
+        end
       end
       
-    protected
-      
+      attr_reader :month, :day
       
-      attr_reader :month, :day, :year
+    protected
       
-      def february_29?
-        @february_29
-      end
+      attr_reader :year
       
       
       
       def advance!
         @year += skip
-        to_date!
+        current_date
       end
       
       def rewind!
         @year -= skip
-        to_date!
+        current_date
       end
       
       
       
       def first_occurrence_on_or_after(date)
         @year = date.year
-        @year += skip if (date.month > month) or (date.month == month and date.day > day)
+        @year += 1 if (date.month > month) or (date.month == month and date.day > day)
         
         remainder = (@year - start_date.year) % skip
         @year += (skip - remainder) if remainder > 0
         
-        to_date!
+        current_date
       end
       
       def first_occurrence_on_or_before(date)
@@ -50,13 +52,12 @@ module Hiccup
         remainder = (@year - start_date.year) % skip
         @year -= remainder if remainder > 0
         
-        to_date!
+        current_date
       end
       
       
       
-      def to_date!
-        return Date.new(year, month, 28) if february_29? and !leap_year?(year)
+      def current_date
         Date.new(year, month, day)
       end
       

data/lib/hiccup/enumerable/never_enumerator.rb

@@ -5,12 +5,21 @@ module Hiccup
     class NeverEnumerator < ScheduleEnumerator
       
       
+      def next
+        @cursor = @cursor ? nil : first_occurrence_on_or_after(seed_date)
+      end
+      
+      def prev
+        @cursor = @cursor ? nil : first_occurrence_on_or_before(seed_date)
+      end
+      
+      
       def first_occurrence_on_or_after(date)
-        date if date == start_date
+        start_date if date <= start_date
       end
       
       def first_occurrence_on_or_before(date)
-        date
+        start_date unless date < start_date
       end
       
       

data/lib/hiccup/enumerable/schedule_enumerator.rb

@@ -1,4 +1,3 @@
-
 module Hiccup
   module Enumerable
     class ScheduleEnumerator
@@ -19,8 +18,6 @@ module Hiccup
         @ends = schedule.ends?
         @seed_date = seed_date
         @seed_date = seed_date.to_date if seed_date.respond_to?(:to_date)
-        @seed_date = start_date if (seed_date < start_date)
-        @seed_date = end_date if (ends? && seed_date > end_date)
         @cursor = nil
       end
       
@@ -29,13 +26,13 @@ module Hiccup
       
       
       def next
-        @cursor = started? ? advance! : first_occurrence_on_or_after(seed_date)
+        @cursor = started? ? advance! : first_occurrence_on_or_after(seed_start_date)
         return nil if ends? && @cursor > end_date
         @cursor
       end
       
       def prev
-        @cursor = started? ? rewind! : first_occurrence_on_or_before(seed_date)
+        @cursor = started? ? rewind! : first_occurrence_on_or_before(seed_end_date)
         return nil if @cursor < start_date
         @cursor
       end
@@ -68,6 +65,18 @@ module Hiccup
       
       
       
+      def seed_start_date
+        return start_date if (seed_date < start_date)
+        seed_date
+      end
+      
+      def seed_end_date
+        return end_date if (ends? && seed_date > end_date)
+        seed_date
+      end
+      
+      
+      
       # These two methods DO assume that
       # date is predicted by the given schedule
       # Subclasses can probably supply more

data/lib/hiccup/version.rb

@@ -1,3 +1,3 @@
 module Hiccup
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiccup
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -171,7 +171,7 @@ files:
 - test/performance_test.rb
 - test/test_helper.rb
 - test/validatable_test.rb
-- test/weekly_enumerator_test_test.rb
+- test/weekly_enumerator_test.rb
 homepage: http://boblail.github.com/hiccup/
 licenses: []
 metadata: {}
@@ -206,4 +206,4 @@ test_files:
 - test/performance_test.rb
 - test/test_helper.rb
 - test/validatable_test.rb
-- test/weekly_enumerator_test_test.rb
+- test/weekly_enumerator_test.rb