range_extd 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c920255a38ca8b0805d5cfe50d4fbabd4718417f
-  data.tar.gz: 47fa8995de09e68a381144751fffe86e42082804
+  metadata.gz: dae65a7801b819ebc7527acbbf1080c33b39f30b
+  data.tar.gz: f242186b0e029594148cd3f09fd460fc0e8143ae
 SHA512:
-  metadata.gz: bf51ff3e606ec3b1955fe0978a407ec60130eacf0591fb3c5f85f927f890043e4adc6bd88a094ab14e19d954f40bef24e94048e0078ac8cfcbe0fcb775fccb3a
-  data.tar.gz: c8ac4fb7471a7246b5d238b3acbc7a97355e59d4addf10e8075c3376edfcdcdb8291b631921c76cac5b099ac21ca538dc07f30dddb87e7162844de71f5eb7099
+  metadata.gz: 7520c16da3bbfe5e13cb4c6d18553c412b6e34431704f4ba2f591549af3e712d285e821567cfa8f9bd597c09dcf4335a02d330085a9163adeb6b8ee4aef86025
+  data.tar.gz: 10febe606e27681b7f7e4fdb43589f3127ba1a5cd976baa97b8ba09da506c63659b6c81d05af2fe76dec88a7df233fd99cbbcec0b48e05f177cb6a4978e90a3f

data/ChangeLog

@@ -1,6 +1,16 @@
+-----
+(Version: 0.2.0)
+2014-04-29  Masa Saskano
+ * Changed the name of a constant from RangeExtd::EVERYTHING to RangeExtd::ALL.
+	Now accepts optional arguments in RangeExtd.new().
+	Bug fix in RangeExtd#size when the begin is Float/Rational.
+	Updated the embeded document in infinity.rb, mentioning about Time and Date classes.
+	Added a text file News at the top directory.
+
 -----
 (Version: 0.1.1)
-2014-04-28  Masa Saskano
+2014-04-28  Masa Sakano
+
  * Merging Japanese README into the same file as the English one.
 
 -----

data/News

@@ -0,0 +1,13 @@
+-----
+(Version: 0.2.0) 2014-04-29
+ * Changed the name of a constant from RangeExtd::EVERYTHING to RangeExtd::ALL.
+ * Now accepts optional arguments in RangeExtd.new().
+ * Bug fix in RangeExtd#size when the begin is Float/Rational.
+
+-----
+(Version: 0.1.1) 2014-04-28
+ * Merging Japanese README into the same file as the English one.
+
+-----
+(Version: 0.1.0) 2014-04-27
+ * First upload to RubyGems.

data/README.en.rdoc

@@ -5,7 +5,7 @@ This package contains RangeExtd class, the Extended Range class that features:
 
  1. includes exclude_begin? (to exclude the "begin" boundary),
  2. allows open-ended range (to the infinity),
- 3. defines NONE and EVERYTHING constants,
+ 3. defines NONE and ALL constants,
  4. the first self-consistent logical structure,
  5. complete backward-compatibility within the built-in Range.
 
@@ -62,6 +62,14 @@ with it, and I think it achieves the good logical completeness within the frame.
 I hope you find it to be useful.
 
 
+==== NOTE: Relationship with Rangesmaller
+
+This package supercedes the obsolete Rangesmaller package and class,
+with the added open-ended feature, and a different interface in
+creating a new instance.
+{https://rubygems.org/gems/rangesmaller}
+
+
 == Install
 
   gem install range_extd
@@ -100,18 +108,21 @@ Here are some simple examples.
    RangeExtd(1, 1, true, true) == RangeExtd::NONE  # => true
    RangeExtd(1, 1, false, true)  # => ArgumentError
    (RangeExtd::Infinity::NEGATIVE..RangeExtd::Infinity::POSITIVE) \
-    == RangeExtd::EVERYTHING  # => true
+    == RangeExtd::ALL  # => true
 
 Basically, there are two forms:
 
-   RangeExtd(range, [exclude_begin=false, [exclude_end=false]])
-   RangeExtd(obj_begin, obj_end, [exclude_begin=false, [exclude_end=false]])
+   RangeExtd(range, [exclude_begin=false, [exclude_end=false]], opts)
+   RangeExtd(obj_begin, obj_end, [exclude_begin=false, [exclude_end=false]], opts)
 
-The last two parameters specify the respective boundary to be excluded if true,
+The two parameters in the brackets specify the respective boundary to be excluded if true,
 or included if false (Default).  If they contradict to the first
 parameter of the range (Range or RangeExtd), those latter two parameters are used.
+Also, you can specify the same parameters as the options <tt>:exclude_begin</tt>
+and <tt>:exclude_end</tt>, which have the highest priority, if specified.
 <tt>RangeExtd.new()</tt> is the same thing.
 
+
 === Slightly more advanced uses
 
    (1..RangeExtd::Infinity::POSITIVE).each do |i|
@@ -129,7 +140,7 @@ parameter of the range (Range or RangeExtd), those latter two parameters are use
    RangeExtd(?a, ?e, true, true).to_a?  # => ["b", "c", "d"]
    RangeExtd(?a, ?e, true, true).empty? # => false
    RangeExtd::NONE.is_none?             # => true
-   RangeExtd::EVERYTHING.is_everything? # => true
+   RangeExtd::ALL.is_all?               # => true
 
 All the methods that are in the built-in Range can be used.
 
@@ -182,7 +193,7 @@ sections).  Any attempt to try to create an instance that is not
 There are two constants defined in this class:
 
 * RangeExtd::NONE
-* RangeExtd::EVERYTHING
+* RangeExtd::ALL
 
 The former represents the empty range and the latter does the range
 covers everything, namely open-ended for the both negative and
@@ -198,7 +209,7 @@ Range class, as RangeExtd inherits it).
 * <tt>empty?</tt> 
 * <tt>null?</tt> 
 * <tt>is_none?</tt> 
-* <tt>is_everything?</tt> 
+* <tt>is_all?</tt> 
 
 There is a class method, which is equivalent to the instance
 method <tt>valid?</tt>.

