spruz 0.2.2 → 0.2.5

data/Rakefile

@@ -18,7 +18,7 @@ end
 
 desc "Creating documentation"
 task :doc do
-  ruby 'make_doc.rb'
+  sh "sdoc -t Spruz -o doc -m README README #{Dir['lib/**/*.rb']} * ' '}"
 end
 
 desc "Testing library"

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.5

data/lib/spruz/attempt.rb

@@ -0,0 +1,31 @@
+module Spruz
+  module Attempt
+    def attempt(attempts = 1, exception_class = StandardError, sleep_duration = nil, &block)
+      return if attempts <= 0
+      count = 0
+      if exception_class.nil?
+        begin
+          count += 1
+          if block.call(count)
+            return true
+          elsif sleep_duration and count < attempts
+            sleep sleep_duration
+          end
+        end until count == attempts
+        false
+      else
+        begin
+          count += 1
+          block.call(count)
+          true
+        rescue exception_class
+          if count < attempts
+            sleep_duration and sleep sleep_duration
+            retry
+          end
+          false
+        end
+      end
+    end
+  end
+end

data/lib/spruz/subhash.rb

@@ -10,7 +10,10 @@ module Spruz
     # MatchData instance if the matching pattern was a regular rexpression
     # otherwise it is nil.
     def subhash(*patterns)
-      patterns.map! { |pat| pat.respond_to?(:match) ? pat : pat.to_s }
+      patterns.map! do |pat|
+        pat = pat.to_sym.to_s if pat.respond_to?(:to_sym)
+        pat.respond_to?(:match) ? pat : pat.to_s
+      end
       result =
         if default_proc
           self.class.new(&default_proc)

data/lib/spruz/version.rb

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

data/lib/spruz/xt/attempt.rb

@@ -0,0 +1,7 @@
+require 'spruz/attempt'
+
+module Spruz
+  class ::Object
+    include Spruz::Attempt
+  end
+end

data/lib/spruz/xt.rb

@@ -15,4 +15,5 @@ module Spruz
   require 'spruz/xt/symbol_to_proc'
   require 'spruz/xt/write'
   require 'spruz/xt/deep_dup'
+  require 'spruz/xt/attempt'
 end

data/lib/spruz.rb

@@ -21,4 +21,5 @@ module Spruz
   require 'spruz/uniq_by'
   require 'spruz/write'
   require 'spruz/deep_dup'
+  require 'spruz/attempt'
 end

data/tests/test_spruz.rb

@@ -465,4 +465,35 @@ module Spruz
       end
     end
   end
+  
+  class TryTest < Test::Unit::TestCase
+    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 } }
+    end
+
+    class MyError < StandardError; end
+    class MyException < Exception; end
+
+    def test_attempt_default_exception
+      assert attempt(1) { |c| c != 1 and raise MyError }
+      assert attempt(3) { |c| c != 1 and raise MyError }
+      assert_false attempt(3) { |c| c != 4 and raise MyError }
+      assert_nil attempt(0) { |c| c != 4 and raise MyError }
+      assert_raise(Exception) { attempt(3) { raise Exception } }
+    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 } }
+    end
+  end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spruz
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  hash: 29
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Florian Frank
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +01:00
+date: 2011-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +40,7 @@ files:
 - lib/spruz/minimize.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
@@ -52,6 +59,7 @@ files:
 - lib/spruz/xt/shuffle.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
@@ -83,21 +91,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Useful stuff.