proxy_machine 0.0.4 → 0.0.5

data/.gitignore

@@ -0,0 +1 @@
+nbproject

data/README.rdoc

@@ -20,7 +20,7 @@ A cool proxy implementation pattern in ruby
 Callbefores:
 
   p = proxy_for [1, 2, 3], :before => {
-    :reverse => lambda {|obj| puts 'before reverse'}
+    :reverse => lambda {|obj, args| puts 'before reverse'}
   }   
   
   p.reverse => before reverse
@@ -29,16 +29,18 @@ Callbefores:
 Callafters:
                
   p = proxy_for [1, 2, 3], :after => {
-   :reverse => lambda {|obj, result| result.sort}
+   :reverse => lambda {|obj, result, args| result.sort}
   }   
 
   p.reverse => [1, 2, 3] # We reordered the list
+                  
+You will always receive the arguments passed to the original method.               
                
-=== Defining callbefores and callafters in all method calls
+=== Defining callbefores and callafters for all method calls
 
 Callbefores:
 This callback will receive a reference of the object, the symbol of the called method and the
-arguments passed.
+original arguments passed.
 
   p = proxy_for [1, 2, 3], :before_all => lambda {|obj, method, args| puts 'before all'}
   p.reverse => before all
@@ -81,7 +83,7 @@ every time it need to use it. You could use this feature with the before_all and
 
 === Controlling the method execution with regexp
                        
-For before_all and after_all you could use regexp to configure whicth methods will be affected.
+For before_all and after_all you could use regexp to configure which methods will be affected.
   
   # Example of class
   class MyRegexMethods                    
@@ -92,21 +94,21 @@ For before_all and after_all you could use regexp to configure whicth methods wi
     def crazy_one; @value ? @value : 'crazy' end
   end
    
-  p = proxy_for MyRegexMethods.new, :before_all => {
-    :call1 => [/^get_/, lambda {|obj, method, args| obj.value = 'gotcha!' }],
-  }
+  p = proxy_for MyRegexMethods.new, :before_all => [
+    [/^get_/, lambda {|obj, method, args| obj.value = 'gotcha!' }]
+  ]
   
   p.get_value1 => gotcha!
   p.get_value2 => gotcha!
   p.another_method => 'another
   proxy.crazy_one => 'crazy'
 
-You could use many definitions if you want, the calls will happen in alphabetical order of the keys.  
+You could use many definitions if you want, the calls will happen in the declared order.
 
-  p = proxy_for MyRegexMethods.new, :before_all => {
-    :call2 => [/value/, lambda {|obj, method, args| obj.value = "#{obj.value}works"}],
-    :call1 => [/get_/, lambda {|obj, method, args| obj.value = "it_"}]
-  }
+  p = proxy_for MyRegexMethods.new, :before_all => [
+    [/get_/, lambda {|obj, method, args| obj.value = "it_"}]
+    [/value/, lambda {|obj, method, args| obj.value = "#{obj.value}works"}]
+  ]
   
   p.get_value1 => it_works
   p.get_value2 => it_works
@@ -124,16 +126,43 @@ It is also possible to use classes instead of procs.
     def call; @object.value = "#{@object.value}works" end
   end
   
-  p = proxy_for MyRegexMethods.new, :before_all => {
-    :call2 => [/value/, Change2Performer],
-    :call1 => [/get_/, lambda {|obj, method, args| obj.value = "it_"}]
-  }
+  p = proxy_for MyRegexMethods.new, :before_all => [
+    [/get_/, lambda {|obj, method, args| obj.value = "it_"}],
+    [/value/, Change2Performer]
+  ]
   
   p.get_value1 => it_works
   p.get_value2 => it_works
   p.another_method => another
   p.crazy_one => crazy
+
+=== Building an execution stack
+
+  # Example of class
+  class StackClass
+    attr_accessor :name, :company_name
+  end               
+  
+  # Performers
+  make_upper = lambda {|obj, args| obj.name = obj.name.upcase }
+  make_without_space = lambda {|obj, args| obj.name = obj.name.gsub /\s+/, '-'}
+  make_round_brackets = lambda {|obj, args| obj.name = "(#{obj.name})" }
+  
+  make_lower = lambda {|obj, args| obj.company_name = obj.company_name.downcase }
+  make_round_brackets2 = lambda {|obj, args| obj.company_name = "[#{obj.company_name}]" }
   
