rangesmaller 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f34ade6a7332bb19809904e8b89b419c5c71c1
-  data.tar.gz: 2931d7e5c7e98cedffab98faf3dfb45f83e638dd
+  metadata.gz: bb2dd52eccdf235b18ce0aa93c9a55fb4816eaf7
+  data.tar.gz: bccb5a3d21d6f41ee58cca2692cc06c77178df69
 SHA512:
-  metadata.gz: 48ee7f0ef72c8cf5db14554f2843b69fa3d06728c5eede5092bbd8b9c2b0a5516922d8131d0a3442c1e55c92af997d001860d2085876c47cd3b6c81fdb7b0947
-  data.tar.gz: 7990cd5e77b37a10d1be51a069e97c36eabf56834fb9725764c542e3b302882b2d81a57e08f2956e99e0c38f62e7481102fcf506e30b098a73ca890d45b74df3
+  metadata.gz: 187dd3c240b5cad7f8f084bcca0ba36f242d5a7d8ff9272e1fac16b36f535dc64c650ff66c88fc870ebec0e4b9afd7098edc430bcb11f6237d60d3d8350455dc
+  data.tar.gz: 6f3f41877a00fb9e17e5c4d8216c9b7224dd53289e42e2a257555fb01d1d3a7bcecd77abcca0176f32e251e07e98e58574c075aabd8cc6541d7c6e3af6dafbf4

data/ChangeLog

@@ -0,0 +1,36 @@
+-----
+(Version: v1.0.3)
+2014-04-24  Masa Saskano
+ * Cosmetic minor changes.
+
+-----
+2014-04-23  Masa Sakano
+
+ * Rangesmaller#to_s changed behaviour in the previous version, hence modified it back to the original.
+
+-----
+2014-04-23  Masa Sakano
+
+ * ChangeLog is added.  Minor bug-fix: Rangesmaller#inspect used to use #to_s() but now uses #inspect() for its elements.
+
+-----
+(Version: v1.0.2)
+2014-04-22  Masa Sakano
+
+ * v1.0.2 (No change other than Version statement in rangesmaller.gemspec)
+
+-----
+2014-04-22  Masa Sakano
+
+ * Eliminate the wrong warning issued when the option of any object but true/false is given for :exclude_end, together with a Range, in Rangesmaller.new().
+
+-----
+2014-04-22  Masa Sakano
+
+ * v1.0.1: Minor bug fixes of rangesmaller.  Now each() and step() return Enumerator when no block is given, the same as Range, and step() returns self if not (In the previous version it returned Range object if exclude_begin is true).  Fixes of the comments in the source code rangesmaller.rb so yard interprets them correctly.
+
+-----
+(Version: v1.0.0)
+2014-04-22  Masa Sakano
+
+ * Initial commit of rangesmaller.

data/README.rdoc

@@ -25,6 +25,8 @@ Alternatively get it from
   http://rubygems.org/gems/rangesmaller
 
 Then all you need to do is
+  require 'rangesmaller/rangesmaller'
+or, possibly as follows, if you manually install it
   require 'rangesmaller'
 in your Ruby script (or irb).
 
@@ -89,10 +91,11 @@ They are evaluated as follows:
 
 Nothing planned.
 
+== Miscellaneous
+
 == Copyright etc
 
 Author::  Masa Sakano < imagine a_t sakano dot co dot uk >
 License:: MIT.
 Warranty:: No warranty whatsoever.
-
-
+Versions:: The versions of this package follow Semantic Versioning (2.0.0) http://semver.org/

data/lib/rangesmaller/rangesmaller.rb

@@ -38,8 +38,8 @@ class Rangesmaller < Range
   #   @param obj_begin [Object] Any object (preferably {#Comparable})
   #   @param obj_end [Object] Any object, compatible with begin
   #   @param opts [Hash] see below
-  #   @option opts [Object] :exclude_end the end boundary is excluded, if false (Default)
-  #   @option opts [Object] :exclude_begin the begin boundary is excluded, if false (Default)
+  #   @option opts [Object] :exclude_end the end boundary is excluded, or false (Default)
+  #   @option opts [Object] :exclude_begin the begin boundary is excluded, or false (Default)
   #
   # @note The here-mentioned "any" object means any object that can consist of {Range}.
   #   For example, (nil..nil) is accepted, but (Complex(2,3)..Complex(2,3)) is not.
@@ -60,7 +60,7 @@ class Rangesmaller < Range
       r = inar[0]
       if defined?(r.rangepart) && defined?(r.exclude_begin?)
         # Rangesmaller
-        @exclude_begin = r.exclude_begin?
+        @exclude_begin = (r.exclude_begin? && true)
         @rangepart = r.rangepart
         r = @rangepart
         super(r.begin, r.end, r.exclude_end?)
@@ -70,7 +70,7 @@ class Rangesmaller < Range
           super(r.begin, r.end, r.exclude_end?)
           @rangepart = r
         else
-          raise ArgumentError, "bad (first) value for Rangesmaller"
+          raise ArgumentError, "bad value for Rangesmaller"
         end
       end
 
@@ -79,10 +79,10 @@ class Rangesmaller < Range
       if defined? r.exclude_end?
 	# Arg: (Range, :exclude_begin => false)
         begin