data/README.ja.rdoc

@@ -5,7 +5,7 @@ This package contains RangeExtd class, the Extended Range class that features:
 
  1. includes exclude_begin? (to exclude the "begin" boundary),
  2. allows open-ended range (to the infinity),
- 3. defines NONE and EVERYTHING constants,
+ 3. defines NONE and ALL constants,
  4. the first self-consistent logical structure,
  5. complete backward-compatibility within the built-in Range.
 
@@ -62,6 +62,14 @@ with it, and I think it achieves the good logical completeness within the frame.
 I hope you find it to be useful.
 
 
+==== NOTE: Relationship with Rangesmaller
+
+This package supercedes the obsolete Rangesmaller package and class,
+with the added open-ended feature, and a different interface in
+creating a new instance.
+{https://rubygems.org/gems/rangesmaller}
+
+
 == Install
 
   gem install range_extd
@@ -100,16 +108,18 @@ Here are some simple examples.
    RangeExtd(1, 1, true, true) == RangeExtd::NONE  # => true
    RangeExtd(1, 1, false, true)  # => ArgumentError
    (RangeExtd::Infinity::NEGATIVE..RangeExtd::Infinity::POSITIVE) \
-    == RangeExtd::EVERYTHING  # => true
+    == RangeExtd::ALL  # => true
 
 Basically, there are two forms:
 
-   RangeExtd(range, [exclude_begin=false, [exclude_end=false]])
-   RangeExtd(obj_begin, obj_end, [exclude_begin=false, [exclude_end=false]])
+   RangeExtd(range, [exclude_begin=false, [exclude_end=false]], opts)
+   RangeExtd(obj_begin, obj_end, [exclude_begin=false, [exclude_end=false]], opts)
 
-The last two parameters specify the respective boundary to be excluded if true,
+The two parameters in the brackets specify the respective boundary to be excluded if true,
 or included if false (Default).  If they contradict to the first
 parameter of the range (Range or RangeExtd), those latter two parameters are used.
+Also, you can specify the same parameters as the options <tt>:exclude_begin</tt>
+and <tt>:exclude_end</tt>, which have the highest priority, if specified.
 <tt>RangeExtd.new()</tt> is the same thing.
 
 === Slightly more advanced uses
@@ -129,7 +139,7 @@ parameter of the range (Range or RangeExtd), those latter two parameters are use
    RangeExtd(?a, ?e, true, true).to_a?  # => ["b", "c", "d"]
    RangeExtd(?a, ?e, true, true).empty? # => false
    RangeExtd::NONE.is_none?             # => true
-   RangeExtd::EVERYTHING.is_everything? # => true
+   RangeExtd::ALL.is_all?               # => true
 
 All the methods that are in the built-in Range can be used.
 
@@ -182,7 +192,7 @@ sections).  Any attempt to try to create an instance that is not
 There are two constants defined in this class:
 
 * RangeExtd::NONE
-* RangeExtd::EVERYTHING
+* RangeExtd::ALL
 
 The former represents the empty range and the latter does the range
 covers everything, namely open-ended for the both negative and
@@ -198,7 +208,7 @@ Range class, as RangeExtd inherits it).
 * <tt>empty?</tt> 
 * <tt>null?</tt> 
 * <tt>is_none?</tt> 
-* <tt>is_everything?</tt> 
+* <tt>is_all?</tt> 
 
 There is a class method, which is equivalent to the instance
 method <tt>valid?</tt>.
@@ -324,7 +334,7 @@ Versions:: The versions of this package follow Semantic Versioning (2.0.0) http:
 
  1. メソッド exclude_begin? の導入 (レンジの始点を除外できる),
  2. (無限大に)開いたレンジ
- 3. NONE (空レンジ) と EVERYTHING (全範囲レンジ)定数の導入
+ 3. NONE (空レンジ) と ALL (全範囲レンジ)定数の導入
  4. 初めて自己論理的に完結したレンジ構造の達成
  5. 組込Rangeとの完全後方互換性
 
@@ -377,6 +387,13 @@ Versions:: The versions of this package follow Semantic Versioning (2.0.0) http:
 このクラスが少なからぬ人に有用なものであることを願ってここにリリースします。
 
 
