sarah 2.1.0 → 2.2.0

data/HISTORY.txt

@@ -1,3 +1,7 @@
+2014-04-11 Version 2.2.0
+
+	Also allow :nsq selector for #each and #empty?.
+
 2014-04-10 Version 2.1.0
 
 	Added :nsq (non-sequential = sparse + random) selector for

data/lib/sarah.rb

@@ -60,11 +60,11 @@
 # @author Brian Katzung (briank@kappacs.com), Kappa Computer Solutions, LLC
 # @copyright 2013-2014 Brian Katzung and Kappa Computer Solutions, LLC
 # @license MIT License
-# @version 2.1.0
+# @version 2.2.0
 
 class Sarah
 
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
 
     # Private attributes:
     # seq [Array] An array of (zero-origin) sequential values.
@@ -550,17 +550,17 @@ class Sarah
     #
     # (#each_key alias since 2.0.0)
     #
-    # @param which [:all|:ary|:rnd|:seq|:spr] The data structures over
-    #  which to iterate. (Since 2.0.0)
+    # @param which [:all|:ary|:nsq|:rnd|:seq|:spr] The data structures over
+    #  which to iterate. (Since 2.0.0; :nsq since 2.2.0)
     # @return [Sarah]
     def each (which = :all)
 	case which when :all, :ary, :seq
 	    @seq.each_index { |i| yield i, @seq[i] }
 	end
-	case which when :all, :ary, :spr
+	case which when :all, :ary, :nsq, :spr
 	    @spr.keys.sort.each { |i| yield i, @spr[i] }
 	end
-	case which when :all, :rnd
+	case which when :all, :nsq, :rnd
 	    @rnd.each { |key, value| yield key, value }
 	end
 	self
@@ -574,13 +574,15 @@ class Sarah
 
     # Is the array (or are parts of it) empty?
     #
-    # @param which [:all|:ary|:rnd|:seq|:spr] When data structures to check
+    # @param which [:all|:ary|:nsq|:rnd|:seq|:spr] Which data structures to
+    #  check. (:nsq since 2.2.0)
     # @return [Boolean]
     # @since 2.0.0
     def empty? (which = :all)
 	case which
 	when :all then @seq.empty? && @spr.empty? && @rnd.empty?
 	when :ary then @seq.empty? && @spr.empty?
+	when :nsq then @spr.empty? && @rnd.empty?
 	when :rnd then @rnd.empty?
 	when :seq then @seq.empty?
 	when :spr then @spr.empty?

data/sarah.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name         = "sarah"
-  s.version      = "2.1.0"
-  s.date         = "2014-04-10"
+  s.version      = "2.2.0"
+  s.date         = "2014-04-11"
   s.authors      = ["Brian Katzung"]
   s.email        = ["briank@kappacs.com"]
   s.homepage     = "http://rubygems.org/gems/sarah"

data/test/16v220.rb

@@ -0,0 +1,31 @@
+require 'minitest/autorun'
+require 'sarah'
+
+# Test changes for version 2.2.0:
+# :nsq for #each and #empty?
+
+class TestSarah_16 < MiniTest::Unit::TestCase
+
+    def test_each
+	s = Sarah[1, 2, 5 => 'five', :a => ?a]
+	my_h = {}
+	s.each(:nsq) { |k, v| my_h[k] = v }
+	assert_equal s.to_h(:nsq), my_h, 'each :nsq matches to_h :nsq'
+    end
+
+    def test_empty
+	s0 = Sarah[1, 2, 5 => 'five', :a => ?a]
+	s = Sarah.new s0
+	assert_equal false, s.empty?(:nsq), 'not empty? :nsq'
+	s.delete_at 5
+	assert_equal false, s.empty?(:nsq), 'not empty? :nsq after delete 5'
+	s = Sarah.new s0
+	s.delete_at :a
+	assert_equal false, s.empty?(:nsq), 'not empty? :nsq after delete a'
+	s.delete_at 5
+	assert_equal true, s.empty?(:nsq), 'empty? :nsq after delete 5 and a'
+    end
+
+end
+
+# END

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
+  - 2
   - 0
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Brian Katzung
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-04-10 00:00:00 -05:00
+date: 2014-04-11 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -58,6 +58,7 @@ files:
 - test/14slice.rb
 - test/01instance.rb
 - test/12search.rb
+- test/16v220.rb
 - test/07inst_attr.rb
 - test/03set_get.rb
 - test/11each.rb
@@ -107,6 +108,7 @@ test_files:
 - test/14slice.rb
 - test/01instance.rb
 - test/12search.rb
+- test/16v220.rb
 - test/07inst_attr.rb
 - test/03set_get.rb
 - test/11each.rb