-          @exclude_begin = inar[1][:exclude_begin]
+          @exclude_begin = (inar[1][:exclude_begin] && true)
         rescue
           # cf., Rangesmaller.new(nil,5)	# => ArgumentError: bad value for range
-          raise ArgumentError, "bad (second) value for Rangesmaller"
+          raise ArgumentError, "bad value for Rangesmaller"
         end
 
         if defined?(r.begin) && defined?(r.end)	# && defined?(r.exclude_end?)
@@ -99,7 +99,7 @@ class Rangesmaller < Range
             # The above is just a warning, hence no exception should be raised here, whatever the reason.
           end
         else	# Very unlikely, but possible.
-          raise ArgumentError, "bad (first) value for Rangesmaller"
+          raise ArgumentError, "bad value for Rangesmaller"
         end
       else	# Arg: (Num(Begin), Num(End))
         super
@@ -108,7 +108,7 @@ class Rangesmaller < Range
     when 3
       flag_end = false
       begin
-        @exclude_begin = inar[2][:exclude_begin]
+        @exclude_begin = (inar[2][:exclude_begin] && true)
 
         if inar[2].has_key?(:exclude_end)
           flag_end = true
@@ -350,7 +350,7 @@ class Rangesmaller < Range
           end
 
       else
-        raise ArgumentError, "wrong number of arguments (#{rest.size} for 2..3)"
+        raise ArgumentError, "wrong number of arguments (#{rest.size} for 0..1)"
       end
     end		# if ! @exclude_begin
   end	# def first(*rest)
@@ -367,21 +367,28 @@ class Rangesmaller < Range
   end
 
 
-  # @return [String] eg., "(1<...5)", "(1<..5)", if {#exclude_begin?} is true,
+  # Return eg., '("a"<..."c")', '("a"<.."c")', if {#exclude_begin?} is true,
   #  or else, identical to those for {Range}.
+  # @return [String]
   def inspect
     if @exclude_begin
-      if exclude_end?
-        midStr = "<..."
-      else
-        midStr = "<.."
-      end
-      self.begin.to_s + midStr + self.end.to_s
+      self.begin.inspect + midstr_when_exclude_begin() + self.end.inspect
+    else
+      super
+    end
+  end
+
+
+  # Return eg., "(a<...c)", "(a<..c)", if {#exclude_begin?} is true,
+  #  or else, identical to those for {Range}.
+  # @return [String]
+  def to_s
+    if @exclude_begin
+      self.begin.to_s + midstr_when_exclude_begin() + self.end.to_s
     else
       super
     end
   end
-  alias :to_s :inspect
 
 
   # See {#first} for the definition when {#exclude_begin?} is true.
@@ -538,7 +545,16 @@ class Rangesmaller < Range
     end
   end
 
+  private
 
+  # Middle string for {#inspect} and {#to_s}
+  def midstr_when_exclude_begin
+    if exclude_end?
+      "<..."
+    else
+      "<.."
+    end
+  end
 end	# class Rangesmaller < Range
 
 

data/rangesmaller.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rangesmaller}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
   # 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-22}
+  s.date = %q{2014-04-24}
   s.summary = %q{Rangesmaller class -- Range with include_begin?()}
   s.description = %q{This defines a subclass of Range, Rangesmaller class.  Users can define whether the begin boundary is exclusive or inclusive, in addition to the end boundary as in the standard Range.}
   # s.email = %q{abc@example.com}
@@ -20,12 +20,15 @@ Gem::Specification.new do |s|
     #".document",
      #".gitignore",
      #"VERSION",
+     "ChangeLog",
      "README.rdoc",
      "Rakefile",
      "rangesmaller.gemspec",
      "lib/rangesmaller/rangesmaller.rb",
      "test/test_rangesmaller.rb",
   ]
+  # s.add_runtime_dependency 'library', '~> 2.2', '>= 2.2.1'	# 2.2.1 <= Ver < 2.3.0
+  # s.add_development_dependency "bourne", [">= 0"]
   # s.homepage = %q{http://}
   s.rdoc_options = ["--charset=UTF-8"]
   # s.require_paths = ["lib"]

data/test/test_rangesmaller.rb

@@ -516,6 +516,13 @@ p $LOADED_FEATURES.grep(/#{Regexp.quote(libfilebase)}$/)
     end	# def test_step
 
 
+    def test_to_s
+      assert_equal 'a...c',  Rangesmaller(?a...?c).to_s
+      assert_equal 'a<..c',  Rangesmaller(?a..?c,  :exclude_begin => true).to_s
+      assert_equal 'a<...c', Rangesmaller(?a...?c, :exclude_begin => true).to_s
+      assert_equal '"a"<.."c"',  Rangesmaller(?a..?c,  :exclude_begin => true).inspect
+    end
+
   end	# class TestFoo < MiniTest::Unit::TestCase
 
 #end	# if $0 == __FILE__

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rangesmaller
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Masa Sakano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies: []
 description: This defines a subclass of Range, Rangesmaller class.  Users can define
   whether the begin boundary is exclusive or inclusive, in addition to the end boundary
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- ChangeLog
 - README.rdoc
 - Rakefile
 - rangesmaller.gemspec