kalendor 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97a6837962ca266b30b478cf4914dfa97d3767b0
-  data.tar.gz: e48e46ba66ae1b2197bbabdf492d6ac2bb0c4551
+  metadata.gz: 8233c57889dc42f00dbd60c1710b90cfebbf9ac7
+  data.tar.gz: d1c5696401d654c0391a3e846439540255f4cf4d
 SHA512:
-  metadata.gz: fb03842893c6239cb14fcbcdad293a5aa8017effa0e457b2c2880bc5f14cb27d0654f555f593f5cd5b2517716ea1234739d5a29f53c7cb961d4d393ee4d60b15
-  data.tar.gz: e38a91e96fb31279264a1991e915c405d29e51a2a7dc8c4583b3a922e683d4d1941604eb48323fa9bbd6b8bd1bc87f56bf18189056ebb0a0457656aaced5bfb0
+  metadata.gz: c313972414214c589920aeb3948fa7452ce178cd67df4aa5e122c777226f81a4cb2bf6d83370b530e153e3a41c8f1e73950b056ea9ea38caceef34e7f3dec03b
+  data.tar.gz: fb37990fead79b1c33c5322b67281c913aad8ad0b8afa3e69031b4f2f96929492f37c86cf022bd91d619db9de8d35792dc1ae8016d28015a9bd64ced9db38d8c

data/kalendor.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             'aduki'
+  spec.add_dependency             'aduki',   ">= 0.2.7"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rspec', '>= 2.9'

data/lib/kalendor/factory.rb

@@ -1,10 +1,10 @@
 require "aduki"
 require "kalendor/date_helper"
-require "kalendor/named"
 require "kalendor/instance/date_list"
 require "kalendor/instance/weekday"
 require "kalendor/instance/annual"
 require "kalendor/instance/month"
+require "kalendor/instance/monthly"
 require "kalendor/instance/union"
 require "kalendor/instance/intersect"
 require "kalendor/instance/subtract"
@@ -14,20 +14,18 @@ module Kalendor
   class Factory
     include DateHelper
 
-    def named name, label, kal
-      Kalendor::Named.new name: name, label: label, kalendor: kal
-    end
-
     def annual date, month
       Kalendor::Instance::Annual.new annual_month: month, annual_date: date
     end
 
     def union *schedules
-      Kalendor::Instance::Union.new schedules: schedules
+      s = schedules.compact
+      s.length == 1 ? s[0] : Kalendor::Instance::Union.new(schedules: s)
     end
 
     def intersect *schedules
-      Kalendor::Instance::Intersect.new schedules: schedules
+      s = schedules.compact
+      s.length == 1 ? s[0] : Kalendor::Instance::Intersect.new(schedules: s)
     end
 
     def subtract x, y
@@ -50,6 +48,10 @@ module Kalendor
       Kalendor::Instance::Month.new month: n
     end
 
+    def monthly d
+      Kalendor::Instance::Monthly.new monthly_date: d
+    end
+
     def subtract? x, y ; y ? subtract(x, y) : x ; end
     alias date to_date
   end

data/lib/kalendor/instance.rb

@@ -1,4 +1,7 @@
 module Kalendor
   module Instance
+    class Base < Aduki::Initializable
+      attr_accessor :name, :label
+    end
   end
 end

data/lib/kalendor/instance/annual.rb

@@ -2,8 +2,8 @@ require 'kalendor/annual'
 
 module Kalendor
   module Instance
-    class Annual
-      include Aduki::Initializer, Kalendor::Annual
+    class Annual < Kalendor::Instance::Base
+      include Kalendor::Annual
       attr_accessor :annual_date, :annual_month
     end
   end

data/lib/kalendor/instance/composite.rb

@@ -1,7 +1,6 @@
 require 'aduki'
 require 'kalendor'
 
-class Kalendor::Instance::Composite
-  include Aduki::Initializer
+class Kalendor::Instance::Composite < Kalendor::Instance::Base
   attr_accessor :schedules
 end

