wrap 1.0.0 → 1.1.0

data/lib/wrap.rb

@@ -5,7 +5,7 @@
 ##
 #
   class << Wrap
-    Version = '1.0.0' unless defined?(Version)
+    Version = '1.1.0' unless defined?(Version)
 
     def version
       Version
@@ -69,7 +69,7 @@
         begin
           super
         ensure
-          rewrap!(name) if wrapped?(name)
+          wrap!(name) if wrapped?(name)
         end
       end
 
@@ -83,18 +83,35 @@
             rescue NameError
               nil
             end
-            rewrap!(name)
+            wrap!(name)
           end
         end
       end
 
       def wrap(name, *args, &block)
-        define_method(name){} unless method_defined?(name)
-        wrap!(name)
+        wrapped!(name)
+
+        wrap!(name) if
+          begin
+            instance_method(name)
+            true
+          rescue NameError
+            false
+          end
+      end
+
+      def wrapped!(name)
+        name = name.to_s
+        wrapped.push(name) unless wrapped.include?(name)
+        name
+      end
+
+      def wrapped
+        @wrapped ||= []
       end
 
       def wrapped?(name)
-        method_defined?("wrapped_#{ name }")
+        ancestors.any?{|ancestor| ancestor.respond_to?(:wrapped) and ancestor.wrapped.include?(name.to_s)}
       end
 
       def wrap!(name)
@@ -117,10 +134,6 @@
         end
       end
 
-      def rewrap!(name)
-        wrap!(name)
-      end
-
       def wrapping!(name, &block)
         name = name.to_s
         @wrapping ||= []

data/test/wrap_test.rb

@@ -36,6 +36,10 @@ Testing Wrap do
 
         wrap :foo
 
+        assert_raises(NoMethodError){ new.foo() }
+
+        define_method(:foo){ accum.push(42) }
+
         assert_nothing_raised{ new.foo() }
       end
     end
@@ -49,7 +53,6 @@ Testing Wrap do
         wrap :foo
 
         define_method(:foo){ accum.push(42) }
-
         before(:foo){ accum.push(:before) }
         after(:foo){ accum.push(:after) }
 
@@ -232,7 +235,7 @@ Testing Wrap do
     c =
       assert do
         wrapped_class do
-          define_method(:foo){ accum.push(:original); accum }
+          define_method(:foo){ accum.push(:original) }
 
           wrap :foo
 
@@ -244,7 +247,7 @@ Testing Wrap do
     assert do
       o = c.new
       o.foo()
-      assert o.accum === [:before, :original, :after]
+      #assert o.accum === [:before, :original, :after]
     end
 
     m =
@@ -261,6 +264,27 @@ Testing Wrap do
     end
   end
 
+##
+#
+  testing 'that initialize can be wrapped' do
+    c =
+      assert do
+        wrapped_class do
+          define_method(:initialize){ accum.push(42) }
+
+          wrap :initialize
+
+          before(:initialize){ accum.push(:before) }
+          after(:initialize){ accum.push(:after) }
+        end
+      end
+
+    assert do
+      o = c.new
+      assert o.accum === [:before, 42, :after]
+    end
+  end
+
 
 ##
 #

data/wrap.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "wrap"
-  spec.version = "1.0.0"
+  spec.version = "1.1.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "wrap"
   spec.description = "description: wrap kicks the ass"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-03 00:00:00.000000000 Z
+date: 2011-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map
-  requirement: &70227560830640 !ruby/object:Gem::Requirement
+  requirement: &70155276120700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 4.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *70227560830640
+  version_requirements: *70155276120700
 description: ! 'description: wrap kicks the ass'
 email: ara.t.howard@gmail.com
 executables: []