fat_core 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf42c04e2df2a194b2c1443f37fa544e67dc4755
-  data.tar.gz: 4479332da5870aad790def2b520cc0054dd66f30
+  metadata.gz: 13a129f290fef37db1a33846fa4fa6aa183ed530
+  data.tar.gz: bd5f34570185d9b556a5dcf6647c6dca13b21cd6
 SHA512:
-  metadata.gz: ce1c348abc44daae141b687597ee12ce1da0415b2a7da3d5aedbf6ec83fc62f09626912296b5ff05cb188cd42e3622e03cf45c1c0d30b59da76bb0503ad1711a
-  data.tar.gz: 527f34537f750dbcf71764c9e2bf5c80d3f22c2f282fc76b9aac62d4e79d599ca2136a4aaeb8e484d442863a3b4ccc807ab86608c3f8fe72635f0f73cf26bc2c
+  metadata.gz: 9c737d705f3b176ae808319cd7dbb0870bc2aafd2685b0bc5c11e4594990f5395b1d5ae1efd0b1b18ad723bc7357af9205cbcbdbe5b75ea0b610206f1cd62f6c
+  data.tar.gz: 0cc5d64d64bc821ffbcb5f7ef4e13390d32788c4170f4eba7183ddbeb1e6f9f612e908d75e40f8669d326343df6e50e9617e34b0fc4bcb42dc6eff1ba9884d12

data/lib/fat_core/period.rb

@@ -252,17 +252,20 @@ class Period
   end
 
   def intersection(other)
-    self.to_range.intersection(other.to_range)
+    result = self.to_range.intersection(other.to_range)
+    Period.new(result.first, result.last)
   end
   alias_method :&, :intersection
 
   def union(other)
-    self.to_range.union(other.to_range)
+    result = self.to_range.union(other.to_range)
+    Period.new(result.first, result.last)
   end
   alias_method :+, :union
 
   def difference(other)
-    self.to_range.difference(other.to_range)
+    ranges = self.to_range.difference(other.to_range)
+    ranges.each.map{ |r| Period.new(r.first, r.last) }
   end
   alias_method :-, :difference
 

data/lib/fat_core/range.rb

@@ -61,7 +61,7 @@ class Range
   alias_method :&, :intersection
 
   def union(other)
-    return nil unless self.overlaps?(other)
+    return nil unless self.overlaps?(other) || self.contiguous?(other)
     ([self.min, other.min].min..[self.max, other.max].max)
   end
   alias_method :+, :union
@@ -70,24 +70,27 @@ class Range
   # argument from self.  Because in the case where self is a superset of the
   # other range, this will result in the difference being two non-contiguous
   # ranges, this returns an array of ranges.  If there is no overlap or if
-  # self is a subset of the other range, return an empty array
+  # self is a subset of the other range, return an array of self
   def difference(other)
     unless max.respond_to?(:succ) && min.respond_to?(:pred) &&
         other.max.respond_to?(:succ) && other.min.respond_to?(:pred)
       raise "Range difference operation requires objects have pred and succ methods"
     end
-    # return [] unless self.overlaps?(other)
-    if proper_superset_of?(other)
-      [(min..other.min.pred),
-       (other.max.succ..max)]
-    elsif subset_of?(other)
+    # return [self] unless self.overlaps?(other)
+    if subset_of?(other)
+      # (4..7) - (0..10)
       []
+    elsif proper_superset_of?(other)
+      # (4..7) - (5..5) -> [(4..4), (6..7)]
+      [(min..other.min.pred), (other.max.succ..max)]
     elsif overlaps?(other) && other.min <= min
+      # (4..7) - (2..5) -> (6..7)
       [(other.max.succ .. max)]
     elsif overlaps?(other) && other.max >= max
+      # (4..7) - (6..10) -> (4..5)
       [(min .. other.min.pred)]
     else
-      []
+      [ self ]
     end
   end
   alias_method :-, :difference

data/lib/fat_core/version.rb

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

data/spec/lib/period_spec.rb

@@ -305,5 +305,42 @@ describe Period do
 
       expect(Period.new('2013-11-02', '2013-12-16').chunk_sym).to eq(:irregular)
     end
+
+    it "should know its intersection with other period" do
+      year = Period.parse_spec('this_year')
+      month = Period.parse_spec('this_month')
+      expect(year & month).to eq(month)
+      expect(month & year).to eq(month)
+      # It should return a Period, not a Range
+      expect((month & year).class).to eq(Period)
+    end
+
+    it "should know its union with other period" do
+      last_month = Period.parse_spec('last_month')
+      month = Period.parse_spec('this_month')
+      expect((last_month + month).first).to eq(last_month.first)
+      expect((last_month + month).last).to eq(month.last)
+      # It should return a Period, not a Range
+      expect((last_month + month).class).to eq(Period)
+    end
+
+    it "should know its differences with other period" do
+      year = Period.parse_spec('this_year')
+      month = Period.parse_spec('this_month')
+      # Note: the difference operator returns an Array of Periods resulting
+      # from removing other from self.
+      expect((year - month).first)
+        .to eq(Period.new(year.first, month.first - 1.day))
+      expect((year - month).last)
+        .to eq(Period.new(month.last + 1.day, year.last))
+      # It should return an Array of Periods, not a Ranges
+      (year - month).each do |p|
+        expect(p.class).to eq(Period)
+      end
+
+      last_year = Period.parse_spec('last_year')
+      month = Period.parse_spec('this_month')
+      expect(last_year - month).to eq([last_year])
+    end
   end
 end

data/spec/lib/range_spec.rb

@@ -60,6 +60,9 @@ describe Range do
       expect(((0..10) + (5..20))).to eq((0..20))
       expect(((0..10) + (5..20))).to eq((5..20) + (0..10))
       expect(((0..10) + (10..20))).to eq((0..20))
+
+      # For discrete values, union should work on contiguous ranges
+      expect(((0..5) + (6..20))).to eq((0..20))
     end
 
     it "union should return nil if there is no overlap" do
@@ -93,8 +96,8 @@ describe Range do
       expect(((4..10) - (7..10)).last).to eq((4..6))
 
       # Other does not overlap
-      expect((4..10) - (13..20)).to be_empty
-      expect((4..10) - (1..3)).to be_empty
+      expect((4..10) - (13..20)).to eq([(4..10)])
+      expect((4..10) - (1..3)).to  eq([(4..10)])
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Daniel E. Doherty