rdp-arguments 0.6.1 → 0.6.2

data/Rakefile

@@ -11,6 +11,7 @@ Hoe.plugin :newgem
 # Generate all the Rake tasks
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'rdp-arguments' do
+  raise 'broken with 1.3.5 on doze'
   self.developer 'Macario Ortega', 'macarui@gmail.com'
   self.rubyforge_name = self.name # TODO this is default value
   self.extra_deps = [

data/lib/arguments.rb

@@ -9,12 +9,17 @@ RUBY_VERSION.to_f >= 1.9 ? require( 'arguments/vm' ) : require( 'arguments/mri'
 module Arguments
   VERSION = '0.6.1'
   
-  def self.names klass, method
-    args = ast_for_method(klass, method).assoc(:args)
+  def self.names klass, method, am_self
+    args = ast_for_method(klass, method, am_self).assoc(:args)
     args = args[1..-1]
     
-    return [] if args.empty? or args.last.is_a?(Symbol)
-    vals = args.pop[1..-1]
+    return [] if args.empty?# or args.last.is_a?(Symbol)
+    if args.last.is_a?(Symbol)
+     # no optionals, so don't pop them off the list
+     vals = []
+    else
+     vals = args.pop[1..-1]
+    end
 
     args.collect do |arg|
       if val = vals.find{ |v| v[1] == arg }

data/lib/arguments/class.rb

@@ -12,7 +12,7 @@ module Arguments
       else
         klass = self
       end
-      names   = Arguments.names klass, meth
+      names = Arguments.names klass, meth, am_self
       next if names.empty? or names.inject(false) { |bol, pair| bol || /^\*/ === pair.first.to_s }
       assigns = []
       names.pop if /^&/ === names[-1][0].to_s
@@ -38,7 +38,6 @@ module Arguments
         end
       end
 
-
       it = <<-RUBY_EVAL, __FILE__, __LINE__
         #{ "class << self" if am_self } 
         def __#{ meth }_with_keyword_arguments *args, &block
@@ -54,6 +53,16 @@ module Arguments
         alias #{ meth } __#{ meth }_with_keyword_arguments
         #{ "end" if am_self }
       RUBY_EVAL
+      if $DEBUG
+        code, file, line = *it
+        file = "cached_methods/#{meth}"
+        line = 1
+        Dir.mkdir 'cached_methods' rescue nil
+        File.open(file, 'w') do |f|
+          f.write code
+        end
+        it = [code, file, 1]
+      end   
       original_klass.class_eval *it
     end
   end

data/lib/arguments/mri.rb

@@ -2,7 +2,8 @@ gem 'ParseTree', '>= 3.0.3'
 require 'parse_tree'
 
 module Arguments
-  def self.ast_for_method klass, method
+  def self.ast_for_method klass, method, am_self
+    # don't care about am_self for 1.8.x
     ParseTree.translate( klass, method ).assoc(:scope).assoc(:block)
   end
 end

data/lib/arguments/vm.rb

@@ -12,10 +12,17 @@ module Arguments
     end
   end
   
-  def self.ast_for_method klass, method
+  def self.ast_for_method klass, method, am_self
     source, line = klass.instance_method(method).source_location
     str = IO.readlines( source )[ (line-1)..-1 ].join
+
     ast = PermissiveRubyParser.new.parse( str )
-    ast.assoc( :defn ) or ast
+    if ast
+      if am_self
+        return (ast.assoc( :defs ) or ast)
+      else
+        return (ast.assoc( :defn ) or ast)
+      end
+    end
   end
 end

data/spec/arguments_spec.rb

@@ -1,5 +1,7 @@
-require "#{ dir = File.dirname __FILE__ }/../lib/arguments"
+require 'rubygems'
 require 'benchmark'
+require "#{ dir = File.dirname __FILE__ }/../lib/arguments"
+require 'spec/autorun'
 
 # TODO: Refactor specs for clarity and better coverage
 describe Arguments do
@@ -7,6 +9,7 @@ describe Arguments do
   before do
     Object.send(:remove_const, 'Klass') rescue nil
     load "#{ dir }/klass.rb"
+    load "#{ dir }/klass_big.rb"
     @instance = Klass.new
   end
 
@@ -48,10 +51,41 @@ describe Arguments do
 
   it "should allow for class arguments in class methods" do
     Klass.send( :named_arguments_for, :'self.klass_defaults_with_class')
-    Klass.klass_defaults_with_class(1, 3).should == 3
-    Klass.klass_defaults_with_class(:a => 3).should == 3
+    Klass.klass_defaults_with_class(1, 4).should == 4
+    Klass.klass_defaults_with_class(:a => 4).should == 4
     Klass.klass_defaults_with_class().should == 3
   end
+
+  it "should allow for class arguments in class methods" do
+    Klass.send( :named_arguments_for, :'self.klass_method')
+    Klass.klass_method(1, 2).should == 3
+    Klass.klass_method(:a => 3).should == 3
+    Klass.klass_method(1,2,3,5).should == 5
+    Klass.klass_method(1,2,3,5, 6).should == 5
+  end
+
+  it "should allow for method within a class' self block to be used with a class name" do
+    Klass.send(:named_arguments_for, :'self.klass_method3')
+    Klass.klass_method3(1,4).should == 4
+    Klass.klass_method3(:a => 1, :b => 4).should == 4
+  end
+
+  it "should parse larger methods" do
+     Klass.send( :named_arguments_for, :'self.startCSWithP2PEM')
+     Klass.startCSWithP2PEM 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n' # 3
+
+     Klass.startCSWithP2PEM 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', :dhtClassToUse => 44, :completion_proc => nil # 44 
+
+     Klass.startCSWithP2PEM 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', :dhtClassToUse => 44, :completion_proc => nil, :use_this_shared_logger => nil, :do_not_shutdown_logger => false, :termination_proc => nil # 44
+
+  end
+
+  it "should allow for class arguments in class methods defined with like Name.method" do
+    Klass.send( :named_arguments_for, :'self.klass_defaults_with_class2')
+    Klass.klass_defaults_with_class2(1, 3).should == 3
+    Klass.klass_defaults_with_class2(:a => 3).should == 3
+    Klass.klass_defaults_with_class2().should == 3
+  end
   
   it "should allow overriding with nil" do
     Klass.send( :named_arguments_for, :two )
@@ -109,7 +143,7 @@ describe Arguments do
     rescue ArgumentError => e
       e
     end
-    error.to_s.should == "`four, five` are not recognized argument keywords"
+    error.to_s.should == "`four, five` are not recognized argument keywords" rescue  error.to_s.should == "`five, four` are not recognized argument keywords"
   end
   
   it "should not patch methods that accept no args" do
@@ -133,11 +167,18 @@ describe Arguments do
     @instance.splatted4(1, :b => 2, :args => 1).should == [1, {:b => 2, :args => 1}, []]
   end
   
-  it "should not patch methods with no optionals" do
+  it "should patch methods with no optionals" do
     Klass.send( :named_arguments_for, :no_opts )
-    @instance.method(:no_opts).arity.should == 3
+    @instance.method(:no_opts).arity.should == -1
   end
   
+  it "should handle named blocks" do
+    @instance.with_block3(3, 3).should==3
+    Klass.send(:named_args, :with_block3)
+    @instance.with_block3(3, nil, 4).should==4
+    @instance.with_block3(3).should==3
+  end
+
   it "should patch all methods" do
     Klass.send( :named_args )
     @instance.two(1, :three => 3).should == [1, 2, 3]
@@ -168,4 +209,6 @@ describe Arguments do
       end
     }
   end
+
+
 end

data/spec/klass.rb

@@ -27,6 +27,24 @@ class Klass
   def self.klass_defaults_with_class b = 1, a = @@go
     a
   end
+
+  def Klass.klass_defaults_with_class2 b = 1, a = @@go
+    a
+  end
+
+  def Klass.klass_method a = 1, b = 2, c = 3, d = @@go, e = nil
+    d
+  end
+
+  class << self
+    def klass_method3 a, b = 2
+      b
+    end
+  end
+
+  def with_block3( value, round_id = nil, this_many_repeats_left = 3, &block)
+    this_many_repeats_left
+  end
   
   def no_args
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rdp-arguments
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
-- Macario Ortega
+- Macario Ortega, rogerdpack
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -06:00
+date: 2009-11-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,6 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- arguments.gemspec
 - lib/arguments.rb
 - lib/arguments/class.rb
 - lib/arguments/mri.rb

data/arguments.gemspec

@@ -1,42 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{arguments}
-  s.version = "0.6.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Macario Ortega"]
-  s.date = %q{2009-10-29}
-  s.description = %q{You don't have to wait until Ruby 2.0 to get (named|keyword) arguments support.
-Arguments has been tested with Ruby 1.8.6 and ruby 1.9.1 and eventually will work with JRuby (if someone is interested in contributing, I guess is possible since merb-action-args works with JRuby)}
-  s.email = ["macarui@gmail.com"]
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "arguments.gemspec", "lib/arguments.rb", "lib/arguments/class.rb", "lib/arguments/mri.rb", "lib/arguments/vm.rb", "spec/arguments_spec.rb", "spec/klass.rb", "spec/module.rb"]
-   s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{arguments}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{You don't have to wait until Ruby 2.0 to get (named|keyword) arguments support}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby_parser>, [">= 2.0.2"])
-      s.add_runtime_dependency(%q<ParseTree>, [">= 3.0.3"])
-      s.add_runtime_dependency(%q<ruby2ruby>, ["= 1.1.9"])
-      s.add_development_dependency(%q<hoe>, [">= 2.3.3"])
-    else
-      s.add_dependency(%q<ruby_parser>, [">= 2.0.2"])
-      s.add_dependency(%q<ParseTree>, [">= 3.0.3"])
-      s.add_dependency(%q<ruby2ruby>, ["= 1.1.9"])
-      s.add_dependency(%q<hoe>, [">= 2.3.3"])
-    end
-  else
-    s.add_dependency(%q<ruby_parser>, [">= 2.0.2"])
-    s.add_dependency(%q<ParseTree>, [">= 3.0.3"])
-    s.add_dependency(%q<ruby2ruby>, ["= 1.1.9"])
-    s.add_dependency(%q<hoe>, [">= 2.3.3"])
-  end
-end