data/lib/kalendor/instance/date_list.rb

@@ -2,8 +2,8 @@ require 'kalendor/date_list'
 
 module Kalendor
   module Instance
-    class DateList
-      include Aduki::Initializer, Kalendor::DateList
+    class DateList < Kalendor::Instance::Base
+      include Kalendor::DateList
       attr_accessor :dates
       def aduki_after_initialize ; self.dates = array_wrap(dates || []).map { |d| to_date d }.compact ; end
     end

data/lib/kalendor/instance/interval.rb

@@ -2,8 +2,8 @@ require 'kalendor/interval'
 
 module Kalendor
   module Instance
-    class Interval
-      include Aduki::Initializer, Kalendor::Interval
+    class Interval < Kalendor::Instance::Base
+      include Kalendor::Interval
       attr_accessor :interval_from, :interval_upto
     end
   end

data/lib/kalendor/instance/month.rb

@@ -2,8 +2,8 @@ require 'kalendor/month'
 
 module Kalendor
   module Instance
-    class Month
-      include Aduki::Initializer, Kalendor::Month
+    class Month < Kalendor::Instance::Base
+      include Kalendor::Month
       attr_accessor :month
     end
   end

data/lib/kalendor/instance/monthly.rb

@@ -0,0 +1,10 @@
+require 'kalendor/monthly'
+
+module Kalendor
+  module Instance
+    class Monthly < Kalendor::Instance::Base
+      include Kalendor::Monthly
+      attr_accessor :monthly_date
+    end
+  end
+end

data/lib/kalendor/instance/subtract.rb

@@ -2,8 +2,8 @@ require 'kalendor/subtract'
 
 module Kalendor
   module Instance
-    class Subtract
-      include Aduki::Initializer, Kalendor::Subtract
+    class Subtract < Kalendor::Instance::Base
+      include Kalendor::Subtract
       attr_accessor :include_dates, :exclude_dates
     end
   end

data/lib/kalendor/instance/weekday.rb

@@ -2,8 +2,8 @@ require 'kalendor'
 require 'kalendor/weekday'
 
 module Kalendor::Instance
-  class Weekday
-    include Aduki::Initializer, Kalendor::Weekday
+  class Weekday < Kalendor::Instance::Base
+    include Kalendor::Weekday
     attr_accessor :weekday, :nth_of_month
   end
 end

data/lib/kalendor/monthly.rb

@@ -0,0 +1,37 @@
+module Kalendor
+  module Monthly
+    include Instance
+    def advance_to_next_month date, monthly_date
+      m = date.month
+
+      #  j  f  m  a  m  j  j  a  s  o  n  d
+      # 31 28 31 30 31 30 31 31 30 31 30 31
+      # safe months are months (except december) followed by a 31-day month, we just increment the month
+      return Date.new(date.year, m + 1, date.day) if [2,4,6,7,9,11].include?(m)
+
+      # december is safe, we increment the year and set month to january
+      return Date.new(date.year + 1, 1, date.day) if m == 12
+
+
+      # m must be in [1,3,5,8,10], ie must be a 31-day month preceding a non-31-day month
+      # not sure if following month contains the required date
+
+      begin
+        Date.new(date.year, date.month + 1, monthly_date) # try advance one month
+      rescue
+        Date.new(date.year, date.month + 2, monthly_date) # otherwise advance two months
+      end
+    end
+
+    def get_dates from, upto
+      first = Date.new(from.year, from.month, monthly_date)
+      first = advance_to_next_month(first, monthly_date) if first < from
+      result = []
+      while first && (first <= upto)
+        result << first
+        first = advance_to_next_month(first, monthly_date)
+      end
+      result
+    end
+  end
+end

data/lib/kalendor/version.rb

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

data/spec/intersect_spec.rb

@@ -17,4 +17,16 @@ RSpec.describe Kalendor::Intersect do
 
     expect(summer_weekends.get_dates(date("1999-01-01"), date("2020-12-31")).to_a).to eq weekends_in_summer_2016
   end
