spruz 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/spruz/attempt.rb

@@ -1,6 +1,15 @@
 module Spruz
   module Attempt
-    def attempt(attempts = 1, exception_class = StandardError, sleep_duration = nil, &block)
+    def attempt(opts = {}, &block)
+      sleep           = nil
+      exception_class = StandardError
+      if Numeric === opts
+        attempts = opts
+      else
+        attempts        = opts[:attempts] || 1
+        exception_class = opts[:exception_class] if opts.key?(:exception_class)
+        sleep           = opts[:sleep]
+      end
       return if attempts <= 0
       count = 0
       if exception_class.nil?
@@ -8,8 +17,8 @@ module Spruz
           count += 1
           if block.call(count)
             return true
-          elsif sleep_duration and count < attempts
-            sleep sleep_duration
+          elsif count < attempts
+            sleep_duration(sleep, count)
           end
         end until count == attempts
         false
@@ -20,12 +29,23 @@ module Spruz
           true
         rescue exception_class
           if count < attempts
-            sleep_duration and sleep sleep_duration
+            sleep_duration(sleep, count)
             retry
           end
           false
         end
       end
     end
+
+    private
+
+    def sleep_duration(duration, count)
+      case duration
+      when Numeric
+        sleep duration
+      when Proc
+        sleep duration.call(count)
+      end
+    end
   end
 end

data/lib/spruz/hash_union.rb

@@ -1,7 +1,12 @@
 module Spruz
   module HashUnion
     def |(other)
-      other = other.to_hash if other.respond_to?(:to_hash)
+      case
+      when other.respond_to?(:to_hash)
+        other = other.to_hash
+      when other.respond_to?(:to_h)
+        other = other.to_h
+      end
       other.merge(self)
     end
   end

data/lib/spruz/version.rb

@@ -1,6 +1,6 @@
 module Spruz
   # Spruz version
-  VERSION         = '0.2.5'
+  VERSION         = '0.2.6'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/test_spruz.rb

@@ -320,6 +320,18 @@ module Spruz
   class HashUnionTest < Test::Unit::TestCase
     require 'spruz/xt/hash_union'
 
+    class HashLike1
+      def to_hash
+        { 'foo' => true }
+      end
+    end
+
+    class HashLike2
+      def to_h
+        { 'foo' => true }
+      end
+    end
+
     def test_union
       defaults = { 'foo' => true, 'bar' => false, 'quux' => nil }
       hash = { 'foo' => false }
@@ -337,6 +349,11 @@ module Spruz
         ['quux', true] ],
         hash.sort
     end
+
+    def test_hash_conversion
+      assert_equal({ 'foo' => true }, { } | HashLike1.new)
+      assert_equal({ 'foo' => true }, { } | HashLike2.new)
+    end
   end
 
   class SubhashTest < Test::Unit::TestCase
@@ -470,11 +487,11 @@ module Spruz
     require 'spruz/xt/attempt'
 
     def test_attempt_block_condition
-      assert attempt(1, nil) { |c| c == 1 }
-      assert attempt(3, nil) { |c| c == 1 }
-      assert_false attempt(3, nil) { |c| c == 4 }
-      assert_nil attempt(0, nil) { |c| c == 4 }
-      assert_raise(Exception) { attempt(3, nil) { raise Exception } }
+      assert attempt(:attempts => 1, :exception_class => nil) { |c| c == 1 }
+      assert attempt(:attempts => 3, :exception_class => nil) { |c| c == 1 }
+      assert_false attempt(:attempts => 3, :exception_class => nil) { |c| c == 4 }
+      assert_nil attempt(:attempts => 0, :exception_class => nil) { |c| c == 4 }
+      assert_raise(Exception) { attempt(:attempts => 3, :exception_class => nil) { raise Exception } }
     end
 
     class MyError < StandardError; end
@@ -489,11 +506,11 @@ module Spruz
     end
 
     def test_attempt_exception