+==== 注: Rangesmaller との関係
+
+このパッケージは、(今やサポートされていない) Rangesmaller パッケージ及びクラスを
+後継するものです。同クラスの機能に、無限に開いた範囲を許す機能が加わり、また、オ
+ブジェクト生成時のインターフェースが変更されています。
+{https://rubygems.org/gems/rangesmaller}
+
 == インストール
 
   gem install range_extd
@@ -415,17 +432,20 @@ Versions:: The versions of this package follow Semantic Versioning (2.0.0) http:
    RangeExtd(1, 1, true, true) == RangeExtd::NONE  # => true
    RangeExtd(1, 1, false, true)  # => ArgumentError
    (RangeExtd::Infinity::NEGATIVE..RangeExtd::Infinity::POSITIVE) \
-    == RangeExtd::EVERYTHING  # => true
+    == RangeExtd::ALL  # => true
 
 インスタンスを作成するのには、二通りあります。
 
-   RangeExtd(range, [exclude_begin=false, [exclude_end=false]])
-   RangeExtd(obj_begin, obj_end, [exclude_begin=false, [exclude_end=false]])
+   RangeExtd(range, [exclude_begin=false, [exclude_end=false]], opts)
+   RangeExtd(obj_begin, obj_end, [exclude_begin=false, [exclude_end=false]], opts)
 
-後ろの二つのパラメーターが、それぞれ始点と終点とを除外する(true)、または含む
+大括弧の中の二つのパラメーターが、それぞれ始点と終点とを除外する(true)、または含む
 (false)を指示します。もし、その二つのパラメーターが最初のパラメーターのレンジ
 (Range or RangeExtd) と矛盾する場合は、ここで与えた二つのパラメーターが優先され
-ます。 <tt>RangeExtd.new()</tt> も上と同意味です。
+ます。同じパラメーターをオプションHash
+(<tt>:exclude_begin</tt> と <tt>:exclude_end</tt>)で指定することもできて、
+もし指定されればそれらが最高の優先度を持ちます。
+<tt>RangeExtd.new()</tt> も上と同意味です。
 
 
 === 少し上級編
@@ -445,7 +465,7 @@ Versions:: The versions of this package follow Semantic Versioning (2.0.0) http:
    RangeExtd(?a, ?e, true, true).to_a?  # => ["b", "c", "d"]
    RangeExtd(?a, ?e, true, true).empty? # => false
    RangeExtd::NONE.is_none?             # => true
-   RangeExtd::EVERYTHING.is_everything? # => true
+   RangeExtd::ALL.is_all?               # => true
 
 組込Rangeに含まれる全てのメソッドが使用可能です。
 
@@ -498,7 +518,7 @@ RangeExtd のインスタンスは、 Rangeと同じくイミュータブルで
 このクラスには、二つの定数が定義されています。
 
 * RangeExtd::NONE
-* RangeExtd::EVERYTHING
+* RangeExtd::ALL
 
 前者は、空レンジを表し、後者は全てを含むレンジ、すなわち正負両方向に開いたレンジを表します。
 
@@ -511,7 +531,7 @@ Rangeクラスのみで定義されていて、 RangeExtd はそれを継承し
 * <tt>empty?</tt> 
 * <tt>null?</tt> 
 * <tt>is_none?</tt> 
-* <tt>is_everything?</tt> 
+* <tt>is_all?</tt> 
 
 インスタンスメソッドの <tt>valid?</tt> に等価なクラスメソッドも一つあります。
 * <tt>RangeExtd.valid?</tt> 

data/lib/range_extd/infinity/infinity.rb

@@ -39,9 +39,11 @@ class RangeExtd < Range
   # However any operator is, by Ruby's definition, not commutative,
   # unless both the classes define so.
   #
-  # There are only two built-in classes that are Comparable: String and Numeric
+  # There are only three built-in classes that are Comparable: String, Time and Numeric
   # (except for Complex).
-  # For String class objects, the [#<=>] operator work as expected
+  # Note Date and DateTime objects are so, too, however practically
+  # they need "require", hence are (and must be) treated, the same as any other class.
+  # For String and Time class objects, the [#<=>] operator work as expected
   # in the commutative way.
   #    ?z <=> RangeExtd::Infinity::POSITIVE    # => nil
   #    RangeExtd::Infinity::POSITIVE <=> ?z    # => 1.
@@ -80,7 +82,8 @@ class RangeExtd < Range
   # However, some existing Comparable classes, perhaps written by some
   # one else may not be so polite, and has disabled comparison
   # with any object but those intended.  Unlucky you!
-  # 
+  # For example, the classes like Date and DateTime are one of them.
+  #
   # For that sort of circumstances,
   # the class method {RangeExtd::Infinity.overwrite_compare} provides
   # a convenient way to overcome this problem to make

data/lib/range_extd/range_extd.rb

@@ -39,11 +39,11 @@ class RangeExtd < Range
   end
 
   # Two constants
-  NONE        = RangeExtd.new(nil...nil, true, true)	# In Ruby1.8, this causes  ArgumentError: bad value for range (because (nil..nil) is unaccepted).
-  EVERYTHING  = RangeExtd.new(Infinity::NEGATIVE..Infinity::POSITIVE, false, false)
+  NONE = RangeExtd.new(nil...nil, true, true)	# In Ruby1.8, this causes  ArgumentError: bad value for range (because (nil..nil) is unaccepted).
+  ALL  = RangeExtd.new(Infinity::NEGATIVE..Infinity::POSITIVE, false, false)
 
   #NONE.freeze
-  #EVERYTHING.freeze
+  #ALL.freeze
 end
 
 
@@ -57,7 +57,7 @@ end
 # Extended Range class that features:
 #  1. includes exclude_begin? (to exclude the "begin" boundary),
 #  2. allows open-ended range (to the infinity),
-#  3. defines NONE and EVERYTHING constants,
+#  3. defines NONE and ALL constants,
 #  4. the first self-consistent logical structure,
 #  5. complete backward compatibility within the built-in Range.
 #
@@ -77,28 +77,34 @@ end
 #
 class RangeExtd < Range
 
-  # @note If the given optional parameter(s) of exclude_begin|end
-  #  do not agree with those in the first parameter (range),
-  #  the value(s) of the optional parameter(s) is used.
+  # @note The flag of exclude_begin|end can be given in the arguments in a couple of ways.
+  #  If there is any duplication, those specified in the optional hash have the highest
+  #  priority.  Then the two descrete Boolean parameters have the second.
+  #  If not, the values embeded in the {Range} or {RangeExtd} object
+  #  in the parameter are used.  In default, both of them are false.
   #
-  # @overload new(range, [exclude_begin=false, [exclude_end=false, [opts]]])
+  # @overload new(range, [exclude_begin=false, [exclude_end=false]], opts)
   #   @param [Object] range Instance of Range or its subclasses, including RangeExtd
-  #   @param exclude_begin [Object] true or false(Default) or any
-  #   @param exclude_end [Object] true or false(Default) or any.
+  #   @param exclude_begin [Boolean] If specified, this has the higher priority, or false in default.
+  #   @param exclude_end [Boolean] If specified, this has the higher priority, or false in default.
+  #   @option opts [Boolean] :exclude_begin If specified, this has the highest priority, or false in default.
+  #   @option opts [Boolean] :exclude_end If specified, this has the highest priority, or false in default.
   #
-  # @overload new(obj_begin, obj_end, [exclude_begin=false, [exclude_end=false, [opts]]])
+  # @overload new(obj_begin, obj_end, [exclude_begin=false, [exclude_end=false]], opts)
   #   @param obj_begin [Object] Any object that is {Comparable} with end
   #   @param obj_end [Object] Any object that is Comparable with begin
-  #   @param exclude_begin [Object] true or false(Default) or any
-  #   @param exclude_end [Object] true or false(Default) or any.
+  #   @param exclude_begin [Boolean] If specified, this has the lower priority, or false in default.
+  #   @param exclude_end [Boolean] If specified, this has the lower priority, or false in default.
+  #   @option opts [Boolean] :exclude_begin If specified, this has the higher priority, or false in default.
+  #   @option opts [Boolean] :exclude_end If specified, this has the higher priority, or false in default.
   #
   # Note no possible opts are defined at present.
   # Any opts given as Hash are simply ignored.
   #
   # @raise [ArgumentError] particularly if the range to be created is not {#valid?}.
-  def initialize(*inar)
+  def initialize(*inar, **hsopt)	# **k expression from Ruby 1.9?
 
-    arout = RangeExtd.class_eval{ _get_init_args(*inar) }	# From Ruby 1.8.7 (?)
+    arout = RangeExtd.class_eval{ _get_init_args(*inar, hsopt) }	# class_eval from Ruby 1.8.7 (?)
 
     ### The following routine is obsolete.
     ### Users, if they wish, should call RangeExtd::Infinity.overwrite_compare() beforehand.
@@ -151,10 +157,10 @@ class RangeExtd < Range
     self.begin.nil? && self.end.nil? && @exclude_begin && @exclude_end	# Direct comparison with object_id should be OK?
   end
 
-  # true if self is identical to {RangeExtd::EVERYTHING} ({#==} does not mean it at all!)
+  # true if self is identical to {RangeExtd::ALL} ({#==} does not mean it at all!)
   # @example
-  #    (RangeExtd::Infinity::NEGATIVE..RangeExtd::Infinity::POSITIVE).is_everything?  # => false
-  def is_everything?
+  #    (RangeExtd::Infinity::NEGATIVE..RangeExtd::Infinity::POSITIVE).is_all?  # => false
+  def is_all?
     self.begin.object_id == Infinity::NEGATIVE.object_id && self.end.object_id == Infinity::POSITIVE.object_id && !@exclude_begin && !@exclude_end	# Direct comparison with object_id should not work for this one!! (because users can create an identical one.)
   end
 
@@ -217,7 +223,7 @@ class RangeExtd < Range
   # If the object is open-ended to the negative (Infinity),
   # this returns nil in default, unless the given object is Numeric
   # (and comparable of Real), in which case this calls {#cover?},
-  # or if self is {RangeExtd::EVERYTHING} and the object is Comparable.
+  # or if self is {RangeExtd::ALL} and the object is Comparable.
   #
   # In the standard Range, this checks whether the given object is a member, hence,
   #    (?D..?z) === ?c    # => true
@@ -568,11 +574,59 @@ class RangeExtd < Range
   end
 
 
-
+  # Implementation of {Range#size} to this class.
+  #
+  # It is essentially the same, but the behaviour when {#exclude_begin?} is true
+  # may not always be natural.
   # See {#first} for the definition when {#exclude_begin?} is true.
+  #
+  # {Range#size} only works for Numeric ranges.
+  # And in {Range#size}, the value is calculated when the initial value is
+  # non-Integer, by stepping by 1.0 from the {#begin} value, and the returned
+  # value is an integer.
+  # For example,
+  #    (1.4..2.6).size == 2
+  # because both 1.4 and 2.4 (== 1.4+1.0) are included in the Range.
+  #
+  # That means you had better be careful with the uncertainty (error)
+  # of floating-point.  For example, at least in an environment,
+  #     4.8 - 4.5   # => 0.2999999999999998
+  #     (2.5...4.5000000000000021).size  => 2
+  #     (2.8...4.8000000000000021).size  => 3
+  #     (2.8..4.8).size  => 3
+  #
+  # In {RangeExtd#size}, the principle is the same.  If the {#begin} value has
+  # the method [#succ] defined, the object is regarded to consist of
+  # discrete values.  If not, it is a range with continuous elements.
+  # This dinstinguishment affects the behavious seriously in some cases
+  # when {#exclude_begin?} is true.  For example, the following two cases
+  # may seem unnatural.
+  #    RangeExtd(1..5, true, true)      == RangeExtd(Rational(1,1), 5, true, true)
+  #    RangeExtd(1..5, true, true).size != RangeExtd(Rational(1,1), 5, true, true).size
+  #
+  # Although those two objects are equal by [#==], they are different
+  # in nature, as far as {Range} and {RangeExtd} are concerned,
+  # and that is why they work differently;
+  #    RangeExtd(1..5, true, true).eql?(RangeExtd(Rational(1,1), 5, true, true))  # => false
+  #    RangeExtd(1..5, true, true).to_a      # => [2, 3, 4]
+  #    RangeExtd(1..5, true, true).to_a.size # => 3
+  #    RangeExtd(Rational(1,1)..5).to_a   # => TypeError
+  #
+  # Also, the floating-point uncertainties in Float can more often be
+  # problematic; for example, in an environment,
+  #    4.4 - 2.4   # => 2.0000000000000004
+  #    4.8 - 2.8   # => 2.0
+  #    RangeExtd(2.4..4.4, true, true).size  # => 3
+  #    RangeExtd(2.8..4.8, true, true).size  # => 2
+  # The last example is what you would naively expect, because both
+  #    2.8+a(lim a->0)  and  3.8+a(lim a->0) are
+  # in the range whereas 4.8 is not in the range by definition,
+  # but not the example right above.
+  #
   # @see http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/49797 [ruby-list:49797] from matz for how {Range#size} behaves (in Japanese).
   #
   # @return [Integer]  0 if {RangeExtd::NONE}
+  # @return [Float]  Float::INFINITY if either (or both) the end is infinity, regardless of the class of the elements. 
   # @return [nil] if the range is non-Numeric.
   def size(*rest)
     # (1..5).size	# => 5
@@ -607,9 +661,20 @@ class RangeExtd < Range
     elsif @exclude_begin
 
       begin
-        1.0 + self.begin()
+        _dummy = 1.0 + self.begin()	# _dummy to suppress warning: possibly useless use of + in void context
+
         # Numeric
-        Range.new(self.begin()+1, self.end, exclude_end?).send(__method__, *rest)	# Swap the order of '+' from the above, so that Integer/Rational is calculated as it is.
+        if defined? (self.begin().succ)
+          Range.new(self.begin().succ, self.end, exclude_end?).send(__method__, *rest)
+        else
+          size_no_exclude = Range.new(self.begin, self.end).send(__method__, *rest)	# exclude_end? == true, ie., Range with both ends inclusinve.
+          diff = self.end - self.begin
+          if diff.to_i == diff		# Integer difference
+            return size_no_exclude - 1	# At least exclude_begin?==true (so exclude_end? does not matter)
+          else
+            return size_no_exclude
+          end
+        end
       rescue TypeError
         # Non-Numeric
         if defined? self.begin().succ
@@ -658,7 +723,7 @@ class RangeExtd < Range
 
 
   # Private class method to evaluate the arguments.
-  def self._get_init_args(*inar)
+  def self._get_init_args(*inar, **hsopt)
     nMin = 1; nMax = 4
     if inar.size < nMin || nMax < inar.size
       raise ArgumentError, "wrong number of arguments (#{inar.size} for #{nMin}..#{nMax})"
@@ -694,7 +759,8 @@ class RangeExtd < Range
         raise ArgumentError, "wrong number of arguments (#{inar.size} for #{nMin}..#{nMax})"
       end
 
-      arRet = [inar[0].begin, inar[0].end, exclude_end, exclude_begin]
+      beginend = [inar[0].begin, inar[0].end]
+      # arRet = [inar[0].begin, inar[0].end, exclude_end, exclude_begin]
       # @rangepart = Range.new(inar[0].begin, inar[0].end, exclude_end)
 
     when :object
@@ -710,14 +776,22 @@ class RangeExtd < Range
         exclude_end   = false
       end
 
-      arRet = [inar[0], inar[1], exclude_end, exclude_begin]
+      beginend = [inar[0], inar[1]]
+      # arRet = [inar[0], inar[1], exclude_end, exclude_begin]
       # @rangepart = Range.new(inar[0], inar[1], exclude_end)
 
     else
       raise	# (for coding safety)
     end		# case hsFlag[:prm1st]
 
-    arRet
+    if hsopt.has_key?(:exclude_begin)
+      exclude_begin = (hsopt[:exclude_begin] && true)
+    end
+    if hsopt.has_key?(:exclude_end)
+      exclude_end   = (hsopt[:exclude_end] && true)
+    end
+
+    beginend + [exclude_end, exclude_begin]
 
   end	# def self._get_init_args(*inar)
 
@@ -751,6 +825,11 @@ class RangeExtd < Range
   #
   # Note the last example may change in the future release.
   #
+  # Note ([2]..[5]) is NOT valid, because Array does not include Comparable
+  # for some reason, as of Ruby 2.1.1, even though it has the redefined
+  # and working [#<=>].  You can make those valid, by including Comparable
+  # in Array class, should you wish.
+  #
   # @example
   #
   #    RangeExtd.valid?(nil..nil)     # => false
@@ -760,25 +839,35 @@ class RangeExtd < Range
   #    RangeExtd.valid?(0..0,  true)  # => false
   #    RangeExtd.valid?(0...0, true)  # => true
   #    RangeExtd.valid?(2..-1)        # => false
-  #    RangeExtd.valid?(RangeExtd::NONE)       # => true
-  #    RangeExtd.valid?(RangeExtd::EVERYTHING) # => true
-  #    RangeExtd.valid?(3..Float::INFINITY)    # => true
+  #    RangeExtd.valid?(RangeExtd::NONE)     # => true
+  #    RangeExtd.valid?(RangeExtd::ALL)      # => true
+  #    RangeExtd.valid?(3..Float::INFINITY)  # => true
   #    RangeExtd.valid?(3..Float::INFINITY, true)  # => true
   #    RangeExtd.valid?(RangeExtd::Infinity::NEGATIVE..?d)        # => true
   #    RangeExtd.valid?(RangeExtd::Infinity::NEGATIVE..?d, true)  # => true
   #
-  # @overload new(range, [exclude_begin=false, [exclude_end=false]])
+  # @note The flag of exclude_begin|end can be given in the arguments in a couple of ways.
+  #  If there is any duplication, those specified in the optional hash have the highest
+  #  priority.  Then the two descrete Boolean parameters have the second.
+  #  If not, the values embeded in the {Range} or {RangeExtd} object
+  #  in the parameter are used.  In default, both of them are false.
+  #
+  # @overload new(range, [exclude_begin=false, [exclude_end=false]], opts)
   #   @param [Object] range Instance of Range or its subclasses, including RangeExtd
-  #   @param exclude_begin [Object] true or false(Default) or any
-  #   @param exclude_end [Object] true or false(Default) or any.
+  #   @param exclude_begin [Boolean] If specified, this has the higher priority, or false in default.
+  #   @param exclude_end [Boolean] If specified, this has the higher priority, or false in default.
+  #   @option opts [Boolean] :exclude_begin If specified, this has the highest priority, or false in default.
+  #   @option opts [Boolean] :exclude_end If specified, this has the highest priority, or false in default.
   #
-  # @overload new(obj_begin, obj_end, [exclude_begin=false, [exclude_end=false]])
+  # @overload new(obj_begin, obj_end, [exclude_begin=false, [exclude_end=false]], opts)
   #   @param obj_begin [Object] Any object that is {Comparable} with end
   #   @param obj_end [Object] Any object that is Comparable with begin
-  #   @param exclude_begin [Object] true or false(Default) or any
-  #   @param exclude_end [Object] true or false(Default) or any.
+  #   @param exclude_begin [Boolean] If specified, this has the lower priority, or false in default.
+  #   @param exclude_end [Boolean] If specified, this has the lower priority, or false in default.
+  #   @option opts [Boolean] :exclude_begin If specified, this has the higher priority, or false in default.
+  #   @option opts [Boolean] :exclude_end If specified, this has the higher priority, or false in default.
   #
-  def self.valid?(*inar)
+  def self.valid?(*inar, **hsopt)
     (vbeg, vend, exc_beg, exc_end) = _get_init_args(*inar)
 
     if (vbeg.nil? && vend.nil? && exc_beg && exc_end)
@@ -920,7 +1009,7 @@ end	# class RangeExtd < Range
 #== Summary
 #
 # Modifies {#==}, {#eql?} and add methods of
-# {#valid?}, {#empty?}, {#null?}, {#is_none?} and {#is_everything?}.
+# {#valid?}, {#empty?}, {#null?}, {#is_none?} and {#is_all?}.
 #
 class Range
 
@@ -977,9 +1066,9 @@ class Range
   #    (0...0).valid?    # => false
   #    (2..-1).valid?    # => false
   #    RangeExtd(0...0, true)   # => true
-  #    (3..Float::INFINITY).valid?   # => true
-  #    RangeExtd::NONE.valid?        # => true
-  #    RangeExtd::EVERYTHING.valid?  # => true
+  #    (3..Float::INFINITY).valid?  # => true
+  #    RangeExtd::NONE.valid?       # => true
+  #    RangeExtd::ALL.valid?        # => true
   # 
   # @note By definition, all the {RangeExtd} instances are valid,
   #  because {RangeExtd#new} checks the validity.
@@ -1050,7 +1139,7 @@ class Range
         if self.exclude_end?
           true	# RangeOpen::NONE
         else
-          false	# RangeOpen::EVERYTHING
+          false	# RangeOpen::ALL
         end
       else
         if defined?(self.exclude_begin?)
@@ -1080,7 +1169,7 @@ class Range
   end
 
   # @return [FalseClass]
-  def is_everything?
+  def is_all?
     false
   end
 

data/range_extd.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{range_extd}
-  s.version = "0.1.1"
+  s.version = "0.2.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-04-28}
+  s.date = %q{2014-04-29}
   s.summary = %q{RangeExtd - Extended Range class with exclude_begin and open-ends}
-  s.description = %q{This defines a subclass of Range, RangeExtd and its subclass, 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.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}
   s.extra_rdoc_files = [
     # "LICENSE",
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     #".document",
      #".gitignore",
      #"VERSION",
+     "News",
      "ChangeLog",
      "README.en.rdoc",
      "README.ja.rdoc",

data/test/test_range_extd.rb

@@ -340,6 +340,69 @@ return
     end
 
 
+    def test_new_exclude_begin_end
+      # Form 1: 1 parameters
+      assert !RangeExtd(3..5).exclude_begin?
+      assert !RangeExtd(3..5).exclude_end?
+      assert !RangeExtd(3..5).exclude_begin?
+      assert  RangeExtd(3...5).exclude_end?
+
+      # Form 1: 1 parameters: RangeExtd
+      assert !RangeExtd(RangeExtd(3...5)).exclude_begin?
+      assert  RangeExtd(RangeExtd(3...5)).exclude_end?
+      assert  RangeExtd(RangeExtd(3...5,7)).exclude_begin?
+
+      # Form 1: 2-3 parameters
+      assert  RangeExtd(3..5,7).exclude_begin?
+      assert !RangeExtd(3..5,7).exclude_end?
+      assert  RangeExtd(3..5,7,8).exclude_begin?
+      assert  RangeExtd(3..5,7,8).exclude_end?
+      assert  RangeExtd(3...5,7,8).exclude_begin?
+      assert  RangeExtd(3...5,7,8).exclude_end?
+      assert !RangeExtd(3...5,7,nil).exclude_end?
+      assert  RangeExtd(RangeExtd(3...5,7,nil)).exclude_begin?
+      assert  RangeExtd(RangeExtd(3...5,7,nil),7,8).exclude_begin?
+      assert  RangeExtd(RangeExtd(3..5,7),7,8).exclude_begin?
+      assert  RangeExtd(RangeExtd(3..5,7),7,8).exclude_end?
+      assert !RangeExtd(RangeExtd(3...5,7),nil,nil).exclude_begin?
+      assert !RangeExtd(RangeExtd(3...5,7),nil,nil).exclude_end?
+
+      # Form 1: 2-3 parameters + opts
+      assert !RangeExtd(3..5,7,     :exclude_begin =>nil).exclude_begin?
+      assert  RangeExtd(3..5,7,     :exclude_end =>8).exclude_end?
+      assert !RangeExtd(3..5,7,8,   :exclude_begin =>nil).exclude_begin?
+      assert !RangeExtd(3..5,7,8,   :exclude_end =>nil).exclude_end?
+      assert !RangeExtd(3...5,7,8,  :exclude_begin =>nil).exclude_begin?
+      assert !RangeExtd(3...5,7,8,  :exclude_end =>nil).exclude_end?
+      assert  RangeExtd(3...5,7,nil,:exclude_end =>9).exclude_end?
+
+      # Form 2: 2 parameters
+      assert !RangeExtd(3,5).exclude_begin?
+      assert !RangeExtd(3,5).exclude_end?
+
+      # Form 2: 3-4 parameters
+      assert  RangeExtd(3,5,9).exclude_begin?
+      assert !RangeExtd(3,5,9).exclude_end?
+      assert  RangeExtd(3,5,true,9).exclude_begin?
+      assert  RangeExtd(3,5,true,9).exclude_end?
+      assert !RangeExtd(3,5,true,nil).exclude_end?
+
+      # Form 2: 2-4 parameters + opts
+      assert  RangeExtd(3,5,          :exclude_begin =>8).exclude_begin?
+      assert !RangeExtd(3,5,false,    :exclude_begin =>8).exclude_end?
+      assert  RangeExtd(3,5,false,    :exclude_begin =>8).exclude_begin?
+      assert  RangeExtd(3,5,false,9,  :exclude_begin =>8).exclude_begin?
+      assert  RangeExtd(3,5,false,9,  :exclude_begin =>8).exclude_end?
+      assert !RangeExtd(3,5,false,nil,:exclude_begin =>8).exclude_end?
+      assert !RangeExtd(3,5,false,9,  :exclude_begin =>nil).exclude_begin?
+      assert  RangeExtd(3,5,false,9,  :exclude_begin =>false).exclude_end?
+      assert  RangeExtd(3...5,false,nil,:exclude_begin =>8, :exclude_end =>8).exclude_begin?
+      assert  RangeExtd(3...5,false,nil,:exclude_begin =>8, :exclude_end =>8).exclude_end?
+      assert !RangeExtd(3,5,false,9,  :exclude_end =>8).exclude_begin?
+      assert !RangeExtd(3,5,false,9,  :exclude_end =>false).exclude_end?
+      assert  RangeExtd(3,5,false,nil,:exclude_end =>8).exclude_end?
+    end
+
     def test_exclude_begin
       b = 1
       e = 4
@@ -354,7 +417,7 @@ return
       assert !RangeExtd.new(b,e,nil).exclude_end?
       assert  RangeExtd.new(b,e,'c').exclude_begin?
       assert !RangeExtd.new(b,e,'c').exclude_end?
-      assert  RangeExtd.new(b,e,:a =>5).exclude_begin?
+      assert  RangeExtd.new(b,e, :exclude_begin => 5).exclude_begin?
       assert !RangeExtd.new(b,e, false, false).exclude_begin?
       assert !RangeExtd.new(b,e, false, false).exclude_end?
       assert !RangeExtd.new(b,e, false, true ).exclude_begin?
@@ -389,12 +452,12 @@ return
       assert !((1...1).is_none?)
     end
 
-    # Test of Range(Extd)#is_everything?
-    def test_is_everything
-      assert  (RangeExtd::EVERYTHING.is_everything?)
-      assert  (RangeExtd(RangeExtd::Infinity::NEGATIVE, RangeExtd::Infinity::POSITIVE).is_everything?)	# You can create it, if you want.
-      assert !((RangeExtd::Infinity::NEGATIVE..RangeExtd::Infinity::POSITIVE).is_everything?)	# Not the standard Range, though.
-      assert !(RangeExtd(-Float::INFINITY, Float::INFINITY).is_everything?)	# Different from Numeric, though.
+    # Test of Range(Extd)#is_all?
+    def test_is_all
+      assert  (RangeExtd::ALL.is_all?)
+      assert  (RangeExtd(RangeExtd::Infinity::NEGATIVE, RangeExtd::Infinity::POSITIVE).is_all?)	# You can create it, if you want.
+      assert !((RangeExtd::Infinity::NEGATIVE..RangeExtd::Infinity::POSITIVE).is_all?)	# Not the standard Range, though.
+      assert !(RangeExtd(-Float::INFINITY, Float::INFINITY).is_all?)	# Different from Numeric, though.
     end
 
 
@@ -768,7 +831,7 @@ return
       assert_equal(@ie-@ib-1, @s22.size)
       assert_equal nil, RangeExtd("a", "c").size
       assert_equal 0, RangeExtd::NONE.size
-      assert_equal Float::INFINITY, RangeExtd::EVERYTHING.size
+      assert_equal Float::INFINITY, RangeExtd::ALL.size
 
       # Infinity
       inf = Float::INFINITY
@@ -784,18 +847,38 @@ return
       assert_equal inf, RangeExtd(   1,  inf, excl_ini).size
 
       # Float
-      rfi = (2.4..4.4)	# size() => 3	see [ruby-list:49797] from matz
-      rfe = (2.4...4.4)	# size() => 2
+      rfi = (2.8..4.8)	# size() => 3	see [ruby-list:49797] from matz
+      rfe = (2.8...4.8)	# size() => 2
       siz = rfi.size
       assert_equal siz,   RangeExtd(rfi).size
       assert_equal siz-1, RangeExtd(rfe).size
       assert_equal siz-1, RangeExtd(rfi, excl_ini).size
-      assert_equal siz-2, RangeExtd(rfe, excl_ini).size
-      assert_equal siz-1, RangeExtd(Rational(24,10)..4.4,  excl_ini).size
-      assert_equal siz-2, RangeExtd(Rational(24,10)...4.4, excl_ini).size
+      assert_equal siz-1, RangeExtd(rfe, excl_ini).size
+
+      # Float No.2
+      # @see http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/49797 [ruby-list:49797] from matz for how {Range#size} behaves (in Japanese).
+      assert_equal  4, RaE(  1..5, true).size
+      assert_equal  3, RaE(  1..5, true, true).size		#  (1...5).size  == 3
+      assert_equal  4, RaE(Rational(1,1), 5, true, true).size   # (1/1...5).size == 4
+      assert_equal  3, RaE(1..Rational(5,1), true, true).size   # (1...1/5).size == 3
+      assert_equal  4, RaE(1..Rational(5,1), true, false).size  # (1..1/5).size  == 4
+
+      assert_equal  5, RaE(0.8..5, true).size
+      assert_equal  4, RaE(1.2..5, true).size
+      assert_equal  4, RaE(1.5..5, true).size
+      assert_equal  4, RaE(1.5..4.9, true).size
+      assert_equal  3, RaE(1.5...4.5, true).size
+      assert_equal  2, RaE(2.8...4.8, true).size
+      assert_equal  RaE(2.8...4.8, true).size, RaE(Rational(28,10)...4.8, true).size
+      assert_equal  RaE(2.8...4.8, true).size, RaE(Rational(28,10)...Rational(48,10), true).size
+      assert_equal  Float::INFINITY, RaE(0..Float::INFINITY, true).size
       # (0.5...5).size			# => 5 (Ruby 2.1)
       # (Rational(1,2)...5).size	# => 4 (Ruby 2.1) =>  Bug!
 
+      if 4.8-2.8 > 2	# => 2.0000000000000004
+        assert_equal  3, RaE(2.8...4.8, true).size
+      end
+
       # String
       rsi = (?a..?d)
       if rsi.size.nil?
@@ -876,10 +959,17 @@ return
       # end
     end
 
+    def test_Infinity_from_obj
+      assert_equal( 1, (?a <=> RangeExtd::Infinity::NEGATIVE))
+      assert_equal(-1, (?a <=> RangeExtd::Infinity::POSITIVE))
+      assert_equal( 1, (Time.now <=> RangeExtd::Infinity::NEGATIVE))
+      assert_equal(-1, (Time.now <=> RangeExtd::Infinity::POSITIVE))
+    end
+
 
     def test_Range_valid
       assert  RangeExtd::NONE.valid?
-      assert  RangeExtd::EVERYTHING.valid?
+      assert  RangeExtd::ALL.valid?
       assert  (1..3).valid?
       assert !(3..1).valid?
       assert  (?a..?a).valid?	# single element
@@ -904,7 +994,7 @@ return
 
     def test_Range_empty
       assert  RangeExtd::NONE.empty?
-      assert !RangeExtd::EVERYTHING.empty?
+      assert !RangeExtd::ALL.empty?
       assert    !(1..3).empty?
       assert_nil (3..1).empty?
       assert    !(?a..?a).empty?	# single element
@@ -933,7 +1023,7 @@ return
 
     def test_Range_nullfunc
       assert  RangeExtd::NONE.null?
-      assert !RangeExtd::EVERYTHING.null?
+      assert !RangeExtd::ALL.null?
       assert    !(1..3).null?
       assert     (3..1).null?
       assert    !(?a..?a).null?	# single element
@@ -996,15 +1086,15 @@ return
     end
 
 
-    def test_RangeExtd_everything
-      assert !RangeExtd::EVERYTHING.is_none?
-      assert  RangeExtd::EVERYTHING.valid?
-      assert !RangeExtd::EVERYTHING.null?
-      assert !RangeExtd::EVERYTHING.empty?
-      assert_equal (-Float::INFINITY..Float::INFINITY), RangeExtd::EVERYTHING
-      assert_equal RangeExtd::EVERYTHING, (-Float::INFINITY..Float::INFINITY)
-      assert_equal RangeExtd::Infinity::POSITIVE, RangeExtd::EVERYTHING.end
-      assert_equal RangeExtd::Infinity::NEGATIVE, RangeExtd::EVERYTHING.begin
+    def test_RangeExtd_all
+      assert !RangeExtd::ALL.is_none?
+      assert  RangeExtd::ALL.valid?
+      assert !RangeExtd::ALL.null?
+      assert !RangeExtd::ALL.empty?
+      assert_equal (-Float::INFINITY..Float::INFINITY), RangeExtd::ALL
+      assert_equal RangeExtd::ALL, (-Float::INFINITY..Float::INFINITY)
+      assert_equal RangeExtd::Infinity::POSITIVE, RangeExtd::ALL.end
+      assert_equal RangeExtd::Infinity::NEGATIVE, RangeExtd::ALL.begin
     end
 
     def test_RangeExtd_num
@@ -1147,6 +1237,22 @@ return
       assert_raises(TypeError){ (1.3...5).minmax }	# => TypeError: can't iterate from Float
 
       # RangeExtd#size
+      assert_equal 2, (1.4..2.6).size
+      assert_equal 2, (1.4..2.6).size
+      #     (2.5...4.5000000000000021).size  => 2
+      #     (2.8...4.8000000000000021).size  => 3
+      assert_equal 3, (2.8..4.8).size
+      assert(RangeExtd(1..5, true, true)      == RangeExtd(Rational(1,1), 5, true, true))
+      assert(RangeExtd(1..5, true, true).size != RangeExtd(Rational(1,1), 5, true, true).size)
+      #    4.4 - 2.4   # => 2.0000000000000004
+      #    4.8 - 2.8   # => 2.0
+      assert(! RangeExtd(1..5, true, true).eql?(RangeExtd(Rational(1,1), 5, true, true)))  # => false
+      assert_equal [2, 3, 4], RangeExtd(1..5, true, true).to_a      # => [2, 3, 4]
+      assert_equal 3, RangeExtd(1..5, true, true).to_a.size # => 3
+      assert_raises(TypeError){ RangeExtd(Rational(1,1)..5).to_a }	# => TypeError
+      assert_equal 3, RangeExtd(2.4..4.4, true, true).size  # => 3
+      assert_equal 2, RangeExtd(2.8..4.8, true, true).size  # => 2
+
       assert_equal 5, (1..5).size
       assert_equal 4, (1...5).size
       assert_equal 5, (0.8...5).size	# => 5	# Why???
@@ -1170,7 +1276,7 @@ return
       assert  RangeExtd.valid?(0...0, true)  # => true
       assert !RangeExtd.valid?(2..-1)        # => false
       assert  RangeExtd.valid?(RangeExtd::NONE)       # => true
-      assert  RangeExtd.valid?(RangeExtd::EVERYTHING) # => true
+      assert  RangeExtd.valid?(RangeExtd::ALL) # => true
       assert  RangeExtd.valid?(3..Float::INFINITY)    # => true
       assert  RangeExtd.valid?(3..Float::INFINITY, true)  # => true
       assert  RangeExtd.valid?(RangeExtd::Infinity::NEGATIVE..?d)        # => true
@@ -1190,7 +1296,7 @@ return
       assert  RangeExtd(0...0, true)   # => true
       assert  (3..Float::INFINITY).valid?   # => true
       assert  RangeExtd::NONE.valid?        # => true
-      assert  RangeExtd::EVERYTHING.valid?  # => true
+      assert  RangeExtd::ALL.valid?  # => true
 
       # Range.empty?
       assert_equal nil, (nil..nil).empty?  # => nil

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: range_extd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Masa Sakano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies: []
-description: This defines a subclass of Range, RangeExtd and its subclass, RangeExtd::Infinity.  The
+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
   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
@@ -23,6 +23,7 @@ extra_rdoc_files:
 - README.en.rdoc
 - README.ja.rdoc
 files:
+- News
 - ChangeLog
 - README.en.rdoc
 - README.ja.rdoc