fat_core 4.8.2 → 4.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 626d8f221d0dc52dd3914d8a5b6a28d92211a90fb9d1851c650203c76f1a1cff
-  data.tar.gz: 1cee79cbd3a51d530e95a8b52b994bdb430c9bb6a6630041f56564e3436fc5d6
+  metadata.gz: 7185e045a281695d2f45f26e53d2614125dc0b8f8912e247008b1bafa2a3e98e
+  data.tar.gz: 5ee7ed7308b1a5300f8eb278c00bbdd95ec04adc22c8e46e7743741a0d34df7b
 SHA512:
-  metadata.gz: 8809c0b8ba8e2a4909ece3b7f4733e607d6a8c8a205e08f6e30ed9018659a1c8aa26dc177f909408fd54613cbb8563b5d4ed5a0fc5856cabed50b273803f0fcb
-  data.tar.gz: 207bca7517f91e868b3f246a13d277d5a64bdd9c05a669b67b8f70d735261722f9d0ea6ab51d1a4f9d906696bb45f8015f2f85aa92bf07efd89618238dbde077
+  metadata.gz: 2a1519d932d6f7409f1b4ec0e873836f675c9c77c1655ba0884d43fca62ba7209fca32dd6860e60e29ab9147ab8f8dde5cb1279a23ffc1517d73885e2dbd5fa1
+  data.tar.gz: c740324e31d150b670cd940ffec4ed4394fe4223b8f951dff8838f176c39905b753d3dce8017f77477cd440ad171e3839d626d8b54e4cf8e00782516114b2850

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 /GTAGS
 /.rubocop_todo.yml
 /gtags.files
+/.ruby-version

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 bundler_args: --without debug
 rvm:
-  - 2.2.2
-  - 2.3
-  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
   - ruby-head

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'damerau-levenshtein', git: 'https://github.com/ddoherty03/damerau-levenshtein'
+
 # Specify your gem's dependencies in fat_core.gemspec
 gemspec
 

data/fat_core.gemspec

@@ -4,8 +4,6 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fat_core/version'
 
-gem 'damerau-levenshtein', git: 'https://github.com/ddoherty03/damerau-levenshtein'
-
 Gem::Specification.new do |spec|
   spec.name          = 'fat_core'
   spec.version       = FatCore::VERSION

data/lib/fat_core/range.rb

@@ -161,20 +161,25 @@ module FatCore
         raise 'Range difference requires objects have pred and succ methods'
       end
 
-      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)]
+      # Remove the intersection of self and other from self.  The intersection
+      # is either (a) empty, so return self, (b) coincides with self, so
+      # return nothing,
+      isec = self & other
+      return [self] if isec.nil?
+      return [] if isec == self
+
+      # (c) touches self on the right, (d) touches self on the left, or (e)
+      # touches on neither the left or right, in which case the difference is
+      # two ranges.
+      if isec.max == max && isec.min > min
+        # Return the part to the left of isec
+        [(min..isec.min.pred)]
+      elsif isec.min == min && isec.max < max
+        # Return the part to the right of isec
+        [(isec.max.succ..max)]
       else
-        [self]
+        # Return the parts to the left and right of isec
+        [(min..isec.min.pred), (isec.max.succ..max)]
       end
     end
     alias - difference
@@ -280,13 +285,14 @@ module FatCore
       min >= other.min && max <= other.max
     end
 
-    # Return whether self is contained within `other` range, without their
-    # boundaries touching.
+    # Return whether self is contained within `other` range, with at most one
+    # boundary touching.
     #
     # @param other [Range] the containing range
     # @return [Boolean] is self wholly within other
     def proper_subset_of?(other)
-      min > other.min && max < other.max
+      subset_of?(other) &&
+      (min > other.min || max < other.max)
     end
 
     # Return whether self contains `other` range, even if their
@@ -298,13 +304,14 @@ module FatCore
       min <= other.min && max >= other.max
     end
 
-    # Return whether self contains `other` range, without their
-    # boundaries touching.
+    # Return whether self contains `other` range, with at most one
+    # boundary touching.
     #
     # @param other [Range] the contained range
     # @return [Boolean] does self wholly contain other
     def proper_superset_of?(other)
-      min < other.min && max > other.max
+      superset_of?(other) &&
+        (min < other.min || max > other.max)
     end
 
     # Return whether self overlaps with other Range.

data/lib/fat_core/version.rb

@@ -1,7 +1,7 @@
 module FatCore
   MAJOR = 4
   MINOR = 8
-  PATCH = 2
+  PATCH = 3
 
   # FatCore version number
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')

data/spec/lib/bigdecimal_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'fat_core/bigdecimal'
 
 describe BigDecimal do

data/spec/lib/date_spec.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
-#require 'spec_helper'
 
+require 'spec_helper'
 require 'fat_core/date'
 
 describe Date do

data/spec/lib/enumerable_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-
 require 'fat_core/enumerable'
 
 describe Enumerable do

data/spec/lib/hash_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-
 require 'fat_core/hash'
 
 describe Hash do

data/spec/lib/kernel_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-
 require 'fat_core/kernel'
 
 describe Kernel do

data/spec/lib/nil_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-
 require 'fat_core/nil'
 
 describe NilClass do

data/spec/lib/numeric_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'fat_core/numeric'
 
 describe Numeric do

data/spec/lib/range_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'fat_core/range'
 
 describe Range do
@@ -12,6 +13,7 @@ describe Range do
 
     it 'should know if it is a proper subset of another range' do
       expect((4..8)).to be_proper_subset_of((2..9))
+      expect((4..8)).to be_proper_subset_of((4..9))
       expect((4..8)).not_to be_proper_subset_of((4..8))
       expect((4..8)).not_to be_proper_subset_of((2..7))
       expect((4..8)).not_to be_proper_subset_of((5..8))
@@ -34,8 +36,8 @@ describe Range do
 
     it 'should know if it is a proper superset of another range' do
       expect((4..8)).to be_proper_superset_of((5..7))
-      expect((4..8)).not_to be_proper_superset_of((6..8))
-      expect((4..8)).not_to be_proper_superset_of((4..7))
+      expect((4..8)).to be_proper_superset_of((6..8))
+      expect((4..8)).to be_proper_superset_of((4..7))
       expect((4..8)).not_to be_proper_superset_of((4..8))
       expect((4..8)).not_to be_proper_superset_of((2..9))
       expect((4..8)).not_to be_proper_superset_of((2..8))

data/spec/lib/symbol_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'fat_core/symbol'
 
 describe Symbol do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_core
 version: !ruby/object:Gem::Version
-  version: 4.8.2
+  version: 4.8.3
 platform: ruby
 authors:
 - Daniel E. Doherty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -233,7 +233,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: fat_core provides some useful core extensions