+  obj = StackClass.new
+  obj.name = "important name"
+  obj.company_name = "COMPANY NAME"
+  
+  p = proxy_for obj, :before => {
+    :name => [make_upper, make_without_space, make_round_brackets],
+    :company_name => [make_lower, make_round_brackets2]
+  }
+                   
+  p.name => (IMPORTANT-NAME)                 
+  p.company_name => [company name]                 
+                   
 === How to detect that the object is a proxy?
 
 The beautiful way:

data/Rakefile

@@ -8,7 +8,8 @@ begin
     gemspec.homepage = "http://github.com/tulios/proxy_machine"
     gemspec.authors = ["Túlio Ornelas"]
     gemspec.test_files = Dir.glob('spec/*_spec.rb')
-    gemspec.add_development_dependency "rspec", ">= 1.2.9"
+    gemspec.add_development_dependency "rspec", ">= 2.0.1"
+    gemspec.add_development_dependency "rspec-core", ">= 2.0.1"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/proxy_machine/proxy.rb

@@ -19,18 +19,18 @@ module ProxyMachine
     end
                             
     def method_missing(symbol, *args)
-      @symbol = symbol        
-      @method = symbol.to_s
-                                             
+      @method_symbol = symbol        
+      @method = @method_symbol.to_s
+
       raise NoMethodError.new(@method) unless @allow_dinamic or @object.methods.member?(@method)
       
-      execute_call(@before_all, @object, symbol, args)
-      execute_call(@before, @object)
+      execute_call(@before_all, @object, @method_symbol, args)
+      execute_call(@before, @object, args)
                               
       @result = @avoid_original_execution ? nil : @object.send(@method, *args)
 
-      result_after = execute_call(@after, @object, @result)
-      result_after_all = execute_call(@after_all, @object, @result, symbol, args)
+      result_after = execute_call(@after, @object, @result, args)
+      result_after_all = execute_call(@after_all, @object, @result, @method_symbol, args)
 
       return result_after_all if result_after_all
       return result_after if result_after
@@ -43,7 +43,6 @@ module ProxyMachine
     private               
     def execute_call container, *args
       executor = get_executor(container)
-      
       result = nil
       if executor.class == Array
         executor.each do |e|
@@ -59,22 +58,21 @@ module ProxyMachine
     
     def get_executor container
       return nil unless container                              
-      
+
       # The content is a proc or a class
       return container if proc?(container) or class?(container)
       
-      # The content is a hash with an array filled with a regex and a proc or a class
-      if hash?(container) and regexp?(container)
+      # The content is an array with an array filled with a regex and a proc or a class
+      if array?(container) and regexp?(container)
         matched = regexp_elements(container).select {|array| get_regexp(array) =~ @method}
         return matched.collect {|array| get_proc_or_class(array)} unless matched.empty?
       end
       
-      # Lets assume that the content of the key is a proc
-      container[@symbol]
+      hash?(container) ? container[@method_symbol] : container
     end
                 
-    def regexp_elements hash
-      elements = hash.keys.sort.collect {|key| array_with_regex?(hash[key]) ? hash[key] : nil}
+    def regexp_elements array
+      elements = array.collect {|sub_array| array_with_regex?(sub_array) ? sub_array : nil}
       compacted_array = elements.compact
       compacted_array.nil? ? [] : compacted_array
     end
@@ -93,8 +91,9 @@ module ProxyMachine
     
     def proc? block; block and block.class == Proc end
     def class? param; param and param.class == Class end
+    def array? param; param and param.class == Array end
     def hash? param; param and param.class == Hash end
-    def regexp? hash; hash and not regexp_elements(hash).empty? end
+    def regexp? array; array and not regexp_elements(array).empty? end
 
   end
   

