named-parameters 0.0.19 → 0.0.20

data/RELEASENOTES

@@ -1,3 +1,8 @@
+0.0.20 [Dec 12, 2010]
+- [INTERNAL] Modified implementation for #intercept so that it works for Ruby 
+  1.8.6, 1.8.7, and 1.9.2
+- [INTERNAL] Intercepted methods will now be able to entertain blocks (again)
+
 0.0.19 [Dec 11, 2010]
 - [INTERNAL] Will no longer require "bundler/setup" 
   See: https://github.com/jurisgalang/named-parameters/issues#issue/2

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.20

data/lib/named-parameters/module.rb

@@ -185,6 +185,16 @@ module NamedParameters
   end
 
   module ClassMethods
+    ALIAS_PREFIX = :__intercepted__
+
+    def aliased name # :nodoc:
+      :"#{ALIAS_PREFIX}#{name}"
+    end
+    
+    def unaliased name  # :nodoc:
+      name.gsub(/^#{ALIAS_PREFIX}/, '')
+    end
+    
     # Declares that `method` will enforce named parameters behavior as 
     # described in `spec`; a method declared with `:required` and/or 
     # `:optional` parameters will raise an `ArgumentError` if it is invoked 
@@ -313,11 +323,13 @@ module NamedParameters
     # add instrumentation for class methods
     def singleton_method_added name  # :nodoc:
       apply_method_spec :"self.#{name}" do
-        method = self.metaclass.instance_method name
-        spec   = method_specs[key_for(:"self.#{name}")]
-        owner  = "#{self}::"
+        self.metaclass.send :alias_method, aliased(name), name
+        #method = self.metaclass.instance_method name
+        owner = "#{self}::"
+        spec  = method_specs[key_for(:"self.#{name}")]
         metaclass.instance_eval do
-          intercept method, owner, name, spec
+          #intercept method, owner, name, spec
+          intercept owner, name, spec
         end
       end
       super
@@ -326,10 +338,12 @@ module NamedParameters
     # add instrumentation for instance methods
     def method_added name  # :nodoc:
       apply_method_spec name do
-        method = instance_method name
-        spec   = method_specs[key_for(name)]
-        owner  = "#{self}#"
-        intercept method, owner, name, spec
+        alias_method aliased(name), name
+        #method = instance_method name
+        owner = "#{self}#"
+        spec  = method_specs[key_for(name)]
+        #intercept method, owner, name, spec
+        intercept owner, name, spec
       end
       super
     end
@@ -344,34 +358,91 @@ module NamedParameters
       end
     end
     
+    ## insert parameter validation prior to executing the instrumented method
+    #def intercept method, owner, name, spec  # :nodoc:
+    #  fullname = "#{owner}#{name}"
+    #  define_method name do |*args, &block|
+    #    # locate the argument representing the named parameters value
+    #    # for the method invocation
+    #    params = args.last
+    #    args << (params = { }) unless params.instance_of? Hash
+    #
+    #    # merge the declared default values for params into the arguments
+    #    # used when the method is invoked
+    #    defaults = { }
+    #    spec.each do |k, v|
+    #      next if k == :mode
+    #      v.each{ |entry| defaults.merge! entry if entry.instance_of? Hash }
+    #    end
+    #    params = defaults.merge params
+    #    
+    #    # validate the parameters against the spec
+    #    NamedParameters::validate_method_specs fullname, params, spec
+    #    
+    #    # inject the updated argument values for params into the arguments
+    #    # before actually making method invocation
+    #    args[args.length - 1] = params
+    #    method.bind(self).call(*args, &block)
+    #  end
+    #end
+
     # insert parameter validation prior to executing the instrumented method
-    def intercept method, owner, name, spec  # :nodoc:
-      fullname = "#{owner}#{name}"
-      #define_method name do |*args, &block|
-      define_method name do |*args|
-        # locate the argument representing the named parameters value
-        # for the method invocation
-        params = args.last
-        args << (params = { }) unless params.instance_of? Hash
+    def intercept owner, name, spec  # :nodoc:
+      class_eval(<<-CODE, __FILE__, __LINE__)
+        def #{name}(*args, &block)
+          # compute the fully-qualified name of the method
+          # this is used when reporting argument errors
+          fullname = "#{owner}#{name}"
+          
+          # locate the argument representing the named parameters value
+          # for the method invocation
+          params   = args.last
+          args << (params = { }) unless params.instance_of? Hash
+          
+          # merge the declared default values for params into the arguments
+          # used when the method is invoked
+          spec     = #{spec.inspect}
+          defaults = { }
+          spec.each do |k, v|
+            next if k == :mode
+            v.each{ |entry| defaults.merge!(entry) if entry.instance_of? Hash }
+          end
+          params = defaults.merge(params)
+          
+          # validate the parameters against the spec
+          NamedParameters::validate_method_specs fullname, params, spec
 
-        # merge the declared default values for params into the arguments
-        # used when the method is invoked
-        defaults = { }
-        spec.each do |k, v|
-          next if k == :mode
-          v.each{ |entry| defaults.merge! entry if entry.instance_of? Hash }
+          # inject the updated argument values for params into the arguments
+          # before actually making method invocation
+          args[args.length - 1] = params
+          method = :"#{ALIAS_PREFIX}#{name}"
+          send method, *args, &block
         end
-        params = defaults.merge params
-        
-        # validate the parameters against the spec
-        NamedParameters::validate_method_specs fullname, params, spec
-        
-        # inject the updated argument values for params into the arguments
-        # before actually making method invocation
-        args[args.length - 1] = params
-        #method.bind(self).call(*args, &block)
-        method.bind(self).call(*args)
-      end
+      CODE
+      
+      #define_method name do |*args, &block|
+      #  # locate the argument representing the named parameters value
+      #  # for the method invocation
+      #  params = args.last
+      #  args << (params = { }) unless params.instance_of? Hash
+      #
+      #  # merge the declared default values for params into the arguments
+      #  # used when the method is invoked
+      #  defaults = { }
+      #  spec.each do |k, v|
+      #    next if k == :mode
+      #    v.each{ |entry| defaults.merge! entry if entry.instance_of? Hash }
+      #  end
+      #  params = defaults.merge params
+      #  
+      #  # validate the parameters against the spec
+      #  NamedParameters::validate_method_specs fullname, params, spec
+      #  
+      #  # inject the updated argument values for params into the arguments
+      #  # before actually making method invocation
+      #  args[args.length - 1] = params
+      #  method.bind(self).call(*args, &block)
+      #end
     end
     
     # initialize specs table as needed 
@@ -382,7 +453,7 @@ module NamedParameters
     def key_for method
       type = method.to_s =~ /^self\./ ? :singleton : :instance
       name = method.to_s.sub(/^self\./, '')
-      :"#{self}::#{type}.#{name}"
+      :"#{self}::#{type}.#{unaliased name}"
     end
     
     # check if in the process of instrumenting a method

data/named-parameters.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{named-parameters}
-  s.version = "0.0.19"
+  s.version = "0.0.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Juris Galang"]
-  s.date = %q{2010-12-11}
+  s.date = %q{2010-12-12}
   s.description = %q{This gem simulates named-parameters in Ruby. 
     It's a complement to the common Ruby idiom of using Hash args to emulate 
     the use of named parameters. }

data/spec/named-parameters_spec.rb

@@ -203,7 +203,7 @@ describe "NamedParameters" do
     lambda { Required.new :x => :x, :y => :y }.should_not raise_error
   end
   
-  it "should be able to list of recognized parameters" do
+  it "should be able to get the list of recognized parameters" do
     class DeclaredParameters
       requires   :x, :y
       recognizes :a, :b, :c

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 19
-  version: 0.0.19
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - Juris Galang
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-11 00:00:00 -08:00
+date: 2010-12-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2045388278523135009
+      hash: -1934925740006837865
       segments: 
       - 0
       version: "0"