range_extd 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e414692d4b21325679b022e9b1364ea3272a639a
-  data.tar.gz: 633ff4d1cba4c73fc523f1d6b0ec0272fcbf755e
+  metadata.gz: 8ae4357a6b6bbdeef30dcb66b575388a2dd3618a
+  data.tar.gz: fc6c6e5b28f72d7fc6fc5cb1773c06eeafc7bbed
 SHA512:
-  metadata.gz: f4ad1eeccabb65b819180c506a50a7763ec97d0a944548bf3ee62ba5ba766841853ec2677aa4f256dcdd0a1e668cad377dd1911190afba3cb020c6408eeeca70
-  data.tar.gz: 8f63b3abfde62792334c3e013de34dfa0c4d53c2b5f917631f7ba63891ae5a8868041fd58701da8d47ac20912b4cc7abbf910129e0f3184da5cedbb0f3046298
+  metadata.gz: bee19fa323a3f55f3cd18dd95f5045296ef673e85a0e9a7b3ce339e5c0c0cf80e3015b20d3f9dac194158e644c7a4dd1228399fd1c2d96296186ff399d58bb20
+  data.tar.gz: e315e80026704a8a062b0122c408cbeb120e1d623370d4f611df7f92e6544876014415e75a263925fa1b39cbd949c69e59e53f10520f01fbf398c955c69d7b9c

data/ChangeLog

@@ -1,6 +1,12 @@
+-----
+(Version: 0.4.0)
+2014-05-10  Masa Saskano
+ * Added Range#equiv? and RangeExtd#equiv? methods.
+
 -----
 (Version: 0.3.0)
-2014-05-02  Masa Saskano
+2014-05-02  Masa Sakano
+
  * Added a String expression form of RangeExtd.new and RangeExtd.valid?(), modifying RangeExtd._get_init_args().
 
 -----

data/News

@@ -1,3 +1,7 @@
+-----
+(Version: 0.4.0) 2014-05-10
+ * Added Range#equiv? method.
+
 -----
 (Version: 0.3.0) 2014-05-02
  * Fixed a bug that RangeExtd used to accept (nil...nil,true).  Not any more.

data/README.en.rdoc

@@ -147,6 +147,7 @@ For more detail and examples, see {RangeExtd.new}.
    RangeExtd(?a, ?e, true, true).empty? # => false
    RangeExtd::NONE.is_none?             # => true
    RangeExtd::ALL.is_all?               # => true
+   (3...7).equiv?(3..6)    # => true
 
 All the methods that are in the built-in Range can be used.
 
