kalendor 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1a98405233cee526a68ff9a982f998bc3c458ab
-  data.tar.gz: eea9b41b2f2c1bd20fd5bd9cfd6aba6ae0dcf34c
+  metadata.gz: 97a6837962ca266b30b478cf4914dfa97d3767b0
+  data.tar.gz: e48e46ba66ae1b2197bbabdf492d6ac2bb0c4551
 SHA512:
-  metadata.gz: aff0dcd7b9a2c5757bc8259b30d2be471a5e9329a6163313e905067ea3cbfd1c620623ca259ab35735bd26712fadf79db979178a3fbb144490f35dc8829c1f49
-  data.tar.gz: bb820ebd991659890c9baada02fff7bf82bec1f7ed8d1fd8a602a99f5046348e75537dcce5bddadd65593c029c4c3d6b432cd401a11582e8c835e7bf089455c0
+  metadata.gz: fb03842893c6239cb14fcbcdad293a5aa8017effa0e457b2c2880bc5f14cb27d0654f555f593f5cd5b2517716ea1234739d5a29f53c7cb961d4d393ee4d60b15
+  data.tar.gz: e38a91e96fb31279264a1991e915c405d29e51a2a7dc8c4583b3a922e683d4d1941604eb48323fa9bbd6b8bd1bc87f56bf18189056ebb0a0457656aaced5bfb0

data/.gitignore

@@ -32,3 +32,4 @@ bm.txt
 *.o
 *.a
 mkmf.log
+spec/examples.txt

data/.zeiger.yml

@@ -0,0 +1,28 @@
+search:
+  - "bin/**/*"
+  - "lib/**/*"
+  - "spec/**/*"
+  - "*.gemspec"
+  - ".*.yml"
+  - ".git?*"
+  - "Gemfile*"
+  - README
+ignore:
+  - .doc$
+  - .ods$
+  - .gz$
+  - .png$
+  - .gif$
+  - .zip$
+  - .jpg$
+  - .xcf$
+  - .pdf$
+  - /select2/.*.js$
+stats:
+  nydp:
+    - ".*\\.nydp"
+  code:
+    - "lib/.*\\.(rb|rake)"
+  test:
+    - "spec/.*"
+    - "test/.*"

data/lib/kalendor/interval.rb

@@ -2,7 +2,7 @@ module Kalendor
   module Interval
     include Instance
     def get_dates from, upto
-      Set.new([from, interval_from].max..[upto, interval_upto].min)
+      Set.new([from, interval_from || from].max..[upto, interval_upto || upto].min)
     end
   end
 end

data/lib/kalendor/named.rb

@@ -3,6 +3,6 @@ module Kalendor
     include Aduki::Initializer
     attr_accessor :name, :label, :kalendor
     def get_dates from, upto ; kalendor.get_dates from, upto ; end
-    def []                 m ; return name if m == :name     ; end
+    def _nydp_get          m ; return name if m == :name     ; end
   end
 end

data/lib/kalendor/subtract.rb

@@ -1,11 +1,11 @@
 module Kalendor
   module Subtract
     include DateHelper, Instance
-    def get_dates from, upto ;  _included_dates(from, upto) - _excluded_dates(from, upto) ; end
+    def get_dates from, upto ; in_dates(include_dates, from, upto) - ex_dates(exclude_dates, from, upto) ; end
 
     private
 
-    def _excluded_dates from, upto ; Set.new(exclude_dates.get_dates(from, upto)) ; end
-    def _included_dates from, upto ; Set.new(include_dates.get_dates(from, upto)) ; end
+    def in_dates cal, from, upto ; Set.new(cal ? cal.get_dates(from, upto) : (from..upto)) ; end
+    def ex_dates cal, from, upto ; Set.new(cal ? cal.get_dates(from, upto) : [])           ; end
   end
 end

data/lib/kalendor/version.rb

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

data/spec/interval_spec.rb

@@ -2,47 +2,62 @@ require 'kalendor'
 require 'kalendor/instance/interval'
 
 RSpec.describe Kalendor::Interval do
-  let(:interval) {
-    Kalendor.build { interval "2016-06-01", "2016-06-30" }
-  }
-
-  it "generates nothing when entirely before" do
-    f = date("2000-01-01")
-    u = date("2000-12-31")
-    expect(interval.get_dates(f, u).to_a).to eq []
-  end
+  describe "with nil start and finish dates" do
+    let(:interval) {
+      Kalendor.build { interval nil, nil }
+    }
 
