hiccup 0.5.18 → 0.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b2f49ba420f01d88054405099c8018481fbd287
-  data.tar.gz: 238c4d45fefd07b91b72ec70c8cd43c23a324e40
+  metadata.gz: f309cbeec6d69a8c8fd3577a5df9b8b96e22ccd4
+  data.tar.gz: a3cc99a866dcdb0a414bdc8d802289e033f89286
 SHA512:
-  metadata.gz: f6b93567956cd2211d490e8aea9533c4f18cbb2f5262f9ecf97e94084c31aa0261071bd9b345b19fa45ed97b9c15d90ffe710fd5fcd5fa9ae3d312e72bab782b
-  data.tar.gz: 8bfbda4a4ba9b3d338d4b579cbe86f3b1fceffab2bb3f6f153d22854d1d4516054d0a0c193b136c8551e8fb94573580b07d881a48c4168f0f55e8ae0b5c7a355
+  metadata.gz: f1f5fc8cfa1d4c175acabc66ffaf0f6920090da237515622d3d8c1b7384cd8010bec40fe981f31b65bf77a1536367641ff923a41852c907d1fd0643a3b283ec5
+  data.tar.gz: c479e685962de09343e830d8a606ca1c83a162b24bd747f33ee197b8228be01b1335ed6f674f00db69ac805d1951927c647a0cb90ba2e6bc16a5afda49da0bc7

data/lib/hiccup/enumerable/monthly_enumerator.rb

@@ -122,7 +122,7 @@ module Hiccup
           else
             coerce_day_to_positive(occurrence)
           end
-        end
+        end.uniq
       end
 
 

data/lib/hiccup/enumerable/weekly_enumerator.rb

@@ -9,7 +9,7 @@ module Hiccup
 
         @wday_pattern = weekly_pattern.map do |weekday|
           Date::DAYNAMES.index(weekday)
-        end.sort
+        end.sort.uniq
 
         if @wday_pattern.empty?
           @base_date = start_date

data/lib/hiccup/version.rb

@@ -1,3 +1,3 @@
 module Hiccup
-  VERSION = "0.5.18"
+  VERSION = "0.5.19"
 end

data/test/enumerable_test.rb

@@ -460,6 +460,49 @@ class EnumerableTest < ActiveSupport::TestCase
 
 
 
+  context "Duplication:" do
+    context "A weekly schedule that lists the same day twice" do
+      setup do
+        @schedule = Schedule.new(
+          kind: :weekly,
+          start_date: Date.new(2015, 1, 1),
+          weekly_pattern: %w{Monday Monday})
+      end
+
+      should "not enumerate that date more than once" do
+        assert_equal [5, 12, 19, 26], occurrences_during_month(schedule, 2015, 1).map(&:day)
+      end
+    end
+
+    context "A monthly (by-weekday) schedule that lists the same day twice" do
+      setup do
+        @schedule = Schedule.new(
+          kind: :monthly,
+          start_date: Date.new(2015, 1, 1),
+          monthly_pattern: [[3, "Monday"], [3, "Monday"]])
+      end
+
+      should "not enumerate that date more than once" do
+        assert_equal [19], occurrences_during_month(schedule, 2015, 1).map(&:day)
+      end
+    end
+
+    context "A monthly (by-day) schedule that lists the same day twice" do
+      setup do
+        @schedule = Schedule.new(
+          kind: :monthly,
+          start_date: Date.new(2015, 1, 1),
+          monthly_pattern: [3, 5])
+      end
+
+      should "not enumerate that date more than once" do
+        assert_equal [3, 5], occurrences_during_month(schedule, 2015, 1).map(&:day)
+      end
+    end
+  end
+
+
+
   if ENV['PERFORMANCE_TEST']
     test "performance test" do
       n = 1000

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiccup
 version: !ruby/object:Gem::Version
-  version: 0.5.18
+  version: 0.5.19
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport