rogerdpack-arguments 0.4.3.3 → 0.4.7.2

data/README.rdoc

@@ -34,9 +34,16 @@ Arguments has been tested with Ruby 1.8.6 and ruby 1.9.1 and eventually will wor
     Example.class_method(:b => nil, :a => 'something') #=> ['something', nil, :c]
     
 
-Note: Keyword argument take precedence over argument order:
 
-    nu.meth(10, :a => -10) #=> [-10, :b, :c]
+* #named_arguments_for is aliased as #named_args_for and #named_args
+* Calling #named_args_for without arguments patches all previously declared methods in scope
+* Any number of method names (Symbol or String) corresponding to existing methods can be passed
+* Methods with no optionals won't be patched (will behave as usual with no named params)
+* Same for methods with splatted arguments and for native methods (not declared in Ruby)
+* Keyword argument take precedence over argument order:
+      
+      nu.meth(10, :a => -10) #=> [-10, :b, :c]
+
 
 == LIMITATIONS
 

data/lib/arguments/class.rb

@@ -1,18 +1,15 @@
-# used to throw if you try to call it on a binary method
-class BinaryMethodError < Exception; end
-
-module NamedArgs
-  
+class Class
   def named_arguments_for *methods
-    methods.each do |method|
-      names   = Arguments.names self, method
-      raise BinaryMethodError.new("tried to call it on a Binary Method" + method.to_s) unless names
-      assigns = []
+    methods = instance_methods - Object.methods if methods.empty?
+    
+    methods.each do |meth|
+      names   = Arguments.names self, meth
+      next if names.empty? || names.any?{|name| name[0] == :"*args"}
       
+      assigns = []
       names.each_with_index do |name, index|
         unless name.size == 1
           # optionals
-          assigns << "#{ name.first } = opts.key?(:#{ name.first }) ? opts[:#{ name.first }] : args.fetch(#{ index },#{ name.last })"
           assigns << <<-RUBY_EVAL
             #{ name.first } =
             if opts.key?(:#{ name.first })
@@ -34,29 +31,18 @@ module NamedArgs
       end
 
       self.module_eval <<-RUBY_EVAL, __FILE__, __LINE__
-        def __new_#{ method } *args, &block
+        def __new_#{ meth } *args, &block
           opts = args.last.kind_of?( Hash ) ? args.pop : {}
           #{ assigns.join("\n") }
-          __original_#{ method } #{ names.collect{ |n| n.first }.join(', ') }, &block
+          __original_#{ meth } #{ names.collect{ |n| n.first }.join(', ') }, &block
         end
         
-        alias __original_#{ method } #{ method }
-        alias #{ method } __new_#{ method }
+        alias __original_#{ meth } #{ meth }
+        alias #{ meth } __new_#{ meth }
       RUBY_EVAL
     end
   end
   alias :named_args_for :named_arguments_for
+  alias :named_args     :named_arguments_for
   
 end
-
-# for some reason in 1.9 module doesn't take methods from class...at least not like 1.8 did
-# so we have to mix them into both 
-class Class
- include NamedArgs
-end
-
-class Module
- include NamedArgs
-end
-
-

data/lib/arguments/mri.rb

@@ -7,15 +7,13 @@ require 'ruby2ruby'
 
 module Arguments
   def self.names klass, method
-    begin 
-      args = ParseTree.translate( klass, method ).assoc(:scope).assoc(:block).assoc(:args)[1..-1]
-    rescue NoMethodError # binary method will fail on one of those assoc's
-      return nil
-    end
+    args = ParseTree.translate( klass, method ).assoc(:scope).assoc(:block).assoc(:args)
+    args = args[1..-1]
+    return [] if args.empty?
     if args.last.instance_of? Array
       vals = args.pop[1..-1]
     else
-      # if it has no optionals
+      # if it has no optionals then vals is empty
       vals = []
     end
 

data/lib/arguments/vm.rb

@@ -2,7 +2,10 @@
 module Arguments
   def self.names klass, method
     source, line = klass.instance_method( method ).source_location
-    IO.readlines(source)[ line - 1 ].match(/def\s*\w+\s*\(?\s*([^)\n]*)/)[1] #This could look better
+    return [] unless source and line
+    str = IO.readlines(source)[ line - 1 ]
+    return [] if str.match(/\*\w+/)
+    str.match(/def\s*\w+\s*\(?\s*([^)\n]*)/)[1] #This could look better
       .scan(/(\w+)(?:\s*=\s*([^,]+))|(\w+)/).map{ |e| e.compact  }
   end
 end

data/lib/arguments.rb

@@ -1,8 +1,11 @@
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'arguments/class'
+
+
+
 RUBY_VERSION.to_f >= 1.9 ? require( 'arguments/vm' ) : require( 'arguments/mri' )
 
 module Arguments
-  VERSION = '0.4.3'
+  VERSION = '0.4.7'
 end

data/spec/arguments_spec.rb

@@ -67,6 +67,39 @@ describe Arguments do
     Klass.asr(0, 1, 2, :curve => 3).should == [0,1,2,3]
   end
   
+  it "should not patch methods that accept no args" do
+    # Arguments.should_not_receive(:names)
+    Klass.send( :named_arguments_for, :no_args )
+    lambda { @instance.no_args(1) }.should raise_error(ArgumentError)
+    @instance.no_args.should be_nil
+  end
+  
+  it "should not patch methods that use splatter op" do
+    Klass.send( :named_arguments_for, :splatted )
+    @instance.splatted(1, :args => 1).should == [1, {:args => 1}]
+
+    Klass.send( :named_arguments_for, :splatted2 )
+    @instance.splatted2(:a => 1, :"*args" => 3).should == []
+
+    Klass.send( :named_arguments_for, :splatted3 )
+    @instance.splatted3(:a => 1, :"*args" => 3).should == []
+    @instance.splatted3(1, :b => 2, :args => 1).should == [{:b => 2, :args => 1}]
+
+    Klass.send( :named_arguments_for, :splatted4 )
+    @instance.splatted4(1, :b => 2, :args => 1).should == []
+
+  end
+  
+  it "should patch methods with no optionals" do
+    Klass.send( :named_arguments_for, :no_opts )
+    lambda { @instance.no_opts(1,2, :a => 1)}.should raise_error(ArgumentError)
+    @instance.no_opts(1,2, :c => 1).should == 1
+  end
+  
+  it "should patch all methods" do
+    Klass.send( :named_args )
+  end
+  
   it "should benchmark without hack" do
     puts Benchmark.measure {
       1_000.times do
@@ -79,10 +112,6 @@ describe Arguments do
     lambda { module TestMod; def go(a); end; named_arguments_for :go; end }
   end
 
-  it "should raise if you try to call it on a c (binary) method" do
-    lambda  { class String; named_arguments_for(:strip); end }.should raise_error( BinaryMethodError )
-  end
-
   it "should benchmark with hack" do
     puts Benchmark.measure {
       Klass.send( :named_arguments_for, :with_block )

data/spec/klass.rb

@@ -20,11 +20,34 @@ class Klass
     [attackTime, sustainLevel, releaseTime, curve]
   end
   
+  def no_args
+  end
+
+  def splatted *args
+    args
+  end
+
+  def splatted2 a=1, *args
+    args
+  end
+
+  def splatted3 a, *args
+    args
+  end
+  
+  def splatted4 a, b=1, *args
+    args
+  end
+
+  def no_opts a, b, c
+    c
+  end
+  
   class << self
     def asr attackTime = 3, sustainLevel = 2, releaseTime = 1, curve = 0
       [attackTime, sustainLevel, releaseTime, curve]
     end
-  named_arguments_for :asr
+    named_arguments_for :asr
   end
   
   def == other

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rogerdpack-arguments
 version: !ruby/object:Gem::Version 
-  version: 0.4.3.3
+  version: 0.4.7.2
 platform: ruby
 authors: 
 - Macario Ortega
@@ -86,6 +86,7 @@ files:
 - spec/klass.rb
 has_rdoc: true
 homepage: 
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -107,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: arguments
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: You don't have to wait until Ruby 2.0 to get (named|keyword) arguments support