-  it "generates some dates when overlapping before" do
-    f = date("2000-01-01")
-    u = date("2016-06-08")
-    expected = (1..8).map { |d| date("2016-06-0#{d}") }
-    expect(interval.get_dates(f, u).to_a).to eq expected
+    it "generates all of the given dates" do
+      f = date("2000-12-01")
+      u = date("2000-12-31")
+      expected = (1..31).map { |d| date("2000-12-#{d}") }
+      expect(interval.get_dates(f, u).to_a).to eq expected
+    end
   end
 
-  it "generates some dates when overlapping inside" do
-    f = date("2016-06-11")
-    u = date("2016-06-21")
-    expected = (11..21).map { |d| date("2016-06-#{d}") }
-    expect(interval.get_dates(f, u).to_a).to eq expected
-  end
+  describe "with a start and a finish date" do
+    let(:interval) {
+      Kalendor.build { interval "2016-06-01", "2016-06-30" }
+    }
 
-  it "generates all dates when overlapping outside" do
-    f = date("2016-01-01")
-    u = date("2016-12-31")
-    expected = (1..30).map { |d| date("2016-06-#{d}") }
-    expect(interval.get_dates(f, u).to_a).to eq expected
-  end
+    it "generates nothing when entirely before" do
+      f = date("2000-01-01")
+      u = date("2000-12-31")
+      expect(interval.get_dates(f, u).to_a).to eq []
+    end
 
-  it "generates some dates when overlapping after" do
-    f = date("2016-06-21")
-    u = date("2016-12-31")
-    expected = (21..30).map { |d| date("2016-06-#{d}") }
-    expect(interval.get_dates(f, u).to_a).to eq expected
-  end
+    it "generates some dates when overlapping before" do
+      f = date("2000-01-01")
+      u = date("2016-06-08")
+      expected = (1..8).map { |d| date("2016-06-0#{d}") }
+      expect(interval.get_dates(f, u).to_a).to eq expected
+    end
+
+    it "generates some dates when overlapping inside" do
+      f = date("2016-06-11")
+      u = date("2016-06-21")
+      expected = (11..21).map { |d| date("2016-06-#{d}") }
+      expect(interval.get_dates(f, u).to_a).to eq expected
+    end
+
+    it "generates all dates when overlapping outside" do
+      f = date("2016-01-01")
+      u = date("2016-12-31")
+      expected = (1..30).map { |d| date("2016-06-#{d}") }
+      expect(interval.get_dates(f, u).to_a).to eq expected
+    end
+
+    it "generates some dates when overlapping after" do
+      f = date("2016-06-21")
+      u = date("2016-12-31")
+      expected = (21..30).map { |d| date("2016-06-#{d}") }
+      expect(interval.get_dates(f, u).to_a).to eq expected
+    end
 
-  it "generates no dates when entirely after" do
-    f = date("2016-07-01")
-    u = date("2016-12-31")
-    expect(interval.get_dates(f, u).to_a).to eq []
+    it "generates no dates when entirely after" do
+      f = date("2016-07-01")
+      u = date("2016-12-31")
+      expect(interval.get_dates(f, u).to_a).to eq []
+    end
   end
 end

data/spec/subtract_spec.rb

@@ -23,4 +23,26 @@ RSpec.describe Kalendor::Subtract do
 
     expect(summer_workdays.get_dates(date("1999-01-01"), date("2020-12-31")).to_a).to eq workdays_in_summer_2016
   end
+
+  it "ignores nil exclude_dates" do
+    all_summer_long = Kalendor.build { subtract(interval("2016-06-01", "2016-08-31"), nil) }
+
+    days_in_jun_2016    = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30   ].map { |d| date("2016-06-#{d}") }
+    days_in_jul_2016    = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31].map { |d| date("2016-07-#{d}") }
+    days_in_aug_2016    = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31].map { |d| date("2016-08-#{d}") }
+    days_in_summer_2016 = days_in_jun_2016 + days_in_jul_2016 + days_in_aug_2016
+
+    expect(all_summer_long.get_dates(date("1999-01-01"), date("2020-12-31")).to_a).to eq days_in_summer_2016
+  end
+
+  it "ignores nil include_dates" do
+    no_weekends = Kalendor.build { subtract(nil, union(weekday(6), weekday(0))) }
+
+    weekdays_in_jun_2016    = [1,2,3,    6,7,8,9,10,      13,14,15,16,17,      20,21,22,23,24,      27,28,29,30   ].map { |d| date("2016-06-#{d}") }
+    weekdays_in_jul_2016    = [1,    4,5,6,7,8,     11,12,13,14,15,      18,19,20,21,22,      25,26,27,28,29      ].map { |d| date("2016-07-#{d}") }
+    weekdays_in_aug_2016    = [1,2,3,4,5,    8,9,10,11,12,      15,16,17,18,19,      22,23,24,25,26,      29,30,31].map { |d| date("2016-08-#{d}") }
+    weekdays_in_summer_2016 = weekdays_in_jun_2016 + weekdays_in_jul_2016 + weekdays_in_aug_2016
+
+    expect(no_weekends.get_dates(date("2016-06-01"), date("2016-08-31")).to_a).to eq weekdays_in_summer_2016
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalendor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Conan Dalton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-07 00:00:00.000000000 Z
+date: 2019-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aduki
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".zeiger.yml"
 - Gemfile
 - MIT-LICENSE.txt
 - README.md
