kalendor 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8233c57889dc42f00dbd60c1710b90cfebbf9ac7
-  data.tar.gz: d1c5696401d654c0391a3e846439540255f4cf4d
+SHA256:
+  metadata.gz: 8444d0694397d073104ded49efd8c0f3d67cd4a2cff9227214b35c9cc2a01b34
+  data.tar.gz: 488d82824e4643d8802f4a6707bd074ff74973e8c12ac14fc6c890ebcfc67565
 SHA512:
-  metadata.gz: c313972414214c589920aeb3948fa7452ce178cd67df4aa5e122c777226f81a4cb2bf6d83370b530e153e3a41c8f1e73950b056ea9ea38caceef34e7f3dec03b
-  data.tar.gz: fb37990fead79b1c33c5322b67281c913aad8ad0b8afa3e69031b4f2f96929492f37c86cf022bd91d619db9de8d35792dc1ae8016d28015a9bd64ced9db38d8c
+  metadata.gz: a9599ebca8914d341d2c94acc78461131d5aadbfa869599bad0902e045427ee2b673c6bf5bdc880ad2a5bd1badf4415af2f18f62234ad26d191cae9898364ac2
+  data.tar.gz: 180e1b7ed41294247dffd69ef5ed0e52ca50ef80a343398c105fde2ebe13044a58b29bc24944622f5484fb772a12876c10f850ba4e3632e455e59d0b3729a357

data/lib/kalendor/factory.rb

@@ -52,6 +52,10 @@ module Kalendor
       Kalendor::Instance::Monthly.new monthly_date: d
     end
 
+    def append existing, other
+      existing.append other
+    end
+
     def subtract? x, y ; y ? subtract(x, y) : x ; end
     alias date to_date
   end

data/lib/kalendor/instance/union.rb

@@ -3,4 +3,7 @@ require "kalendor/instance/composite"
 
 class Kalendor::Instance::Union < Kalendor::Instance::Composite
   include Kalendor::Union
+  def append other
+    self.class.new name: name, label: label, schedules: [other, *schedules]
+  end
 end

data/lib/kalendor/instance.rb

@@ -2,6 +2,23 @@ module Kalendor
   module Instance
     class Base < Aduki::Initializable
       attr_accessor :name, :label
+
+      def append other
+        me = self
+        Kalendor.build { union me, other }
+      end
+
+      def union *others
+        Kalendor::Instance::Union.new(schedules: [self, *others])
+      end
+
+      def intersect *others
+        Kalendor::Instance::Intersect.new(schedules: [self, *others])
+      end
+
+      def subtract other
+        Kalendor::Instance::Subtract.new include_dates: self, exclude_dates: other
+      end
     end
   end
 end

data/lib/kalendor/version.rb

@@ -1,3 +1,3 @@
 module Kalendor
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/append_spec.rb

@@ -0,0 +1,32 @@
+require 'kalendor'
+require 'kalendor/instance/annual'
+require 'kalendor/instance/union'
+require 'kalendor/instance/weekday'
+
+RSpec.describe "#append" do
+  it "produces every weekend in oct - dec 2016" do
+    sats = Kalendor.build { weekday(6) }
+    suns = Kalendor.build { weekday(7) }
+
+    weekends = Kalendor.build { append sats, suns }
+
+    weekends_in_oct_2016 = [1,2,8,9,15,16,22,23,29,30].map { |d| date("2016-10-#{d}") }
+    weekends_in_nov_2016 = [5,6,12,13,19,20,26,27    ].map { |d| date("2016-11-#{d}") }
+    weekends_in_dec_2016 = [3,4,10,11,17,18,24,25,31 ].map { |d| date("2016-12-#{d}") }
+    weekends_in_end_2016 = weekends_in_oct_2016 + weekends_in_nov_2016 + weekends_in_dec_2016
+
+    expect(weekends.get_dates date("2016-10-01"), date("2016-12-31")).to eq weekends_in_end_2016
+  end
+
+  it "appends to a union" do
+    mix = Kalendor.build { union annual(12,3), annual(21,6), annual(8,6) }
+
+    more = Kalendor.build { append mix, annual(18,11) }
+
+    bd2015 = %w{ 2015-03-12 2015-06-08 2015-06-21 2015-11-18 }
+    bd2016 = %w{ 2016-03-12 2016-06-08 2016-06-21 2016-11-18 }
+    expected = (bd2015 + bd2016).map { |d| date d }.sort
+
+    expect(more.get_dates date("2015-01-01"), date("2016-12-31")).to eq expected
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalendor
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aduki
@@ -121,6 +121,7 @@ files:
 - lib/kalendor/version.rb
 - lib/kalendor/weekday.rb
 - spec/annual_spec.rb
+- spec/append_spec.rb
 - spec/date_list_spec.rb
 - spec/date_spec.rb
 - spec/intersect_spec.rb
@@ -151,13 +152,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Utility classes for generating sets of dates
 test_files:
 - spec/annual_spec.rb
+- spec/append_spec.rb
 - spec/date_list_spec.rb
 - spec/date_spec.rb
 - spec/intersect_spec.rb