hiccup 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73e0335450c98c244067b003167f60fdba6539e0
-  data.tar.gz: cca4f04660cef3cd3e98e9ff8114c80233793bd7
+  metadata.gz: 7e951659bd70b7644903b02cf819b518632d0471
+  data.tar.gz: 8f34e327a9eebc719cc4729505133bcc38f6b09b
 SHA512:
-  metadata.gz: d84ff40e107f34bcb963f3b9be57bd41a5c7642258c982edf63d8b955d5e6065245c94cb4bc384b37eef8d79f493324e2fb3f9e613a3be3ef3de27105ed71aa4
-  data.tar.gz: e08c0c65406a0c1d4b82fd222e1058b76fa44103bd45bbb632be4b1269459344fc1499a75e60737681601ce27e86f27618462a3298261ed98fd35ba880fee6b4
+  metadata.gz: 506065cfc2ac111628892588c57b4cf5c6984d955ccec0a6be6945c74cb9030a8f090f711f12bbc944264ce9cf6900dfa433c6ce1c1544f662b0e9705c740d18
+  data.tar.gz: 89844952a547b7f52d991d50add128be4485db4921ba99b7f91f3decbeaddbdefe26901ec68b73945d846becccdfa2d98bcd2b6da58a3c93724f01036af8a42c

data/lib/hiccup/enumerable.rb

@@ -59,34 +59,36 @@ module Hiccup
     
     
     
-    def n_occurrences_before(limit, date)
-      n_occurrences_on_or_before(limit, date.to_date - 1)
+    def n_occurrences_before(limit, date, options={})
+      n_occurrences_on_or_before(limit, date.to_date - 1, options)
     end
     
-    def n_occurrences_on_or_before(limit, date)
+    def n_occurrences_on_or_before(limit, date, options={})
+      exceptions = options.fetch(:except, [])
       occurrences = []
       enum = enumerator.new(self, date)
       while (occurrence = enum.prev) && occurrences.length < limit
-        occurrences << occurrence
+        occurrences << occurrence unless exceptions.member?(occurrence)
       end
       occurrences
     end
     
     
     
-    def first_n_occurrences(limit)
-      n_occurrences_on_or_after(limit, start_date)
+    def first_n_occurrences(limit, options={})
+      n_occurrences_on_or_after(limit, start_date, options)
     end
     
-    def n_occurrences_after(limit, date)
-      n_occurrences_on_or_after(limit, date.to_date + 1)
+    def n_occurrences_after(limit, date, options={})
+      n_occurrences_on_or_after(limit, date.to_date + 1, options)
     end
     
-    def n_occurrences_on_or_after(limit, date)
+    def n_occurrences_on_or_after(limit, date, options={})
+      exceptions = options.fetch(:except, [])
       occurrences = []
       enum = enumerator.new(self, date)
       while (occurrence = enum.next) && occurrences.length < limit
-        occurrences << occurrence
+        occurrences << occurrence unless exceptions.member?(occurrence)
       end
       occurrences
     end

data/lib/hiccup/version.rb

@@ -1,3 +1,3 @@
 module Hiccup
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/test/enumerable_test.rb

@@ -3,6 +3,8 @@ require "test_helper"
 
 class EnumerableTest < ActiveSupport::TestCase
   include Hiccup
+
+  attr_reader :schedule
   
   
   
@@ -129,35 +131,78 @@ class EnumerableTest < ActiveSupport::TestCase
     assert schedule.contains?(expected_date)
   end
   
+
   
-  
-  def test_n_occurrences_before
-    schedule = Schedule.new({
-      :kind => :weekly,
-      :weekly_pattern => %w{Monday Wednesday Friday},
-      :start_date => Date.new(2009,3,15),
-      :ends => true,
-      :end_date => Date.new(2009,11,30)})
-    dates = schedule.n_occurrences_before(10, Date.new(2009, 10, 31)).map { |date| date.strftime("%Y-%m-%d") }
+  context "#n_occurrences_before" do
+    setup do
+      @schedule = Schedule.new({
+        :kind => :weekly,
+        :weekly_pattern => %w{Monday Wednesday Friday},
+        :start_date => Date.new(2009,3,15),
+        :ends => true,
+        :end_date => Date.new(2009,11,30)})
+    end
+
+    should "return the right dates" do
+      dates = schedule.n_occurrences_before(10, Date.new(2009, 10, 31)).map { |date| date.strftime("%Y-%m-%d") }
+      expected_dates = ["2009-10-30", "2009-10-28", "2009-10-26",
+                        "2009-10-23", "2009-10-21", "2009-10-19",
+                        "2009-10-16", "2009-10-14", "2009-10-12",
+                        "2009-10-09" ]
+      assert_equal expected_dates, dates, "Expected the dates for the correct occurrences"
+    end
     