-      assert attempt(1, MyException) { |c| c != 1 and raise MyException }
-      assert attempt(3, MyException) { |c| c != 1 and raise MyException }
-      assert_false attempt(3, MyException) { |c| c != 4 and raise MyException }
-      assert_nil attempt(0, MyException) { |c| c != 4 and raise MyException }
-      assert_raise(Exception) { attempt(3, MyException) { raise Exception } }
+      assert attempt(:attempts => 1, :exception_class => MyException) { |c| c != 1 and raise MyException }
+      assert attempt(:attempts => 3, :exception_class => MyException) { |c| c != 1 and raise MyException }
+      assert_false attempt(:attempts => 3, :exception_class => MyException) { |c| c != 4 and raise MyException }
+      assert_nil attempt(:attempts => 0, :exception_class => MyException) { |c| c != 4 and raise MyException }
+      assert_raise(Exception) { attempt(:attempts => 3, :exception_class => MyException) { raise Exception } }
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spruz
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Florian Frank
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 +01:00
-default_executable: 
+date: 2011-04-29 00:00:00 Z
 dependencies: []
 
 description: All the stuff that isn't good/big enough for a real library.
@@ -28,57 +27,56 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- bin/enum
-- VERSION
-- README
+- tests/test_spruz_memoize.rb
+- tests/test_spruz.rb
+- LICENSE
 - Rakefile
-- lib/spruz/limited.rb
-- lib/spruz/null.rb
-- lib/spruz/time_dummy.rb
+- lib/spruz.rb
+- lib/spruz/hash_union.rb
+- lib/spruz/write.rb
+- lib/spruz/version.rb
+- lib/spruz/round.rb
+- lib/spruz/go.rb
+- lib/spruz/generator.rb
 - lib/spruz/shuffle.rb
-- lib/spruz/to_proc.rb
-- lib/spruz/minimize.rb
+- lib/spruz/deep_dup.rb
+- lib/spruz/memoize.rb
 - lib/spruz/subhash.rb
-- lib/spruz/count_by.rb
-- lib/spruz/attempt.rb
-- lib/spruz/round.rb
-- lib/spruz/partial_application.rb
-- lib/spruz/uniq_by.rb
-- lib/spruz/p.rb
 - lib/spruz/bijection.rb
+- lib/spruz/limited.rb
+- lib/spruz/attempt.rb
+- lib/spruz/to_proc.rb
 - lib/spruz/module_group.rb
-- lib/spruz/deep_dup.rb
-- lib/spruz/memoize.rb
-- lib/spruz/write.rb
-- lib/spruz/generator.rb
-- lib/spruz/hash_union.rb
-- lib/spruz/version.rb
-- lib/spruz/go.rb
-- lib/spruz/xt/null.rb
-- lib/spruz/xt/time_dummy.rb
+- lib/spruz/null.rb
+- lib/spruz/xt.rb
+- lib/spruz/once.rb
+- lib/spruz/xt/hash_union.rb
+- lib/spruz/xt/write.rb
+- lib/spruz/xt/irb.rb
+- lib/spruz/xt/round.rb
 - lib/spruz/xt/shuffle.rb
+- lib/spruz/xt/deep_dup.rb
+- lib/spruz/xt/symbol_to_proc.rb
 - lib/spruz/xt/subhash.rb
-- lib/spruz/xt/count_by.rb
 - lib/spruz/xt/attempt.rb
-- lib/spruz/xt/round.rb
-- lib/spruz/xt/partial_application.rb
-- lib/spruz/xt/uniq_by.rb
+- lib/spruz/xt/null.rb
 - lib/spruz/xt/p.rb
-- lib/spruz/xt/blank.rb
-- lib/spruz/xt/deep_dup.rb
-- lib/spruz/xt/symbol_to_proc.rb
-- lib/spruz/xt/write.rb
-- lib/spruz/xt/hash_union.rb
+- lib/spruz/xt/partial_application.rb
+- lib/spruz/xt/time_dummy.rb
 - lib/spruz/xt/full.rb
-- lib/spruz/xt/irb.rb
-- lib/spruz/once.rb
-- lib/spruz/xt.rb
-- lib/spruz.rb
-- tests/test_spruz.rb
-- tests/test_spruz_memoize.rb
+- lib/spruz/xt/count_by.rb
+- lib/spruz/xt/blank.rb
+- lib/spruz/xt/uniq_by.rb
+- lib/spruz/p.rb
+- lib/spruz/minimize.rb
+- lib/spruz/partial_application.rb
+- lib/spruz/time_dummy.rb
+- lib/spruz/count_by.rb
+- lib/spruz/uniq_by.rb
+- bin/enum
+- README
+- VERSION
 - install.rb
-- LICENSE
-has_rdoc: true
 homepage: http://flori.github.com/spruz
 licenses: []
 
@@ -111,10 +109,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.1
 signing_key: 
 specification_version: 3
 summary: Useful stuff.
 test_files: 
-- tests/test_spruz.rb
 - tests/test_spruz_memoize.rb
+- tests/test_spruz.rb