the_force 0.0.1 → 0.0.2

data/Rakefile

@@ -1,17 +1,19 @@
+require 'rubygems'
 require 'rake'
+require 'rake/testtask'
 
 include_file_globs = ['README.rdoc', 'LICENSE', 'Rakefile', 'init.rb', '{lib}/**/*']
 exclude_file_globs = []
 
 spec = Gem::Specification.new do |s| 
   s.name              = "the_force"
-  s.version           = '0.0.1'
+  s.version           = '0.0.2'
   s.author            = "Ryan Ziegler"
   s.email             = "info@symbolforce.com"
   s.homepage          = "http://www.symbolforce.com"
   s.platform          = Gem::Platform::RUBY
   s.summary           = "Common code for Symbolforce"
-  s.description       = "Common code for Symbolforce"
+  s.description       = "Common code for Symbolforce. tests pass in 1.8.6, 1.8.7, 1.9.1, and jruby 1.4"
   s.files             = FileList[include_file_globs].to_a - FileList[exclude_file_globs].to_a
   s.require_path      = "lib"
   s.test_files        = FileList["test/**/test_*.rb"].to_a
@@ -34,5 +36,13 @@ task :clean do
 end
 
 desc 'Default, do nothing'
-task :default do 
+task :default => :test do 
+end
+
+Rake::TestTask.new do |t|
+  t.libs << "lib/the_force/"
+  t.test_files = FileList['test/**/*.rb']
+  t.ruby_opts = ["-r rubygems"]
+  t.verbose = true
+  t.warning = true
 end

data/lib/the_force/keep_trying.rb

@@ -1,26 +1,42 @@
-require 'system_timer'
+module TheForce; end
+
+begin
+  require 'system_timer'
+  def TheForce.timeout(*args, &b)
+    SystemTimer.timeout_after(*args, &b)
+  end
+rescue LoadError => e
+  puts "WARNING - SystemTimer gem not found...reverting to Timeout::timeout"
+  require 'timeout'
+  def TheForce.timeout(*args, &b)
+    Timeout.timeout(*args, &b)
+  end
+end
 
 #CRZ - :exceptions uses is_a? not instance_of?
 module TheForce
-  def self.keep_trying(times = 3, options = {}, &b)
+  def keep_trying(options = {}, &b)
     options = {:exceptions => [StandardError], :timeout => false}.merge(options)
     options[:exceptions] = [options[:exceptions]] unless options[:exceptions].is_a? Array
     options[:exceptions] << Timeout::Error if options[:timeout]
+    options[:times] ||= 3
 
     try = 0;
     loop do
       begin
         try += 1
         if options[:timeout]
-          SystemTimer.timeout_after(options[:timeout]) do
+          TheForce.timeout(options[:timeout]) do
             return yield(try)
           end
         else
           return yield(try)
         end
       rescue Exception => e
-        raise if (try >= times) or not options[:exceptions].any? {|exception| e.is_a? exception}
+        raise if (try >= options[:times]) or not options[:exceptions].any? {|exception| e.is_a? exception}
       end
     end
   end
+  
+  module_function :keep_trying
 end

data/lib/the_force/object_support.rb

@@ -0,0 +1,52 @@
+#CRZ - imitate andand to a great degree. 
+#      Could have something more complex than if or unless, but they're enough, and didnt want to introduce proc overhead.
+#    - logic duplication, three ""inverted^ return ? caller : nil""s
+###  - better behavior for args WITH a block?
+
+if Module.constants.include?('BasicObject')
+  class ConditionalReturningMe < BasicObject
+  end
+else
+  class ConditionalReturningMe
+    instance_methods.reject { |m| m =~ /^__/ }.each { |m| undef_method m }
+  end
+end
+
+class ConditionalReturningMe
+  def initialize(me, inverted)
+    super()
+    @me = me
+    @inverted = inverted
+  end
+
+  def method_missing(sym, *args, &b)
+    (@inverted ^ @me.send(sym, *args, &b)) ? @me : nil
+  end
+end
+
+module TheForce
+  module ObjectSupport
+    def if(*args, &b)
+      ObjectSupport.conditional(self, false, *args, &b)
+    end
+
+    def unless(*args, &b)
+      ObjectSupport.conditional(self, true, *args, &b)
+    end
+
+    private
+    def self.conditional(who, inverted, *args, &b)
+      if block_given?
+        (inverted ^ yield(who)) ? who : nil
+      elsif args.length > 0
+        (inverted ^ who.send(*args)) ? who : nil
+      else
+        ConditionalReturningMe.new(who, inverted)
+      end
+    end
+  end
+end
+
+class Object
+  include TheForce::ObjectSupport
+end

data/lib/the_force/timer.rb

@@ -11,6 +11,7 @@ module TheForce
   
     #CRZ - for mixin; expects just a symbol and list of args
     #    - helps solve passing symbol problem
+    ###CRZ - rewrite with module_function? and move send()'ing into self.timer as well...
     def timer(*args, &b); 
       if block_given?
       	Force::Timer.timer(*args, &b)

data/lib/the_force.rb

