rangeary 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723b92f99a375fc95b497d39664ec7850d7eb046
-  data.tar.gz: a6a15abb4bfbab32969bad3d69620006015e9faf
+  metadata.gz: a68fed02c28c7598ccd0e5e850012be4d1212948
+  data.tar.gz: a13032cc6cd7020224255079aaf63f6f8d314411
 SHA512:
-  metadata.gz: c12b17b220eb60c98fa7ddb6b487a43a3a2c9c9c66d0eea27958514c7115fdd36f1d6ffb7349db1015707170d02056590dce00e70c305ff83dbe0f761dca79c9
-  data.tar.gz: b15d01b7d266cbe322b3d08efaa2be826e69d479d6cfcb9bdb33bfbac32504183214b2b65f106ee07d6415499c1999700ca2b129420204d92a166da8bc933dce
+  metadata.gz: 6124f036424de4b48bbfa1950602677b61ba780c6d686cc95605803ac7d3e49547f36473f58bc1f148f629cdd5bb99e7e526ace4de95a1f2d8d39c9bfc8997ba
+  data.tar.gz: 9bd1973fb2f6006363c7c5f8280a4462fc9f79239aa58183f50f0a899f63816a16b8c5dbf7f8b0e684ee6f7eb2aef191354d7d7abaf057f53ad8f8707d1ca938

data/ChangeLog

@@ -1,6 +1,12 @@
+-----
+(Version: 0.3.0)
+2016-05-27  Masa Sakano
+ * Fixed a bug *,^,- raises an exception when one of them is #null?  Added a method #add?  Added a file .gitignore in the repository.
+
 -----
 (Version: 0.2.0)
-2014-05-11  Masa Saskano
+2014-05-11  Masa Sakano
+
  * New method of Rangeary#equiv?(), with the added dependency on range_extd ">= 0.4.0".
 
 -----

data/lib/rangeary/rangeary.rb

@@ -197,8 +197,18 @@ class Rangeary < Array
     self.freeze
   end	# def initialize(*inarall, **opts)
 
+  alias_method :triple_equals_orig, :=== if ! self.method_defined?(:triple_equals_orig)
 
-  alias :triple_equals_orig :===
+  # If self covers the entire range?
+  #
+  def all?
+    rfirst = self[0]
+    ((1 == size) &&
+     (@infinities[:negative] == rfirst.begin) &&
+     (@infinities[:positive] == rfirst.end) &&
+     (!rfirst.exclude_begin?) &&
+     (!rfirst.exclude_end?))
+  end
 
   # True if the inObj is in the range.
   #
@@ -222,8 +232,8 @@ class Rangeary < Array
     return false
   end
 
-  alias :include_element? :===
-  alias :member_element? :===
+  alias_method :include_element?, :===
+  alias_method :member_element?, :===
 
 
   # @return [Object]  The {RangeExtd#begin} of the first {RangeExtd}.
@@ -234,7 +244,7 @@ class Rangeary < Array
       nil	# Should not happen!
     end
   end
-  alias :begin_element :begin
+  alias_method :begin_element, :begin
 
 
   # If inObj is within the ranges, it will return true.
@@ -286,7 +296,7 @@ class Rangeary < Array
       nil
     end
   end
-  alias :end_element :end
+  alias_method :end_element, :end
 
 
   # {Range#equiv?} method, defined in range_extd library, extended to this {Rangeary}.
@@ -423,7 +433,7 @@ class Rangeary < Array
     end
     return true
   end
-  alias :null? :null_element?
+  alias_method :null?, :null_element?
 
 
   # Return the sum of {RangeExtd#size} of all the ranges in the object.
@@ -459,8 +469,8 @@ class Rangeary < Array
     self.class.new(self, inr)
   end
 
