synchronizable 0.0.2 → 0.0.3

data/lib/synchronizable.rb

@@ -13,10 +13,14 @@ module Synchronizable
 
     # redefine all user-defined methods to utilize lock
     obj.methods.each do |m|
-      next if IGNORABLE_METHOD_OWNERS.include?(obj.method(m).owner)
+      original_method = obj.method(m)
+      next if IGNORABLE_METHOD_OWNERS.include?(original_method.owner)
+
+      without_sync_method = "#{original_method.name}_without_sync"
+      obj.define_singleton_method(without_sync_method, original_method)
       obj.define_singleton_method(m) do |*args, &block|
         __lock.synchronize do
-          super(*args, &block)
+          send(without_sync_method, *args, &block)
         end
       end
     end

data/lib/synchronizable/version.rb

@@ -1,3 +1,3 @@
 module Synchronizable
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/synchronizable/synchronizable_spec.rb

@@ -1,7 +1,23 @@
 require 'spec_helper'
 
+class TestLock
+  attr_reader :sync_invoked
+
+  def initialize
+    @sync_invoked = false
+  end
+
+  def synchronize(&block)
+    @sync_invoked = true
+  end
+
+  def reset
+    @sync_invoked = false
+  end
+end
+
 describe Synchronizable do
-  context "when extended by an object" do
+  context "when extended" do
     let(:object) { String.new }
 
     it "creates an instance-level lock" do
@@ -11,18 +27,6 @@ describe Synchronizable do
     end
 
     it "creates a locked version of each original method" do
-      class TestLock
-        attr_reader :sync_invoked
-
-        def initialize
-          @sync_invoked = false
-        end
-
-        def synchronize(&block)
-          @sync_invoked = true
-        end
-      end
-
       lock = TestLock.new
       object.extend(Synchronizable)
       object.instance_variable_set(:@__lock, lock)
@@ -51,15 +55,33 @@ describe Synchronizable do
       t.extend(Synchronizable)
       t.m2.should == 10
     end
-  end
 
-  it "protects a block via #synchronize" do
-    s = ""
-    s.methods.should_not include(:synchronize)
-    s.extend(Synchronizable)
-    s.methods.should include(:synchronize)
-    s.synchronize do
-      s.split
+    it "handles singleton methods" do
+      class Foo
+        def self.m1
+          100
+        end
+      end
+
+
+      Foo.m1.should == 100
+      lock = TestLock.new
+      Foo.extend(Synchronizable)
+      Foo.instance_variable_set(:@__lock, lock)
+
+      lock.sync_invoked.should == false
+      Foo.m1
+      lock.sync_invoked.should == true
+    end
+
+    it "protects a block via #synchronize" do
+      s = ""
+      s.methods.should_not include(:synchronize)
+      s.extend(Synchronizable)
+      s.methods.should include(:synchronize)
+      s.synchronize do
+        s.split
+      end
     end
   end
-end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: synchronizable
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ryan LeCompte
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-29 00:00:00 -04:00
-default_executable: 
+date: 2011-08-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -25,10 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
   type: :development
   version_requirements: *id001
@@ -52,7 +43,6 @@ files:
 - spec/spec_helper.rb
 - spec/synchronizable/synchronizable_spec.rb
 - synchronizable.gemspec
-has_rdoc: true
 homepage: http://github.com/ryanlecompte/synchronizable
 licenses: []
 
@@ -66,21 +56,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: synchronizable
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Synchronizable is a generic way to provide per-object thread safety