wrapit 0.2.1 → 0.2.2

data/lib/wrapit.rb

@@ -3,3 +3,7 @@ require 'wrapped'
 require "wrapit/version"
 require "wrapit/attr_wrappable"
 require "wrapit/method_wrappable"
+
+module Wrapit
+  class InvalidCallerError < StandardError; end
+end

data/lib/wrapit/attr_wrappable.rb

@@ -7,13 +7,22 @@ module Wrapit::AttrWrappable
         attr_accessor *args.map { |m| "#{m.to_s}_naked".to_sym }
 
         args.each do |method|
-          define_method method do
-            send(:"#{method}_naked").wrapped
-          end
+          aw_create_naked_method(method)
+          aw_create_wrapped_method(method)
+        end
+      end
+
+      def aw_create_naked_method(method)
+        raise Wrapit::InvalidCallerError unless caller[0] =~ /attr_wrappable/
+        define_method method do
+          send(:"#{method}_naked").wrapped
+        end
+      end
 
-          define_method :"#{method}=" do |value|
-            send(:"#{method}_naked=", value)
-          end
+      def aw_create_wrapped_method(method)
+        raise Wrapit::InvalidCallerError unless caller[0] =~ /attr_wrappable/
+        define_method :"#{method}=" do |value|
+          send(:"#{method}_naked=", value)
         end
       end
     end

data/lib/wrapit/method_wrappable.rb

@@ -4,15 +4,37 @@ module Wrapit::MethodWrappable
       private
 
       def method_wrappable(*args)
-        class_eval do
-          args.each do |method|
-            define_method :"#{method}_naked" do
-              self.class.superclass.instance_method(method).bind(self).call
-            end
+        args.each do |method|
+          has_args = (instance_method(method).arity != 0)
+          mw_create_naked_method(method, has_args)
+          mw_create_wrapped_method(method, has_args)
+        end
+      end
+
+      def mw_create_naked_method(method, has_args)
+        raise Wrapit::InvalidCallerError unless caller[0] =~ /method_wrappable/
+
+        if has_args
+          define_method :"#{method}_naked" do |*args|
+            self.class.superclass.instance_method(method).bind(self).call(*args)
+          end
+        else
+          define_method :"#{method}_naked" do
+            self.class.superclass.instance_method(method).bind(self).call
+          end
+        end
+      end
 
-            define_method method do
-              super().wrapped
-            end
+      def mw_create_wrapped_method(method, has_args)
+        raise Wrapit::InvalidCallerError unless caller[0] =~ /method_wrappable/
+
+        if has_args
+          define_method method do |*args|
+            super(*args).wrapped
+          end
+        else
+          define_method method do
+            super().wrapped
           end
         end
       end

data/lib/wrapit/version.rb

@@ -1,3 +1,3 @@
 module Wrapit
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/wrapit/attr_wrappable_spec.rb

@@ -49,6 +49,15 @@ describe Wrapit::AttrWrappable do
     destroy_class
   end
 
+  it "wrapped method should return correct value when unwrapped" do
+    build_class
+    FooBar.module_eval { attr_wrappable :test_method }
+    foo_bar = FooBar.new
+    foo_bar.test_method = "something"
+    expect(foo_bar.test_method.unwrap).to eq "something"
+    destroy_class
+  end
+
   def build_class
     define_class 'FooBar', 'Object' do |klass|
       klass.send :include, Wrapit::AttrWrappable

data/spec/wrapit/method_wrappable_spec.rb

@@ -37,6 +37,14 @@ describe Wrapit::MethodWrappable do
     destroy_class
   end
 
+  it "wrapped method should return correct value when unwrapped" do
+    build_class
+    Object.module_eval { define_method :test_method do "something"; end }
+    FooBar.module_eval { method_wrappable :test_method }
+    expect(FooBar.new.test_method.unwrap).to eq "something"
+    destroy_class
+  end
+
   it "wrapped method should return same value as naked method" do
     build_class
     Object.module_eval { define_method :test_method do "something"; end }
@@ -46,6 +54,22 @@ describe Wrapit::MethodWrappable do
     destroy_class
   end
 
+  it "method_wrappable should work with methods that have arguments" do
+    build_class
+    Object.module_eval { define_method :test_method do |arg1, arg2| "#{arg1}, #{arg2}"; end }
+    FooBar.module_eval { method_wrappable :test_method }
+    expect(FooBar.new.test_method("hello", "world").unwrap).to eq "hello, world"
+    destroy_class
+  end
+
+  it "method_wrappable should work with methods that have splat arguments" do
+    build_class
+    Object.module_eval { define_method :test_method do |*args| args.join(", "); end }
+    FooBar.module_eval { method_wrappable :test_method }
+    expect(FooBar.new.test_method("hello", "world").unwrap).to eq "hello, world"
+    destroy_class
+  end
+
   def build_class
     define_class 'FooBar', 'Object' do |klass|
       klass.send :include, Wrapit::MethodWrappable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrapit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wrapped
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4453862613727087029
+      hash: -1557926693994722533
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4453862613727087029
+      hash: -1557926693994722533
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25