rdp-arguments 0.6 → 0.6.1

data/Rakefile

@@ -10,7 +10,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 'arguments' do
+$hoe = Hoe.spec 'rdp-arguments' do
   self.developer 'Macario Ortega', 'macarui@gmail.com'
   self.rubyforge_name = self.name # TODO this is default value
   self.extra_deps = [
@@ -18,7 +18,6 @@ $hoe = Hoe.spec 'arguments' do
     ['ParseTree',   '>= 3.0.3'],
     ['ruby2ruby',    '= 1.1.9']
   ]
-  self.homepage = 'http://github.com/maca/arguments'
 end
 
 require 'newgem/tasks'

data/arguments.gemspec

@@ -1,43 +1,42 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{rdp-arguments}
-  s.version = "0.6"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Macario Ortega"]
-  s.date = %q{2009-08-06}
-  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.has_rdoc = true
-  s.homepage = %q{http://github.com/maca/arguments}
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{arguments}
-  s.rubygems_version = %q{1.3.1}
-  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 = 2
-
-    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.2"])
-    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.2"])
-    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.2"])
-  end
-end
+# -*- 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

data/lib/arguments/class.rb

@@ -4,7 +4,14 @@ module Arguments
         
     methods.each do |meth|
       meth    = meth.to_s
-      klass   = meth.sub!(/^self./, '') ? (class << self; self; end) : self
+      original_klass = self
+      if meth =~ /^self\./
+        am_self = true
+        klass = (class << self; self; end)
+        meth.sub!(/^self\./ , '')
+      else
+        klass = self
+      end
       names   = Arguments.names klass, meth
       next if names.empty? or names.inject(false) { |bol, pair| bol || /^\*/ === pair.first.to_s }
       assigns = []
@@ -31,7 +38,9 @@ module Arguments
         end
       end
 
-      klass.module_eval <<-RUBY_EVAL, __FILE__, __LINE__
+
+      it = <<-RUBY_EVAL, __FILE__, __LINE__
+        #{ "class << self" if am_self } 
         def __#{ meth }_with_keyword_arguments *args, &block
           opts = args.last.kind_of?( Hash ) && args.size < #{ names.size } ? args.pop : {}
           #{ assigns.join("\n") }
@@ -40,10 +49,12 @@ module Arguments
           end
           __original_#{ meth } #{ names.collect{ |n| n.first }.join(', ') }, &block
         end
-        
+
         alias __original_#{ meth } #{ meth }
         alias #{ meth } __#{ meth }_with_keyword_arguments
+        #{ "end" if am_self }
       RUBY_EVAL
+      original_klass.class_eval *it
     end
   end
   alias :named_args_for :named_arguments_for
@@ -53,6 +64,7 @@ end
 class Class
   include Arguments
 end
+
 class Module
   include Arguments
 end

data/lib/arguments.rb

@@ -7,7 +7,7 @@ require 'arguments/class'
 RUBY_VERSION.to_f >= 1.9 ? require( 'arguments/vm' ) : require( 'arguments/mri' )
 
 module Arguments
-  VERSION = '0.6'
+  VERSION = '0.6.1'
   
   def self.names klass, method
     args = ast_for_method(klass, method).assoc(:args)

data/spec/arguments_spec.rb

@@ -43,9 +43,15 @@ describe Arguments do
     Klass.send( :named_arguments_for, :defaults_with_class)
     @instance.defaults_with_class(1, 3).should == 3
     @instance.defaults_with_class(:a => 3).should == 3
-    require '_dbg'
     @instance.defaults_with_class().should == 3
   end
+
+  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().should == 3
+  end
   
   it "should allow overriding with nil" do
     Klass.send( :named_arguments_for, :two )
@@ -70,6 +76,8 @@ describe Arguments do
   it "should work with class methods" do
     (class << Klass; self; end).send( :named_arguments_for, :k_method )
     Klass.k_method(:d => :d).should == [1, 2, 3, :d]
+    #(class << Klass; self; end).send( :named_arguments_for, :k_method )
+    #Klass.k_method(:d => :d).should == [1, 2, 3, :d]
   end
   
   it "should override defaults on standard passing" do
@@ -143,13 +151,12 @@ describe Arguments do
     }
   end
 
-  it "should work with modules" do
+  it "should work with modules (not working yet)" do
      require 'module.rb'
      TestMod.send(:named_arguments_for, :go)
      IncludesTestMod.new.go(1,2).should == 2
      IncludesTestMod.new.go(:a => 1, :b => 2).should == 2
   end
-  
 
   it "should benchmark with hack" do
     puts Benchmark.measure {

data/spec/klass.rb

@@ -23,6 +23,10 @@ class Klass
   def defaults_with_class b = 1, a = @@go
     a
   end
+
+  def self.klass_defaults_with_class b = 1, a = @@go
+    a
+  end
   
   def no_args
   end

data/spec/module.rb

@@ -1,5 +1,5 @@
 module TestMod; 
- def go(a, b) 
+ def go(a, b)
    b
  end
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rdp-arguments
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  version: 0.6.1
 platform: ruby
 authors: 
 - Macario Ortega
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-06 00:00:00 -06:00
+date: 2009-10-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,9 +50,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
-description: 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)
+description: |-
+  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)
 email: 
 - macarui@gmail.com
 executables: []
@@ -76,7 +78,7 @@ files:
 - spec/klass.rb
 - spec/module.rb
 has_rdoc: true
-homepage: http://github.com/maca/arguments
+homepage: 
 licenses: []
 
 post_install_message: 
@@ -99,10 +101,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: arguments
+rubyforge_project: rdp-arguments
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: You don't have to wait until Ruby 2.0 to get (named|keyword) arguments support
 test_files: []