@@ -216,6 +217,7 @@ See the document of each method for detail (some are defined only in
 * <tt>null?</tt> 
 * <tt>is_none?</tt> 
 * <tt>is_all?</tt> 
+* <tt>equiv?</tt> 
 
 There are three class methods, the first of which is equivalent 
 to the instance method <tt>valid?</tt>:

data/README.ja.rdoc

@@ -147,6 +147,7 @@ For more detail and examples, see {RangeExtd.new}.
    RangeExtd(?a, ?e, true, true).empty? # => false
    RangeExtd::NONE.is_none?             # => true
    RangeExtd::ALL.is_all?               # => true
+   (3...7).equiv?(3..6)    # => true
 
 All the methods that are in the built-in Range can be used.
 
@@ -216,6 +217,7 @@ See the document of each method for detail (some are defined only in
 * <tt>null?</tt> 
 * <tt>is_none?</tt> 
 * <tt>is_all?</tt> 
+* <tt>equiv?</tt> 
 
 There are three class methods, the first of which is equivalent 
 to the instance method <tt>valid?</tt>:
@@ -481,6 +483,7 @@ Versions:: The versions of this package follow Semantic Versioning (2.0.0) http:
    RangeExtd(?a, ?e, true, true).empty? # => false
    RangeExtd::NONE.is_none?             # => true
    RangeExtd::ALL.is_all?               # => true
+   (3...7).equiv?(3..6)    # => true
 
 組込Rangeに含まれる全てのメソッドが使用可能です。
 
@@ -547,6 +550,7 @@ RangeExtd のインスタンスは、 Rangeと同じくイミュータブルで
 * <tt>null?</tt> 
 * <tt>is_none?</tt> 
 * <tt>is_all?</tt> 
+* <tt>equiv?</tt> 
 
 クラスメソッドが三つあります。一番上のものは、
 インスタンスメソッドの <tt>valid?</tt> に等価です。

data/lib/range_extd/range_extd.rb

@@ -326,6 +326,77 @@ class RangeExtd < Range
   alias :member? :===
 
 
+  # Return true if self and the other are equivalent; if [#to_a] is defined, it is similar to
+  #    (self.to_a == other.to_a)
+  # (though the ends are checked more rigorously), and if not, equivalent to
+  #    (self == other)
+  #
+  # @example
+  #    RangeExtd(2...7,true).equiv?(3..6)     # => true
+  #    RangeExtd(2...7,true).equiv?(3..6.0)   # => false
+  #    RangeExtd(2...7,true).equiv?(3.0..6.0) # => false
+  #    RangeExtd(2...7,true).equiv?(3..6.5)   # => false
+  #    RangeExtd(2...7,true).equiv?(RangeExtd(2.0...7.0,true))   # => true
+  #    RangeExtd(2...7,true).equiv?(3...7.0)  # => true
+  #
+  # @param other [Range, RangeExtd]
+  def equiv?(other)
+    # This routine is very similar to Range#equiv? except
+    # exclude_begin? in this object is always defined, hence
+    # a more thorough check is needed.
+
+    t_or_f = (defined?(self.begin.succ) && defined?(other.begin.succ) && defined?(other.end) && defined?(other.exclude_end?))
+    if ! t_or_f
+      return(self == other)	# succ() for begin is not defined.
+    else
+      # Checking the begins.
+      if defined?(other.exclude_begin?)
+        other_excl_beg = other.exclude_begin?
+      else
+        other_excl_beg = false
+      end
+
+      if (self.begin == other.begin)
+        if (exclude_begin? ^! other_excl_beg)
+          # Pass
+        else
+          return false
+        end
+      else
+        if (exclude_begin? ^! other_excl_beg)
+          return false
+        elsif (exclude_begin? && (self.begin.succ == other.begin)) ||
+              (other_excl_beg && (self.begin == other.begin.succ))
+          # Pass
+        else
+          return false
+        end
+      end	# if (self.begin == other.begin)	# else
+          
+      # Now, the begins agreed.  Checking the ends.
+      if (self.end == other.end)
+        if (exclude_end? ^! other.exclude_end?)
+          return true
+        else
+          return false
+        end
+      else	# if (self.end == other.end)
+        if (exclude_end? ^! other.exclude_end?)
+          return false
+          # elsif defined?(other.last) && (self.last(1) == other.last(1))	# Invalid for Ruby 1.8 or earlier	# This is not good - eg., in this case, (1..5.5).equiv?(1..5.4) would return true.
+          
+        #   return true
+        elsif (      exclude_end? && defined?(other.end.succ) && (self.end == other.end.succ)) ||
+              (other.exclude_end? && defined?( self.end.succ) && (self.end.succ == other.end))
+          return true
+        else
+          return false
+        end
+      end	# if (self.end == other.end)
+    end	# if ! t_or_f
+  end	# def equiv?(other)
+
+
   # @return [Object]
   def begin()
     @rangepart.begin()
@@ -1345,6 +1416,60 @@ class Range
     false
   end
 
+
+  # Return true if self and the other are equivalent; if [#to_a] is defined, it is similar to
+  #    (self.to_a == other.to_a)
+  # (though the ends are checked more rigorously), and if not, equivalent to
+  #    (self == other)
+  #
+  # @example
+  #    (3...7).equiv?(3..6)      # => true
+  #    (3...7).equiv?(3..6.0)    # => false
+  #    (3...7).equiv?(3.0..6.0)  # => false
+  #    (3...7).equiv?(3..6.5)    # => false
+  #    (3...7).equiv?(3.0...7.0) # => true
+  #    (3...7.0).equiv?(3..6)    # => true
+  #    (3...7.0).equiv?(3.0..6)  # => false
+  #
+  # @param other [Range, RangeExtd]
+  def equiv?(other)
+    t_or_f = (defined?(self.begin.succ) && defined?(other.begin.succ) && defined?(other.end) && defined?(other.exclude_end?))
+    if ! t_or_f
+      return(self == other)	# succ() for begin is not defined.
+    else
+      # Checking the begins.
+      if defined?(other.exclude_begin?) && other.exclude_begin?	# The other is RangeExtd with exclude_begin?==true.
+        if self.begin != other.begin.succ
+          return false
+        else
+          # Pass
+        end
+      elsif (self.begin != other.begin)
+        return false
+      end
+
+      # Now, the begins agreed.  Checking the ends.
+      if (self.end == other.end)
+        if (exclude_end? ^! other.exclude_end?)
+          return true
+        else
+          return false
+        end
+      else	# if (self.end == other.end)
+        if (exclude_end? ^! other.exclude_end?)
+          return false
+        elsif (      exclude_end? && defined?(other.end.succ) && (self.end == other.end.succ)) ||
+              (other.exclude_end? && defined?( self.end.succ) && (self.end.succ == other.end))
+          return true
+        else
+          return false
+        end
+      end	# if (self.end == other.end)
+    end	# if ! t_or_f
+
+  end	# def equiv?(other)
+
+
   ############## pravate methods of Range ##############
 
   private

data/range_extd.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{range_extd}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
   # s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   # s.executables << 'hola'
   # s.bindir = 'bin'
   s.authors = ["Masa Sakano"]
-  s.date = %q{2014-05-02}
+  s.date = %q{2014-05-10}
   s.summary = %q{RangeExtd - Extended Range class with exclude_begin and open-ends}
   s.description = %q{Package for a subclass of Range, RangeExtd and RangeExtd::Infinity.  The former defines a range that enables an exclusion of the begin boundary, in addition to the end boundary as in the built-in Range, and accepts open-ended ranges to infinity for either (or both) positive/negative direction.  The latter has the two constant objects, POSITIVE and NEGATIVE, and they are a generalised Infinity of Float::INFINITY to any Comparable objects.}
   # s.email = %q{abc@example.com}

data/test/test_range_extd.rb

@@ -1122,6 +1122,85 @@ return
     end	# def test_Range_nullfunc
 
 
+    def test_Range_equiv
+      r1 = (2..5)
+      r2 = (2...7)
+      assert !r1.equiv?("Q") 
+      assert !r1.equiv?(2.0..3.1) 
+      assert  r1.equiv?(2.0..5.0) 
+      assert  (2.0..5.0).equiv?(r1) 
+      assert  (2.0..5.0).equiv?(2.0..5.0)
+      assert !r1.equiv?(RangeExtd(2..5,true)) 
+      assert !r1.equiv?(1..5) 
+      assert  r1.equiv?(2..5) 
+      assert  r2.equiv?(2...7) 
+      assert  r1.equiv?(RangeExtd(1..5,true)) 
+      assert !r1.equiv?(2...5) 
+      assert !r2.equiv?(2..7) 
+      assert !r1.equiv?(2..6) 
+      assert !r2.equiv?(2...8) 
+      assert  r1.equiv?(2...6) 
+      assert  r1.equiv?(RangeExtd(1...6,true)) 
+      assert  r2.equiv?(2..6) 
+      assert  r2.equiv?(RangeExtd(1..6,true)) 
+      assert !r1.equiv?(2...9) 
+      assert !r2.equiv?(2..9) 
+      assert !r1.equiv?(RangeExtd(1...9,true)) 
+      assert !r2.equiv?(RangeExtd(1..9,true)) 
+      assert  (3...7.0).equiv?(3..6)    # Because begin.succ is defined.
+      assert !(3...7.0).equiv?(3.0..6)  # Because begin.succ is not defined.
+    end	# def test_Range_equiv
+
+
+    def test_RangeExtd_equiv
+      r1 = RangeExtd(2..5)
+      r2 = RangeExtd(2...7)
+      r3 = RangeExtd(2..5,true)
+      r4 = RangeExtd(2...7,true)
+      assert !r1.equiv?("Q")
+      assert !r1.equiv?(2.0..3.1)
+      assert  r1.equiv?(2.0..5.0)
+      assert  (2.0..5.0).equiv?(r1)
+      assert  (2.0..5.0).equiv?(2.0..5.0)
+      assert  r2.equiv?(2.0...7.0)
+      assert  r4.equiv?(RangeExtd(2.0...7.0,true))
+      assert !r1.equiv?(RangeExtd(2..5,true))
+      assert !r2.equiv?(r4)
+      assert !r3.equiv?(2..5)
+      assert !r4.equiv?(2...7)
+      assert !r1.equiv?(1..5) 
+      assert !r3.equiv?(RangeExtd(1..5,true)) 
+      assert !r1.equiv?(RangeExtd(4..5,true))
+      assert !r3.equiv?(4..5) 
+      assert  r1.equiv?(2..5)
+      assert  r2.equiv?(2...7)
+      assert  r1.equiv?(RangeExtd(1..5,true))
+      assert  r2.equiv?(RangeExtd(1...7,true))
+      assert  r3.equiv?(3..5)
+      assert  r4.equiv?(3...7)
+      assert !r1.equiv?(RangeExtd(1...5,true))
+      assert !r2.equiv?(RangeExtd(1..7,true))
+      assert !r3.equiv?(3...5)
+      assert !r4.equiv?(3..7)
+      assert !r1.equiv?(2..9)
+      assert !r1.equiv?(RangeExtd(1..9,true))
+      assert !r2.equiv?(RangeExtd(1...9,true))
+      assert !r3.equiv?(3..9)
+      assert !r4.equiv?(3...9)
+      assert  r1.equiv?(2...6)
+      assert  r1.equiv?(RangeExtd(1...6,true))
+      assert  r2.equiv?(RangeExtd(1..6,true))
+      assert  r3.equiv?(3...6)
+      assert  r4.equiv?(3..6)
+      assert !r4.equiv?(3.0..6.0)
+      assert !r1.equiv?(2...9)
+      assert !r1.equiv?(RangeExtd(1...9,true))
+      assert !r2.equiv?(RangeExtd(1..9,true))
+      assert !r3.equiv?(3...9)
+      assert !r4.equiv?(3..9)
+    end	# def test_RangeExtd_equiv
+
+
     def test_RangeExtd_none
       assert  RangeExtd::NONE.is_none?
       assert  RangeExtd::NONE.valid?
@@ -1270,6 +1349,14 @@ return
       assert !((?a..?z) === "cc")
       assert !((?B..?z) === 'dd')
 
+      # RangeExtd#equiv?
+      assert  RangeExtd(2...7,true).equiv?(3..6)     # => true
+      assert !RangeExtd(2...7,true).equiv?(3..6.0)   # => false
+      assert !RangeExtd(2...7,true).equiv?(3.0..6.0) # => false
+      assert !RangeExtd(2...7,true).equiv?(3..6.5)   # => false
+      assert  RangeExtd(2...7,true).equiv?(RangeExtd(2.0...7.0,true))   # => true
+      assert  RangeExtd(2...7,true).equiv?(3...7.0)  # => true
+
       # RangeExtd#eql?bsearch
       ary = [0, 4, 7, 10, 12]
       assert_equal nil, (3...4).bsearch{    |i| ary[i] >= 11}
@@ -1384,12 +1471,12 @@ return
       assert_equal "2...6",  RangeExtd(2...6).to_s
       assert_equal "2<..6",  RangeExtd(2,6,1).to_s
 
-      # Range.==
+      # Range#==
       assert !(1...1).valid?
       assert !(nil...nil).valid?
       assert !((1...1) == RangeExtd(1, 1, true, true))	# => false.
 
-      # Range.valid?
+      # Range#valid?
       assert !(nil..nil).valid? # => false
       assert  (0..0).valid?     # => true
       assert !(0...0).valid?    # => false
@@ -1399,7 +1486,7 @@ return
       assert  RangeExtd::NONE.valid?        # => true
       assert  RangeExtd::ALL.valid?  # => true
 
-      # Range.empty?
+      # Range#empty?
       assert_equal nil, (nil..nil).empty?  # => nil
       assert_equal nil, (1...1).empty?     # => nil
       assert !(1..1).empty?      # => false
@@ -1409,6 +1496,15 @@ return
       assert  RangeExtd(?a...?b, true).empty? # => true
       assert  RangeExtd::NONE.empty?          # => true
 
+      # Range#equiv?
+      assert  (3...7).equiv?(3..6)      # => true
+      assert !(3...7).equiv?(3..6.0)    # => false
+      assert !(3...7).equiv?(3.0..6.0)  # => false
+      assert !(3...7).equiv?(3.0..6.5)  # => false
+      assert  (3...7).equiv?(3.0...7.0) # => false
+      assert  (3...7.0).equiv?(3..6)    # => true
+      assert !(3...7.0).equiv?(3.0..6)  # => false
+
       # class Infinity
       assert_equal  -1, (?z <=> RangeExtd::Infinity::POSITIVE)
       assert_equal   1, (RangeExtd::Infinity::POSITIVE <=> ?z)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: range_extd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Masa Sakano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-10 00:00:00.000000000 Z
 dependencies: []
 description: Package for a subclass of Range, RangeExtd and RangeExtd::Infinity.  The
   former defines a range that enables an exclusion of the begin boundary, in addition