+
+  it "ignores nil arguments" do
+    summer_weekends = Kalendor.build do
+      intersect(nil, union(weekday(6), weekday(7)), nil, nil)
+    end
+
+    weekends_in_jul_2016    = [30,31          ].map { |d| date("2016-07-#{d}") }
+    weekends_in_aug_2016    = [6,7,13,14,20,21].map { |d| date("2016-08-#{d}") }
+    weekends_in_summer_2016 = weekends_in_jul_2016 + weekends_in_aug_2016
+
+    expect(summer_weekends.get_dates(date("2016-07-29"), date("2016-08-26")).to_a).to eq weekends_in_summer_2016
+  end
 end

data/spec/monthly_spec.rb

@@ -0,0 +1,29 @@
+require 'kalendor'
+require 'kalendor/monthly'
+require 'kalendor/instance/monthly'
+
+RSpec.describe Kalendor::Monthly do
+  it "generates birthdays over a number of years" do
+    a = Kalendor.build { monthly 18 }
+    birthdays = a.get_dates(date("1960-01-01"), date("1960-05-31"))
+    expect(birthdays).to eq [date("1960-01-18"), date("1960-02-18"), date("1960-03-18"), date("1960-04-18"), date("1960-05-18"), ]
+  end
+
+  it "skips months that don't have the date" do
+    a = Kalendor.build { monthly 31 }
+    birthdays = a.get_dates(date("2020-01-01"), date("2020-08-31"))
+    expect(birthdays).to eq [date("2020-01-31"), date("2020-03-31"), date("2020-05-31"), date("2020-07-31"), date("2020-08-31"), ]
+  end
+
+  it "jumps to next month if to late for first month" do
+    a = Kalendor.build { monthly 18 }
+    birthdays = a.get_dates(date("1960-01-20"), date("1960-03-31"))
+    expect(birthdays).to eq [date("1960-02-18"), date("1960-03-18"), ]
+  end
+
+  it "returns nothing if period too small and before date" do
+    a = Kalendor.build { monthly 18 }
+    birthdays = a.get_dates(date("1960-10-20"), date("1960-11-10"))
+    expect(birthdays).to eq []
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalendor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2020-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aduki
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,7 @@ files:
 - lib/kalendor/instance/intersect.rb
 - lib/kalendor/instance/interval.rb
 - lib/kalendor/instance/month.rb
+- lib/kalendor/instance/monthly.rb
 - lib/kalendor/instance/store.rb
 - lib/kalendor/instance/subtract.rb
 - lib/kalendor/instance/union.rb
@@ -114,7 +115,7 @@ files:
 - lib/kalendor/intersect.rb
 - lib/kalendor/interval.rb
 - lib/kalendor/month.rb
-- lib/kalendor/named.rb
+- lib/kalendor/monthly.rb
 - lib/kalendor/subtract.rb
 - lib/kalendor/union.rb
 - lib/kalendor/version.rb
@@ -125,6 +126,7 @@ files:
 - spec/intersect_spec.rb
 - spec/interval_spec.rb
 - spec/month_spec.rb
+- spec/monthly_spec.rb
 - spec/spec_helper.rb
 - spec/subtract_spec.rb
 - spec/union_spec.rb
@@ -161,6 +163,7 @@ test_files:
 - spec/intersect_spec.rb
 - spec/interval_spec.rb
 - spec/month_spec.rb
+- spec/monthly_spec.rb
 - spec/spec_helper.rb
 - spec/subtract_spec.rb
 - spec/union_spec.rb

data/lib/kalendor/named.rb

@@ -1,8 +0,0 @@
-module Kalendor
-  class Named
-    include Aduki::Initializer
-    attr_accessor :name, :label, :kalendor
-    def get_dates from, upto ; kalendor.get_dates from, upto ; end
-    def _nydp_get          m ; return name if m == :name     ; end
-  end
-end