data/proxy_machine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{proxy_machine}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["T\303\272lio Ornelas"]
-  s.date = %q{2010-10-25}
+  s.date = %q{2010-11-02}
   s.description = %q{A cool proxy implementation pattern in ruby}
   s.email = %q{ornelas.tulio@gmail.com}
   s.extra_rdoc_files = [
@@ -17,7 +17,8 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    "LICENSE",
+    ".gitignore",
+     "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
@@ -28,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/proxy_machine/proxy.rb",
      "lib/symbol.rb",
      "proxy_machine.gemspec",
+     "script/console",
      "spec/proxy_spec.rb"
   ]
   s.homepage = %q{http://github.com/tulios/proxy_machine}
@@ -44,12 +46,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.1"])
+      s.add_development_dependency(%q<rspec-core>, [">= 2.0.1"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, [">= 2.0.1"])
+      s.add_dependency(%q<rspec-core>, [">= 2.0.1"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, [">= 2.0.1"])
+    s.add_dependency(%q<rspec-core>, [">= 2.0.1"])
   end
 end
 

data/script/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# File: script/console
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+
+libs =  " -r irb/completion"
+# Perhaps use a console_lib to store any extra methods I may want available in the cosole
+# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
+libs <<  " -r #{File.dirname(__FILE__) + '/../lib/proxy_machine.rb'}"
+
+puts "Loading proxy_machine gem"
+exec "#{irb} #{libs} --simple-prompt"

data/spec/proxy_spec.rb

@@ -23,7 +23,7 @@ describe Proxy do
     it 'should add a callbefore' do
       array = [1, 2, 3]
       proxy = Proxy.new array, :before => {
-        :reverse => lambda {|obj| obj << 50 }
+        :reverse => lambda {|obj, args| obj << 50}
       }
       proxy.should_not be_nil                  
       proxy.reverse.should == [50, 3, 2, 1]
@@ -32,7 +32,7 @@ describe Proxy do
     it 'should add a callafter' do
       array = [1, 2, 3]
       proxy = Proxy.new array, :after => {
-        :reverse => lambda {|obj, result| result.collect {|e| e*4} }
+        :reverse => lambda {|obj, result, args| result.collect {|e| e*4} }
       }
       proxy.should_not be_nil                  
       proxy.reverse.should == [12, 8, 4]
@@ -42,10 +42,10 @@ describe Proxy do
       array = [1, 2, 3]
       proxy = Proxy.new array, 
       :before => {
-        :reverse => lambda {|obj| obj.map! {|e| e*2} }
+        :reverse => lambda {|obj, args| obj.map! {|e| e*2} }
       },
       :after => {
-        :reverse => lambda {|obj, result| result.collect {|e| e/2} }
+        :reverse => lambda {|obj, result, args| result.collect {|e| e/2} }
       }
       proxy.should_not be_nil                  
       proxy.reverse.should == [3, 2, 1]
@@ -143,7 +143,7 @@ describe Proxy do
     it 'should call proxy passing arguments' do
       array = [1, 2, 3]
       proxy = proxy_for array, :before => {
-        :reverse => lambda {|obj| obj << 50 }
+        :reverse => lambda {|obj, args| obj << 50 }
       }
       proxy.should_not be_nil                  
       proxy.reverse.should == [50, 3, 2, 1]
@@ -219,7 +219,7 @@ describe Proxy do
       obj.value = "Crazy Value"
       
       proxy = proxy_for obj, :allow_dinamic => true, :before => {
-        :crazy_method => lambda {|obj| obj.value = "proxied value!" }
+        :crazy_method => lambda {|obj, args| obj.value = "proxied value!" }
       }
                     
       proxy.should_not be_nil                  
@@ -273,10 +273,10 @@ describe Proxy do
     
     it 'should affect just the matched methods on callbefore' do
       obj = MyRegexMethods.new
-      proxy = proxy_for obj, :before_all => {
-        :call1 => [/^get_/, lambda {|obj, method, args| obj.value = 'gotcha!' }],
-        :call2 => [/method$/, lambda {|obj, method, args| obj.value = 'another gotcha!' }]
-      }
+      proxy = proxy_for obj, :before_all => [
+        [/^get_/, lambda {|obj, method, args| obj.value = 'gotcha!' }],
+        [/method$/, lambda {|obj, method, args| obj.value = 'another gotcha!' }]
+      ]
       
       proxy.should_not be_nil
       
@@ -295,10 +295,10 @@ describe Proxy do
     
     it 'should affect just the matched methods on callafter' do
       obj = MyRegexMethods.new
-      proxy = proxy_for obj, :after_all => {
-        :call1 => [/^get_/, lambda {|obj, result, method, args| obj.value = 'gotcha!' }],
-        :call2 => [/method$/, lambda {|obj, result, method, args| obj.value = 'another gotcha!'}]
-      }
+      proxy = proxy_for obj, :after_all => [
+        [/^get_/, lambda {|obj, result, method, args| obj.value = 'gotcha!' }],
+        [/method$/, lambda {|obj, result, method, args| obj.value = 'another gotcha!'}]
+      ]
       
       proxy.should_not be_nil
       
@@ -315,34 +315,12 @@ describe Proxy do
       proxy.crazy_one.should == 'crazy'
     end
     
-    it 'should execute the entire matched stack on callbefore sorted by the key name' do
-      obj = MyRegexMethods.new
-      proxy = proxy_for obj, :before_all => {
-        :call2 => [/value/, lambda {|obj, method, args| obj.value = "#{obj.value}works"}],
-        :call1 => [/get_/, lambda {|obj, method, args| obj.value = "it_"}]
-      }
-      
-      proxy.should_not be_nil
-      
-      proxy.original_object.value = nil
-      proxy.get_value1.should == 'it_works'
-      
-      proxy.original_object.value = nil
-      proxy.get_value2.should == 'it_works'
-      
-      proxy.original_object.value = nil
-      proxy.another_method.should == 'another'
-      
-      proxy.original_object.value = nil
-      proxy.crazy_one.should == 'crazy'
-    end
-    
     it 'should ensure that the last value returned is the value of the last called method' do
       obj = MyRegexMethods.new
-      proxy = proxy_for obj, :after_all => {
-        :call2 => [/value/, lambda {|obj, result, method, args| 2}],
-        :call1 => [/get_/, lambda {|obj, result, method, args| 1}]
-      }
+      proxy = proxy_for obj, :after_all => [
+        [/get_/, lambda {|obj, result, method, args| 1}],
+        [/value/, lambda {|obj, result, method, args| 2}]
+      ]
       
       proxy.should_not be_nil
       
@@ -361,10 +339,10 @@ describe Proxy do
     
     it 'should affect just the matched methods using a registered class' do
       obj = MyRegexMethods.new
-      proxy = proxy_for obj, :before_all => {
-        :call1 => [/^get_/, Change1Performer],
-        :call2 => [/method$/, lambda {|obj, method, args| obj.value = 'another gotcha!' }]
-      }
+      proxy = proxy_for obj, :before_all => [
+        [/^get_/, Change1Performer],
+        [/method$/, lambda {|obj, method, args| obj.value = 'another gotcha!' }]
+      ]
       
       proxy.should_not be_nil
       
@@ -383,10 +361,10 @@ describe Proxy do
     
     it 'should execute the entire matched stack sorted by the key name using a registered class' do
       obj = MyRegexMethods.new
-      proxy = proxy_for obj, :before_all => {
-        :call2 => [/value/, Change2Performer],
-        :call1 => [/get_/, lambda {|obj, method, args| obj.value = "it_"}]
-      }
+      proxy = proxy_for obj, :before_all => [
+        [/get_/, lambda {|obj, method, args| obj.value = "it_"}],
+        [/value/, Change2Performer]
+      ]
       
       proxy.should_not be_nil
       
@@ -404,7 +382,40 @@ describe Proxy do
     end
     
   end
-  
+
+  context 'creating an execution stack' do
+    class StackClass
+      attr_accessor :name
+      def do_logic var
+        @name = "#{@name}_#{var}"
+      end
+    end
+
+    it 'should execute the entire stack over a single proxied method' do
+      obj = StackClass.new
+      obj.name = "important name"
+                   
+      make_upper = lambda {|obj, args| obj.name = obj.name.upcase }
+      make_without_space = lambda {|obj, args| obj.name = obj.name.gsub /\s+/, '-'}
+      make_round_brackets = lambda {|obj, args| obj.name = "(#{obj.name})" }
+
+      make_lower = lambda {|obj, args| args[0].downcase! }
+      make_round_brackets2 = lambda {|obj, args| args[0] = "[#{args[0]}]" }
+      
+      proxy = proxy_for obj, :before => {
+        :name => [make_upper, make_without_space, make_round_brackets],
+        :do_logic => [make_lower, make_round_brackets2]
+      }                    
+                                                                     
+      proxy.should_not be_nil
+      proxy.name.should == "(IMPORTANT-NAME)"
+      
+      proxy.do_logic "MY NAME"
+      proxy.original_object.name.should == "(IMPORTANT-NAME)_[my name]"
+    end
+
+  end
+
 end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: proxy_machine
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - "T\xC3\xBAlio Ornelas"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-25 00:00:00 -02:00
+date: 2010-11-02 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +28,28 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 13
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 1
+        version: 2.0.1
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec-core
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 0
+        - 1
+        version: 2.0.1
+  type: :development
+  version_requirements: *id002
 description: A cool proxy implementation pattern in ruby
 email: ornelas.tulio@gmail.com
 executables: []
@@ -44,6 +60,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -55,6 +72,7 @@ files:
 - lib/proxy_machine/proxy.rb
 - lib/symbol.rb
 - proxy_machine.gemspec
+- script/console
 - spec/proxy_spec.rb
 has_rdoc: true
 homepage: http://github.com/tulios/proxy_machine