-  alias :+ :disjunction
-  alias :| :disjunction		# "|" (plus with Object#eql?) in general, but in this case it is identical.
+  alias_method :+, :disjunction
+  alias_method :|, :disjunction		# "|" (plus with Object#eql?) in general, but in this case it is identical.
 
   # Exclusive Disjunction (XOR) with a Rangeary (or RangeExtd or Range)
   # 
@@ -479,8 +489,8 @@ class Rangeary < Array
     (disjunction(inr)).conjunction(conjunction(inr).negation)
   end
 
-  alias :^   :exclusive_disjunction
-  alias :xor :exclusive_disjunction
+  alias_method :^,   :exclusive_disjunction
+  alias_method :xor, :exclusive_disjunction
 
   # Subtraction.
   #
@@ -490,7 +500,7 @@ class Rangeary < Array
     conjunction( Rangeary.new(r).negation )
   end
 
-  alias :- :subtraction
+  alias_method :-, :subtraction
 
 
   # Conjunction.
@@ -501,8 +511,8 @@ class Rangeary < Array
     self.class.conjunction(self, r)
   end
 
-  alias :& :conjunction
-  alias :* :conjunction
+  alias_method :&, :conjunction
+  alias_method :*, :conjunction
 
 
   # Negation.
@@ -564,7 +574,7 @@ class Rangeary < Array
     Rangeary.new(arran, :positive => @infinities[:positive], :negative => @infinities[:negative])
   end	# def negation()
 
-  alias :~@ :negation
+  alias_method :~@, :negation
 
 
   ####################
@@ -580,6 +590,9 @@ class Rangeary < Array
 
     r1 = Rangeary.new(r1) if ! defined? r1.first_element
     r2 = Rangeary.new(r2) if ! defined? r2.first_element
+    return Rangeary.new(RangeExtd::NONE) if r1.null? || r2.null?
+    return Rangeary.new(r1) if r2.all?
+    return Rangeary.new(r2) if r1.all?
 
     # Getting inherited options (if Rangeary is given) for the later use.
     hsInherited = {}
@@ -848,8 +861,9 @@ class Rangeary < Array
       end
     end
 
-    # It is all empty, hence delete all but one.
+    hsFlag[:found?] = false	# Redundant, but for the sake of readability
     if hsFlag[:empty?]
+      # It is all empty, hence delete all but one.
       hsFlag[:klass] = NilClass if hsFlag[:klass].nil?
       newRanges.delete_if do |er|
         if hsFlag[:found?]
@@ -862,7 +876,8 @@ class Rangeary < Array
         end
       end
     else
-      newRanges.delete_if{ |er| er.empty? }
+      # Deletes all the empty ones.
+      newRanges.delete_if { |er| er.empty? }
     end
 
     newRanges