-    expected_dates = ["2009-10-30", "2009-10-28", "2009-10-26",
-                      "2009-10-23", "2009-10-21", "2009-10-19",
-                      "2009-10-16", "2009-10-14", "2009-10-12",
-                      "2009-10-09" ]
-    assert_equal expected_dates, dates
+    should "return a shorter array if no events exist before the given date" do
+      dates = schedule.n_occurrences_before(10, Date.new(2009, 3, 20)).map { |date| date.strftime("%Y-%m-%d") }
+      
+      expected_dates = ["2009-03-18", "2009-03-16"]
+      assert_equal expected_dates, dates, "Expected the dates for the correct occurrences"
+    end
+
+    context "with blacklisted dates" do
+      should "still return the correct number of recurrences" do
+        dates = schedule.n_occurrences_before(3, Date.new(2009, 10, 31), except: [Date.new(2009, 10, 28)]).map { |date| date.strftime("%Y-%m-%d") }
+        assert_equal 3, dates.count, "Expected the same number of recurrences when blacklisting a date"
+        refute dates.member?("2009-10-28"), "Expected the blacklisted date to be omitted"
+        assert dates.member?("2009-10-23"), "Expected the next matching date to be included"
+      end
+    end
   end
-  
-  test "n_occurrences_before should return a shorter array if no events exist before the given date" do
-    schedule = Schedule.new({
-      :kind => :weekly,
-      :weekly_pattern => %w{Monday Wednesday Friday},
-      :start_date => Date.new(2009,3,15),
-      :ends => true,
-      :end_date => Date.new(2009,11,30)})
-    dates = schedule.n_occurrences_before(10, Date.new(2009, 3, 20)).map { |date| date.strftime("%Y-%m-%d") }
-    
-    expected_dates = ["2009-03-18", "2009-03-16"]
-    assert_equal expected_dates, dates
+
+  context "#n_occurrences_after" do
+    setup do
+      @schedule = Schedule.new({
+        :kind => :weekly,
+        :weekly_pattern => %w{Monday Wednesday Friday},
+        :start_date => Date.new(2009,3,15),
+        :ends => true,
+        :end_date => Date.new(2009,11,30)})
+    end
+
+    should "return the right dates" do
+      dates = schedule.n_occurrences_after(10, Date.new(2009, 10, 31)).map { |date| date.strftime("%Y-%m-%d") }
+      expected_dates = ["2009-11-02", "2009-11-04", "2009-11-06",
+                        "2009-11-09", "2009-11-11", "2009-11-13",
+                        "2009-11-16", "2009-11-18", "2009-11-20",
+                        "2009-11-23"]
+      assert_equal expected_dates, dates, "Expected the dates for the correct occurrences"
+    end
+
+    should "return a shorter array if no events exist before the given date" do
+      dates = schedule.n_occurrences_after(10, Date.new(2009, 11, 25)).map { |date| date.strftime("%Y-%m-%d") }
+
+      expected_dates = ["2009-11-27", "2009-11-30"]
+      assert_equal expected_dates, dates, "Expected the dates for the correct occurrences"
+    end
+
+    context "with blacklisted dates" do
+      should "still return the current number of recurrences" do
+        dates = schedule.n_occurrences_after(3, Date.new(2009, 10, 31), except: [Date.new(2009, 11, 4)]).map { |date| date.strftime("%Y-%m-%d") }
+        assert_equal 3, dates.count, "Expected the same number of recurrences when blacklisting a date"
+        refute dates.member?("2009-11-04"), "Expected the blacklisted date to be omitted"
+        assert dates.member?("2009-11-09"), "Expected the next matching date to be included"
+      end
+    end
   end
   
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiccup
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport