object-proxy 0.2.0 → 0.3.0

data/Gemfile

@@ -7,6 +7,6 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "bundler", ">= 1.0.0"
-  gem "jeweler", ">= 1.5.2"
+  gem "jeweler2", ">= 2.0.0"
   gem "riot", ">= 0.12.1"
 end

data/Gemfile.lock

@@ -2,13 +2,10 @@ GEM
   remote: http://rubygems.org/
   specs:
     git (1.2.5)
-    hash-utils (1.1.0)
+    hash-utils (2.0.0)
       ruby-version
-    jeweler (1.6.4)
-      bundler (~> 1.0)
+    jeweler2 (2.0.9)
       git (>= 1.2.5)
-      rake
-    rake (0.9.2)
     riot (0.12.5)
       rr
     rr (1.0.4)
@@ -20,5 +17,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.0.0)
   hash-utils (>= 0.12.1)
-  jeweler (>= 1.5.2)
+  jeweler2 (>= 2.0.0)
   riot (>= 0.12.1)

data/README.md

@@ -8,6 +8,11 @@ where isn't possible to derive them as homogenic functional units or
 where it's simply impractical to derive them. Provides four base 
 proxy types.
 
+*In all examples, object instance proxying is used, but both class objects
+and object instances proxying are supported. Simply give object instance
+instead of class object to the constructor. Wrapped object instance will 
+be returned.*
+
 ### Standard Proxy
 Works as intermediate layer between caller and called. Allows to invoke 
 an handler both before method call and adjust its  arguments and after 

data/Rakefile

@@ -11,7 +11,7 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
-require 'jeweler'
+require 'jeweler2'
 
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/object-proxy.rb

@@ -14,14 +14,24 @@ module ObjectProxy
     # Creates proxy object. "Proxy object" means, it calls handler
     # if defined before and after each method call.
     #
-    # @param [Object] object proxied object 
-    # @return [Class] anonymous proxy class with before and after 
+    # @param [Object, Class] object proxied object or class 
+    # @return [Object, Class] anonymous proxy instance or class with before and after 
     #   handlers functionality
     # @since 0.2.0
     #
 
     def self.proxy(object)
-        cls = Class::new(object.class)
+        
+        ### Takes class object
+        
+        _class = object
+        if not _class.kind_of? Class
+            _class = object.class
+        end
+        
+        ### Defines class
+        
+        cls = Class::new(_class)
         cls.instance_eval do
         
             # Eviscerates instances methods and replace them by
@@ -51,9 +61,16 @@ module ObjectProxy
             end
             
             # Adds constructor
-            define_method :initialize do |wrapped|
-                @wrapped = wrapped
-                @handlers = { }
+            if object.kind_of? Class
+                define_method :initialize do |*args, &block|
+                    @handlers = { }
+                    @wrapped = _class::new(*args, &block)
+                end
+            else
+                define_method :initialize do |*args, &block|
+                    @handlers = { }
+                    @wrapped = object
+                end            
             end
             
             # Event handlers assigning interceptor
@@ -68,16 +85,26 @@ module ObjectProxy
                 @handlers[name] = block
             end
             
+            # Wrapped accessor
+            
             attr_accessor :wrapped
+
+        end
+        
+        if object.kind_of? Class
+            result = cls
+        else
+            result = cls::new
         end
         
-        return cls::new(object)
+        return result
     end
     
     ##
     # Alias for +ObjectProxy::proxy+.
     #
-    # @return [Class]
+    # @param [Object, Class] object
+    # @return [Object, Class]
     # @since 0.2.0
     #
     
@@ -88,7 +115,8 @@ module ObjectProxy
     ##
     # Alias for +ObjectProxy::proxy+.
     #
-    # @return [Class]
+    # @param [Object, Class] object
+    # @return [Object, Class]
     # @since 0.1.0
     #
     
@@ -140,21 +168,31 @@ module ObjectProxy
     #
     # Also doesn't support customizing the arguments or result.
     #
-    # @param [Object] object proxied object 
-    # @return [Class] anonymous proxy class with before and after 
+    # @param [Object, Class] object proxied object or class 
+    # @return [Object, Class] anonymous proxy instance or class with before and after 
     #   handlers functionality
     # @since 0.2.0
     #
     
     def self.track(object)
-        cls = Class::new(object.class)
-        cls.instance_eval do
+        
+        ### Takes class object
+        
+        _class = object
+        if not _class.kind_of? Class
+            _class = object.class
+        end
+        
+        ### Defines class
+        
+        cls = Class::new(_class)
+        cls.class_eval do
         
             # Eviscerates instances methods and replace them by 
             # +#on_method+ invoker
             
             public_instance_methods.each do |method|
-                if not method.in? [:object_id, :__send__]
+                if not method.in? [:object_id, :__send__, :class]
                     define_method method do |*args, &block| 
                         if not @before_call.nil?
                             @before_call.call(method, args, block)
@@ -173,10 +211,14 @@ module ObjectProxy
             
             # Adds constructor
             
-            define_method :initialize do |wrapped|
-                @wrapped = wrapped
-                @before_call = nil
-                @after_call = nil
+            if object.kind_of? Class
+                define_method :initialize do |*args, &block|
+                    @wrapped = _class::new(*args, &block)
+                end                
+            else
+                define_method :initialize do |*args, &block|
+                    @wrapped = object
+                end                
             end
             
             # Defines handler assigners
@@ -189,9 +231,19 @@ module ObjectProxy
                 @after_call = block
             end
             
+            # Wrapped accessor
+            
+            attr_accessor :wrapped
+                                    
+        end
+        
+        if object.kind_of? Class
+            result = cls
+        else
+            result = cls::new
         end
         
-        return cls::new(object)
+        return result
     end
 
     ##
@@ -199,50 +251,109 @@ module ObjectProxy
     # and forwards them to +#method_call+ handler which calls wrapped object
     # by default, but can be overriden, so calls can be controlled.
     #
-    # @param [Object] object proxied object 
-    # @return [Class] anonymous proxy class
+    # @param [Object, Class] object proxied object or class
+    # @param [Proc] block  default +#method_call+ handler for whole class 
+    # @return [Object, Class] anonymous proxy instance or class
     # @since 0.2.0
     #
+    
+    def self.catch(object, &block)
+        
+        ### Takes class object
+        
+        _class = object
+        if not _class.kind_of? Class
+            _class = object.class
+        end
+        
+        ### Defines class
+        
+        cls = Class::new(_class)
+        cls.class_eval do
 
-    def self.catch(object)
-        cls = Class::new(object.class)
-        cls.instance_eval do
-          
             # Eviscerates instances methods and replace them by 
             # +#handle_call+ invoker
             
             public_instance_methods.each do |method|
-                if not method.in? [:object_id, :__send__]
+                if not method.in? [:object_id, :__send__, :class]
                     define_method method do |*args, &block|
-                        @method_call.call(method, args, block)
+                        self.method_call.call(method, args, block)
                     end
                 end
             end
             
             # Adds constructor
-            
-            define_method :initialize do |wrapped|
-                @wrapped = wrapped
-                @method_call = Proc::new do |method, args, block|
-                    @wrapped.send(method, *args, &block)
+
+            if not object.kind_of? Class
+                define_method :initialize do |&block|
+                    @wrapped = object
+                    
+                    if not block.nil?
+                       @method_call = block 
+                    else
+                       @method_call = cls.class_variable_get(:@@method_call)
+                    end
+                    
+                    if @method_call.nil?
+                        @method_call = Proc::new do |method, args, block|
+                            @wrapped.send(method, *args, &block)
+                        end
+                    end
                 end
+            else
+                define_method :initialize do |*args, &block|
+                    @wrapped = _class::new(*args, &block)
+                    
+                    ic = cls.class_variable_get(:@@instance_created)
+                    if not ic.nil?
+                        ic.call(self)
+                    end
+                end                
             end
+             
+            # Defines handler assigners
             
-            # Defines handler assigner
+            class_variable_set(:@@method_call, nil)
+            define_singleton_method :method_call do |&block| 
+                cls.class_variable_set(:@@method_call, block)
+            end
             
-            define_method :method_call do |&block|
-                @method_call = block
+            class_variable_set(:@@instance_created, nil)
+            define_singleton_method :instance_created do |&block| 
+                cls.class_variable_set(:@@instance_created, block)
             end
             
-            # Adds wrapped accessor
+            # Sets up accessors and default handler            
+            attr_accessor :wrapped
 
-            define_method :wrapped do
-                @wrapped
+            define_method :method_call do |&block|
+                if not block.nil?   # set
+                    @method_call = block
+                else                # get
+                    result = @method_call
+                    
+                    if result.nil?
+                        result = Proc::new do |method, args, block|
+                            @wrapped.send(method, *args, &block)
+                        end
+                    end                    
+                    
+                    return result
+                end
             end
