fat_core 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6265d2bbcfe0ee522067acb075b37f2c7ce1816e
-  data.tar.gz: 7cf60313a4f3c6bffadaf34323c4a1062c94b0f7
+  metadata.gz: f129c833ebff73231353110dd8c50fa422eb58f3
+  data.tar.gz: a19d2bdd83e040c1ca84553f6172ebb03e56d856
 SHA512:
-  metadata.gz: ee91782de7b7d4d88c908b28bc8d751536ebf7b4e4c13784e8bfdbe55134f818d66b4b4d4eb2a1b98deee2d8a1b3e16658926bf608c962a4aadf52e84ea2b827
-  data.tar.gz: 7f4bdba721092863f11cdc7239c4ef58fc019a11c63acef78356d159dc578c3889dcca9850c5bece7acd4665e4dbe3ce2345637c56ce6bc6dbddeb3c0b8b2ed9
+  metadata.gz: 990d55b6ab2802c6a39f372221ee0cc382e9b4bd583246c296008569982886d7ab0fd230696d18a3a829159e18c8fb2a7d41691e0c72575e780b77627be03817
+  data.tar.gz: 6ab08c520c375249c17addca5c74039c244ac75fe53128faac21135f3f13014780de403abb165db6fa6c0c89c1f7a37e1a2012152673ca0da9aa1d2951b5728b

data/lib/fat_core/ChangeLog

@@ -0,0 +1,4 @@
+2014-09-04  Daniel E. Doherty  <ded-law@ddoherty.net>
+
+        * range.rb (Range#left_contiguous, Range#overlaps): test overlap
+        for both orders of arguments (self, other) and (other, self).

data/lib/fat_core/period.rb

@@ -314,6 +314,12 @@ class Period
   end
 
   def contains?(date)
+    if date.respond_to?(:to_date)
+      date = date.to_date
+    end
+    unless (date.is_a? Date)
+      raise ArgumentError, "argument must be a Date"
+    end
     self.to_range.cover?(date)
   end
 

data/lib/fat_core/range.rb

@@ -50,7 +50,8 @@ class Range
   end
 
   def overlaps?(other)
-    cover?(other.min) || cover?(other.max)
+    (cover?(other.min) || cover?(other.max) ||
+     other.cover?(min) || other.cover?(max))
   end
 
   def intersection(other)

data/lib/fat_core/version.rb

@@ -1,3 +1,7 @@
 module FatCore
-  VERSION = "0.1.1"
+  MAJOR = 0
+  MINOR = 1
+  PATCH = 2
+
+  VERSION = [MAJOR, MINOR, PATCH].compact.join('.')
 end

data/spec/lib/period_spec.rb

@@ -15,7 +15,7 @@ describe Period do
     end
 
     it "should be initializable with Dates" do
-      expect(Period.new(Date.parse('2013-01-01'), Date.parse('2013-12-13'))).
+      expect(Period.new('2013-01-01', '2013-12-13')).
         to be_instance_of Period
     end
 
@@ -101,7 +101,7 @@ describe Period do
       rr = Period.new('2013-01-01', '2013-12-31').to_range
       expect(rr).to be_instance_of Range
       expect(rr.first).to eq(pp.first)
-      expect(rr.first).to eq(pp.first)
+      expect(rr.last).to eq(pp.last)
     end
 
     it "should be able to tell if it contains a date" do
@@ -112,6 +112,18 @@ describe Period do
       expect(pp.contains?(Date.parse('2012-07-04'))).to be false
     end
 
+    it "should raise an error if contains? arg is not a date" do
+      pp = Period.new('2013-01-01', '2013-12-31')
+      expect {
+        pp.contains?(Period.new('2013-06-01', '2013-06-30'))
+      }.to raise_error(/must be a Date/)
+
+      # But not if argument can be converted to date with to_date
+      expect {
+        pp.contains?(Time.now)
+      }.not_to raise_error
+    end
+
     it "should be able to make a concise period string" do
       expect(Period.new('2013-01-01', '2013-12-31').to_s).to eq('2013')
       expect(Period.new('2013-04-01', '2013-06-30').to_s).to eq('2013-2Q')

data/spec/lib/range_spec.rb

@@ -50,7 +50,7 @@ describe Range do
       expect(((0..10) & (5..20))).to eq((5..10))
       expect(((0..10) & (5..20))).to eq((5..20) & (0..10))
       expect(((0..10) & (10..20))).to eq((10..10))
-    end
+   end
 
     it "intersection should return nil if there is no overlap" do
       expect(((0..10) & (15..20))).to be_nil
@@ -64,6 +64,7 @@ describe Range do
 
     it "union should return nil if there is no overlap" do
       expect(((0..10) & (15..20))).to be_nil
+      expect(((15..20) & (0..10))).to be_nil
     end
 
     it "should know the difference with another range" do
@@ -100,15 +101,20 @@ describe Range do
   describe "joining" do
     it "should be able to join contiguous ranges" do
       expect((0..3).join(4..8)).to eq (0..8)
+      expect((4..8).join(0..3)).to eq (0..8)
     end
 
     it "should return nil on join of non-contiguous ranges" do
       expect((0..3).join(5..8)).to be_nil
       expect((0...3).join(4..8)).to be_nil
+
+      expect((5..8).join(0..3)).to be_nil
+      expect((4..8).join(0...3)).to be_nil
     end
 
     it "should work with Floats, allowing single-point overlap" do
       expect((0.0..3.0).join(3.0..8.2)).to eq (0.0..8.2)
+      expect((3.0..8.2).join(0.0..3.0)).to eq (0.0..8.2)
     end
   end
 
@@ -144,6 +150,14 @@ describe Range do
       expect((0..10).overlaps?(0..10)).to be_truthy
       expect((0..10).overlaps?(11..12)).to be_falsy
       expect((0..10).overlaps?(-11..-1)).to be_falsy
+
+      # Order of operands should not matter
+      expect((-3..5).overlaps?(0..10)).to be_truthy
+      expect((3..5).overlaps?(0..10)).to be_truthy
+      expect((8..15).overlaps?(0..10)).to be_truthy
+      expect((0..10).overlaps?(0..10)).to be_truthy
+      expect((11..12).overlaps?(0..10)).to be_falsy
+      expect((-11..-1).overlaps?(0..10)).to be_falsy
     end
 
     it "should be able to determine whether a set contains covered overlaps" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,6 +124,7 @@ files:
 - Rakefile
 - fat_core.gemspec
 - lib/fat_core.rb
+- lib/fat_core/ChangeLog
 - lib/fat_core/array.rb
 - lib/fat_core/date.rb
 - lib/fat_core/enumerable.rb