@@ -1,3 +1,6 @@
-require 'the_force/keep_trying'
-require 'the_force/timer'
-require 'the_force/thread_pool'
+ROOT = File.join(File.dirname(__FILE__), 'the_force')
+require File.join(ROOT, 'keep_trying')
+require File.join(ROOT, 'thread_pool')
+require File.join(ROOT, 'timer')
+#require File.join(ROOT, 'object_support')
+true

data/test/unit/test_keep_trying.rb

@@ -0,0 +1,55 @@
+require 'test/unit'
+begin
+  require File.join(File.dirname(__FILE__), '../../lib/the_force/keep_trying.rb') 
+rescue LoadError
+  require File.expand_path('../../../lib/the_force/keep_trying.rb', __FILE__) 
+end
+
+class TestKeepTrying < Test::Unit::TestCase
+  def test_defaults_to_three_tries
+    assert_raise TestKeepTryingSpecialError do
+      TheForce.keep_trying do |try|
+        @try = try
+        raise TestKeepTryingSpecialError
+      end
+    end
+    
+    assert_equal 3, @try
+  end
+  
+  def test_will_throw_after_one_thousand_tries
+    assert_raise TestKeepTryingSpecialError do
+      TheForce.keep_trying(:times => 1000) do
+        raise TestKeepTryingSpecialError
+      end
+    end
+  end
+  
+  def test_will_throw_after_specific_number_of_tries
+    succeeded = false
+    
+    begin
+      TheForce.keep_trying(:times => 5) do |try|
+        raise StandardError, "try ##{try}"
+        succeeded = true
+      end
+    rescue StandardError => e
+      assert_equal "try #5", e.message
+    end
+    
+    assert_not_equal true, succeeded
+  end
+  
+  include TheForce
+  def test_keep_trying_is_a_module_function
+    assert self.respond_to?(:keep_trying, true)
+    assert !self.respond_to?(:keep_trying, false)
+    assert_respond_to TheForce, :keep_trying
+  end
+  
+  #def test_works_without_systemtimer
+  #def test_works_with_systemtimer
+end
+
+class TestKeepTryingSpecialError < StandardError
+end

data/test/unit/test_object_support.rb

@@ -0,0 +1,61 @@
+require 'test/unit'
+begin
+  require File.join(File.dirname(__FILE__), '../../lib/the_force/object_support.rb') 
+rescue LoadError
+  require File.expand_path('../../../lib/the_force/keep_trying.rb', __FILE__) 
+end
+
+class TestObjectSupport < Test::Unit::TestCase
+  def test_blank_slate_is_truly_blank
+    assert_equal "a", "a".if.length
+    assert_equal nil, "a".unless.length
+  end
+
+  
+  def test_if_as_blank_slate_when_it_returns_true
+    assert_equal "", "".if.empty?
+  end
+  def test_unless_as_blank_slate_when_it_returns_true
+    assert_equal nil, "".unless.empty?
+  end
+
+  
+  def test_if_as_blank_slate_when_it_returns_false
+    assert_equal nil, "a".if.empty?
+  end
+  def test_unless_as_blank_slate_when_it_returns_false
+    assert_equal "a", "a".unless.nil?
+  end
+
+
+  def test_if_with_block_when_it_returns_true
+    assert_equal "", "".if {|x| x.empty? }
+  end
+  def test_unless_with_block_when_it_returns_true
+    assert_equal nil, "".unless {|x| x.empty? }
+  end
+
+  
+  def test_if_with_block_when_it_returns_false
+    assert_equal nil, "a".if {|x| x.nil? }
+  end
+  def test_unless_with_block_when_it_returns_false
+    assert_equal "a", "a".unless {|x| x.nil? }
+  end
+
+
+  def test_if_with_symbol_and_args_when_it_return_true
+    assert_equal "a", "a".if(:eql?, "a")
+  end
+  def test_unless_with_symbol_and_args_when_it_return_true
+    assert_equal nil, "a".unless(:eql?, "a")
+  end
+  
+  
+  def test_if_with_symbol_and_args_when_it_return_false
+    assert_equal nil, "a".if(:eql?, "b")
+  end  
+  def test_unless_with_symbol_and_args_when_it_return_false
+    assert_equal "a", "a".unless(:eql?, "b")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: the_force
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ryan Ziegler
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-19 00:00:00 -05:00
+date: 2010-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: Common code for Symbolforce
+description: Common code for Symbolforce. tests pass in 1.8.6, 1.8.7, 1.9.1, and jruby 1.4
 email: info@symbolforce.com
 executables: []
 
@@ -27,9 +27,12 @@ files:
 - Rakefile
 - init.rb
 - lib/the_force/keep_trying.rb
+- lib/the_force/object_support.rb
 - lib/the_force/thread_pool.rb
 - lib/the_force/timer.rb
 - lib/the_force.rb
+- test/unit/test_keep_trying.rb
+- test/unit/test_object_support.rb
 has_rdoc: true
 homepage: http://www.symbolforce.com
 licenses: []
@@ -59,5 +62,6 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Common code for Symbolforce
-test_files: []
-
+test_files: 
+- test/unit/test_keep_trying.rb
+- test/unit/test_object_support.rb