@@ -121,7 +122,6 @@ files:
 - spec/annual_spec.rb
 - spec/date_list_spec.rb
 - spec/date_spec.rb
-- spec/examples.txt
 - spec/intersect_spec.rb
 - spec/interval_spec.rb
 - spec/month_spec.rb
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Utility classes for generating sets of dates
@@ -158,7 +158,6 @@ test_files:
 - spec/annual_spec.rb
 - spec/date_list_spec.rb
 - spec/date_spec.rb
-- spec/examples.txt
 - spec/intersect_spec.rb
 - spec/interval_spec.rb
 - spec/month_spec.rb

data/spec/examples.txt

@@ -1,34 +0,0 @@
-example_id                    | status | run_time        |
------------------------------ | ------ | --------------- |
-./spec/annual_spec.rb[1:1]    | passed | 0.00076 seconds |
-./spec/annual_spec.rb[1:2]    | passed | 0.00013 seconds |
-./spec/annual_spec.rb[1:3]    | passed | 0.00012 seconds |
-./spec/annual_spec.rb[1:4]    | passed | 0.00012 seconds |
-./spec/annual_spec.rb[1:5]    | passed | 0.00012 seconds |
-./spec/date_list_spec.rb[1:1] | passed | 0.0001 seconds  |
-./spec/date_list_spec.rb[1:2] | passed | 0.00015 seconds |
-./spec/date_list_spec.rb[1:3] | passed | 0.00017 seconds |
-./spec/date_spec.rb[1:1:1]    | passed | 0.00026 seconds |
-./spec/date_spec.rb[1:2:1]    | passed | 0.00068 seconds |
-./spec/date_spec.rb[1:3:1]    | passed | 0.00089 seconds |
-./spec/intersect_spec.rb[1:1] | passed | 0.00589 seconds |
-./spec/interval_spec.rb[1:1]  | passed | 0.00048 seconds |
-./spec/interval_spec.rb[1:2]  | passed | 0.0002 seconds  |
-./spec/interval_spec.rb[1:3]  | passed | 0.0002 seconds  |
-./spec/interval_spec.rb[1:4]  | passed | 0.00031 seconds |
-./spec/interval_spec.rb[1:5]  | passed | 0.00018 seconds |
-./spec/interval_spec.rb[1:6]  | passed | 0.00013 seconds |
-./spec/month_spec.rb[1:1]     | passed | 0.00843 seconds |
-./spec/month_spec.rb[1:2]     | passed | 0.00021 seconds |
-./spec/month_spec.rb[1:3]     | passed | 0.00021 seconds |
-./spec/month_spec.rb[1:4]     | passed | 0.00048 seconds |
-./spec/month_spec.rb[1:5]     | passed | 0.00016 seconds |
-./spec/month_spec.rb[1:6]     | passed | 0.00012 seconds |
-./spec/month_spec.rb[1:7]     | passed | 0.00197 seconds |
-./spec/subtract_spec.rb[1:1]  | passed | 0.01205 seconds |
-./spec/union_spec.rb[1:1]     | passed | 0.00034 seconds |
-./spec/union_spec.rb[1:2]     | passed | 0.00032 seconds |
-./spec/weekday_spec.rb[1:1]   | passed | 0.00012 seconds |
-./spec/weekday_spec.rb[1:2]   | passed | 0.00015 seconds |
-./spec/weekday_spec.rb[1:3]   | passed | 0.00021 seconds |
-./spec/weekday_spec.rb[1:4]   | passed | 0.00025 seconds |