data/rangeary.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rangeary}
-  s.version = "0.2.0"
+  s.version = "0.3.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-11}
+  s.date = %q{2016-05-27}
   s.summary = %q{Rangeary - class to represent any 1-dimensional multiple-range}
   s.description = %q{Rangeary is a sub-class of Array and represents any 1-dimensional multiple-range.  For example, (x<4 and 7<x<=9).  All the standard logical operations, such as negation and conjunction, are supported and can be used with conventional Ruby-style operators.  Each range is represented as RangeExtd class (Extended Range), which is a sub-class of Range and supports exclude-begin and open-ended (to Infinity) ranges, and is downloadable from https://rubygems.org/gems/range_extd}
   # s.email = %q{abc@example.com}

data/test/test_rangeary.rb

@@ -52,7 +52,7 @@ end
 #################################################
 
 #if $0 == __FILE__
-  require 'minitest/unit'
+  # require 'minitest/unit'
   require 'minitest/autorun'
   # MiniTest::Unit.autorun
 
@@ -139,10 +139,13 @@ end
   def RaE(*rest)
     RangeExtd(*rest)
   end
-  T = true
-  F = false
 
-  class TestUnitFoo < MiniTest::Unit::TestCase
+  class TestUnitFoo < MiniTest::Test
+    T = true
+    F = false
+    RaN = Rangeary(RangeExtd::NONE)
+    RaA = Rangeary(RangeExtd::ALL)
+
     def setup
       @ib = 1
       @ie = 6
@@ -238,10 +241,17 @@ end
     def test_disjunction
       # Plus
       rs = Rangeary.new([3..5, -6..-1, -4..-3, 2..4, 8..8])
-      assert_equal [-6..-1, 2..5, 8..8], (rs+rs).to_a
       assert_equal rs, rs+rs
+      assert_equal [-6..-1, 2..5, 8..8], rs.to_a
+      assert_equal rs.to_a,              (rs+rs).to_a
+      assert_equal rs.to_a,              (rs+RaN).to_a
+      assert_equal rs.to_a,              (RaN+rs).to_a
       assert_equal [-6..-1, 2..5, 8..9], (rs+(8..9)).to_a
       assert (rs != (rs+(8..9)))
+      assert_equal RaN, RaN + RaN
+      assert_equal RaA, RaA + RaA
+      assert_equal RaA, RaA + RaN
+      assert_equal RaA, RaN + RaA
     end	# def test_disjunction
 
     def test_minus
@@ -271,6 +281,10 @@ end
       assert_equal [-6..-1, 2...4], (rs-(4..11)).to_a
       #assert_equal [-6..-1, 2..3], (rs-(4..11)).to_a
       assert_equal rs, rs-(-99..-95)
+      assert_equal rs, rs-RaN
+      assert_equal RaN, RaN-rs
+      assert_equal RaN, RaN-RaN
+      assert_equal RaN, RaA-RaA
     end	# def test_minus
 
 
@@ -281,11 +295,12 @@ end
       assert_equal ar[-1],   rs[-1]
       assert_equal ar[1..2], rs[1..2]
       assert_equal ar[0,2],  rs[0,2]
+      assert_equal RangeExtd::NONE, RaN[0]
+      assert_equal nil,             RaN[1]
     end
 
 
     def test_conjunctionRangeExtd
-      t = true
       r38  = RangeExtd(3..8,  :exclude_begin => 1)
       r38e = RangeExtd(3...8, :exclude_begin => 1)
       r39  = RangeExtd(3..9,  :exclude_begin => 1)
@@ -371,8 +386,8 @@ end
       assert_equal (?d..?f), conjRE(?a..?f, ?d..?z)
 
       # Empty
-      assert_equal RangeExtd::NONE, conjRE(RangeExtd(1,1,t,t), 0..8)
-      assert_equal RangeExtd::NONE, conjRE(0..8, RangeExtd(1,1,t,t))
+      assert_equal RangeExtd::NONE, conjRE(RangeExtd(1,1,T,T), 0..8)
+      assert_equal RangeExtd::NONE, conjRE(0..8, RangeExtd(1,1,T,T))
       assert_equal RangeExtd::NONE, conjRE(RangeExtd::NONE, ?a..?d)
       assert_equal RangeExtd::NONE, conjRE(?a..?d, RangeExtd::NONE)
 
@@ -380,7 +395,7 @@ end
       assert_raises(ArgumentError){ conjRE(true..true, true..true) }
       assert_raises(TypeError){ conjRE(1..5, ?a..?d) }
 
-      assert_equal RangeExtd(24...25,t), conjRE(RangeExtd(24..26,t), 24...25)
+      assert_equal RangeExtd(24...25,T), conjRE(RangeExtd(24..26,T), 24...25)
     end
 
 
@@ -402,6 +417,15 @@ end
       assert          rcab.empty_element?
       assert          rcab.null_element?
       assert          rcab.null?
+
+      assert_equal r1,  r1 * Rangeary(RangeExtd::ALL)
+      assert_equal r1,  Rangeary(RangeExtd::ALL) * r1
+
+      assert_equal RaN, r1 * RaN
+      assert_equal RaN, r1 * RaN
+      assert_equal RaN, RaN * r1
+      assert_equal RaN, RaN * RaN
+      assert_equal RaA, RaA * RaA
     end	# def test_conjunctionRangeary
 
 
@@ -438,6 +462,16 @@ end
       assert_equal rc12tobe, rc12
       # Actual: <Rangeary:[-Infinity..1, 3...4, 6<...8, 8<...12, 12<...14, 15...17, 18<..22, 24..26, 28..32, 33..Infinity]>
 
+      assert_equal r1,   r1.disjunction(RaN)
+      assert_equal true, r1.conjunction(RaN).null?
+      assert_equal Rangeary(RangeExtd::ALL), r1.conjunction(RaN).negation
+      assert_equal r1,                 r1 * (r1.conjunction(RaN).negation)
+      assert_equal r1,  r1 ^ RaN
+      assert_equal r1,  RaN ^ r1
+      assert_equal RaN, RaN ^ RaN
+      assert_equal RaA, RaA ^ RaN
+      assert_equal RaA, RaN ^ RaA
+      assert_equal RaN, RaA ^ RaA
     end	# def test_xor
 
 
@@ -446,6 +480,7 @@ end
       assert_equal Rangeary(-inf...3,RangeExtd(8..inf,1)), Rangeary(3..8).negation
       assert_equal Rangeary(-inf...12, RangeExtd(12...14,T), RangeExtd(15,inf,T)), ~Rangeary(12..12, 14..15)
 
+      assert_equal Rangeary(RangeExtd::ALL), ~RaN
     end	# def test_negation
 
 
@@ -483,6 +518,9 @@ end
 
       assert ! Rangeary(?a..?g, ?m..?o, ?r..?z).cover?(?h)
       assert !(r1 === RangeExtd(?a..?g))
+
+      assert  !RaN.cover?('pp')
+      assert  !RaN.cover?(5)
     end
 
     def test_each
@@ -501,6 +539,12 @@ end
         assert_equal(-6, i)
         break
       end
+
+      n = 0
+      rs.each_element do |i|
+        n += 1
+      end
+      assert_equal n, 6+4+2
     end	# def test_each_element
 
 
@@ -529,6 +573,16 @@ end
     end	# def test_size_element
 
 
+    def test_hash
+      assert_equal Rangeary(1...4).hash,  Rangeary(1...4).hash
+      assert_equal Rangeary(?a..?c).hash, Rangeary('A'.downcase..?c).hash
+      assert_equal Rangeary(1...4, RangeExtd(6...9,T)).hash, Rangeary(1...4, RangeExtd(6...9,T)).hash
+      assert(Rangeary(1...4).hash != (1...4).hash)
+      assert(Rangeary(1...4).hash != Rangeary(1..4).hash)
+      assert(Rangeary(1...4, RangeExtd(6...9,F)).hash != Rangeary(1...4, RangeExtd(6...9,T)).hash)
+    end	# def test_hash
+
+
     def test_in_document
       assert  Rangeary(RangeExtd(1,"<...",4), 5...8).equiv?(Rangeary(2..3, 5..7))      # => true
       assert_equal 33, Rangeary(2...4, 5..6, 8..9).flatten.reduce(:+)   # => 33

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rangeary
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Masa Sakano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_extd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 description: Rangeary is a sub-class of Array and represents any 1-dimensional multiple-range.  For
@@ -36,12 +36,12 @@ extensions: []
 extra_rdoc_files:
 - README.ja.rdoc
 files:
-- News
 - ChangeLog
+- News
 - README.ja.rdoc
 - Rakefile
-- rangeary.gemspec
 - lib/rangeary/rangeary.rb
+- rangeary.gemspec
 - test/test_rangeary.rb
 homepage: 
 licenses:
@@ -49,22 +49,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rangeary - class to represent any 1-dimensional multiple-range