+            
+            attr_writer :method_call
                         
         end
         
-        return cls::new(object)
+        if object.kind_of? Class
+            result = cls
+        else
+            result = cls::new
+        end
+        
+        return result
+        
     end    
 end
 

data/object-proxy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "object-proxy"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Koz\u{e1}k"]
-  s.date = "2011-10-19"
+  s.date = "2012-05-24"
   s.email = "martinkozak@martinkozak.net"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/martinkozak/object-proxy"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.24"
   s.summary = "Provides collection of four proxy objects intended for intercepting calls to instance methods. Works as intermediate layer between caller and called. Allows to invoke an handler both before method call and adjust its arguments and after call and post-proccess result. Aimed as tool for instant adapting the complex objects without complete deriving and extending whole classes in cases, where isn't possible to derive them as homogenic functional units or where it's simply impractical to derive them."
 
   if s.respond_to? :specification_version then
@@ -39,18 +39,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<hash-utils>, [">= 0.12.1"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_development_dependency(%q<jeweler2>, [">= 2.0.0"])
       s.add_development_dependency(%q<riot>, [">= 0.12.1"])
     else
       s.add_dependency(%q<hash-utils>, [">= 0.12.1"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
       s.add_dependency(%q<riot>, [">= 0.12.1"])
     end
   else
     s.add_dependency(%q<hash-utils>, [">= 0.12.1"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+    s.add_dependency(%q<jeweler2>, [">= 2.0.0"])
     s.add_dependency(%q<riot>, [">= 0.12.1"])
   end
 end

data/test

@@ -6,7 +6,7 @@ $:.push("./lib")
 require "object-proxy"
 require "riot"
 
-context "ObjectProxy" do
+context "ObjectProxy (instances)" do
     asserts("#create") do 
         s = OP["a,b,c,d"]
 
@@ -21,6 +21,52 @@ context "ObjectProxy" do
 
         (s << ",1,2,3" == "alfa beta") and (s == "a,b,c,d,A,B,C")
     end
+    asserts("#track") do
+        log = [ ]
+        s = OP::track("a,b,c,d")
+        s.before_call do |name|
+            log << name
+        end
+        s.after_call do |name|
+            log << name
+        end
+        s.gsub!(",", "")
+        
+        (log == [:gsub!, :gsub!]) and (s == "abcd")
+    end
+    asserts("#catch") do
+        s = OP::catch("alfa")
+        log = [ ]
+        
+        s.method_call do |name, args, block|
+            if name == :to_s
+                log << name
+                s.wrapped.send(name, *args, &block)
+            end
+        end
+        
+        s.replace("beta")
+        s.to_s
+        
+        (log == [:to_s]) and (s.to_s == "alfa")
+    end
+end
+
+context "ObjectProxy (classes)" do
+    asserts("#create") do 
+        s = ObjectProxy::proxy(String)::new("a,b,c,d")
+
+        s.register_handler(:"before_<<") do |args|
+            args = [",A,B,C"]
+            args
+        end
+
+        s.register_handler(:"after_<<") do |result|
+            "alfa beta"
+        end
+
+        (s << ",1,2,3" == "alfa beta") and (s == "a,b,c,d,A,B,C")
+    end
     asserts("#fake") do
         pr = OP::fake(String) do
             define_method :to_s do 
@@ -33,7 +79,7 @@ context "ObjectProxy" do
     end
     asserts("#track") do
         log = [ ]
-        s = OP::track("a,b,c,d")
+        s = OP::track(String)::new("a,b,c,d")
         s.before_call do |name|
             log << name
         end
@@ -45,7 +91,7 @@ context "ObjectProxy" do
         (log == [:gsub!, :gsub!]) and (s == "abcd")
     end
     asserts("#catch") do
-        s = OP::catch("alfa")
+        s = OP::catch(String)::new("alfa")
         log = [ ]
         
         s.method_call do |name, args, block|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: object-proxy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hash-utils
-  requirement: &11263140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.12.1
   type: :runtime
   prerelease: false
-  version_requirements: *11263140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11261480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11261480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &11245700 !ruby/object:Gem::Requirement
+  name: jeweler2
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *11245700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &11244320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: 0.12.1
   type: :development
   prerelease: false
-  version_requirements: *11244320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 description: 
 email: martinkozak@martinkozak.net
 executables: []
@@ -88,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3593374203948999823
+      hash: -3695544286830733883
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Provides collection of four proxy objects intended for intercepting calls