named_parameter 1.0.0 → 1.0.1

data/.gitignore

@@ -0,0 +1,4 @@
+*.swp
+*.swo
+Gemfile.lock
+pkg/

data/Gemfile

@@ -1,11 +1,4 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source 'https://rubygems.org'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.0"
-end
+# Specify your gem's dependencies in named_parameter.gemspec
+gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Named Parameter `v0.0.5`
+# Named Parameter `v1.0.0`
 
 ## Description
 That you ever dream with named parameter in Ruby? Well, you doesn't have to pray to

data/Rakefile

@@ -1,27 +1,2 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.version = "1.0.0"
-  gem.name = "named_parameter"
-  gem.homepage = "http://github.com/hugolnx/named_parameter"
-  gem.license = "MIT"
-  gem.summary = %Q{Allows named parameter in ruby}
-  gem.description = %Q{Allows named parameter in ruby}
-  gem.email = "hugolnx@gmail.com"
-  gem.authors = ["Hugo Roque (a.k.a HugoLnx)"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/lib/named_parameter/errors/on_irb_exception.rb

@@ -0,0 +1,5 @@
+module NamedParameter::Errors
+  class OnIrbException < Exception
+    MESSAGE = %q{This specific parameters don't work on IRB, just with ".rb" files.}
+  end
+end

data/lib/named_parameter/errors.rb

@@ -1,3 +1,4 @@
 require 'named_parameter/errors/undefined_parameters'
 require 'named_parameter/errors/required_parameters'
 require 'named_parameter/errors/not_hash'
+require 'named_parameter/errors/on_irb_exception'

data/lib/named_parameter/named_method_transmuter.rb

@@ -8,11 +8,8 @@ module NamedParameter
           errors = named_method.errors_when_called_with options
           raise ArgumentError,*errors.first.raise_args unless errors.empty?
 
-          original_parameters = []
-          method.parameters.each do |parameter|
-            parameter_name = parameter.last
-            original_parameters << options[parameter_name]
-          end
+          adapter = NamedParameter::ParametersAdapter.new(method)
+          original_parameters = adapter.hash_to_args(options)
 
           original_named_method = method(named_method.name_of_original)
           original_named_method.call(*original_parameters.compact)

data/lib/named_parameter/parameters_adapter.rb

@@ -0,0 +1,86 @@
+module NamedParameter
+  class ParametersAdapter
+    NO_ARGUMENT = Object.new
+
+    attr_reader :method
+
+    def initialize(method)
+      @method = method
+    end
+
+    def hash_to_args(options)
+      original_parameters = []
+      @method.parameters.each_with_index do |parameter, i|
+        parameter_name = parameter.last
+        if options.has_key? parameter_name
+          original_parameters << options[parameter_name]
+        else
+          original_parameters << NO_ARGUMENT
+        end
+      end
+
+      arguments = fill_no_arguments(original_parameters)
+
+      return arguments
+    end
+
+  private
+
+    def fill_no_arguments(arguments)
+      while arguments.last.equal? NO_ARGUMENT
+        last_index = arguments.size - 1
+        arguments.delete_at last_index
+      end
+
+      if arguments.any?{|arg| arg.equal? NO_ARGUMENT}
+        filepath = @method.source_location[0]
+        linenumber = @method.source_location[1]
+
+        if filepath.downcase == "(irb)"
+            msg = NamedParameter::Errors::OnIrbException::MESSAGE
+            raise NamedParameter::Errors::OnIrbException, msg
+        end
+
+        content = File.read(filepath).split("\n")[(linenumber-1)..-1].join.strip
+        
+        default_values = extract_default_values content
+
+        arguments.map!.with_index do |arg, i|
+          no_argument = arg.equal? NO_ARGUMENT
+          no_argument ? default_values[i] : arg
+        end
+      end
+
+      return arguments
+    end
+
+    def extract_default_values(file_fragment)
+      match = file_fragment.match /^[^\(]*\(([^\)]*)\)/
+      args_fragment = match[1]
+      args_fragments = extract_args_fragments args_fragment
+      default_values = args_fragments.map{|frag| eval(frag.gsub(/^[^=]*(=|$)/, ""))}
+      return default_values
+    end
+
+    def extract_args_fragments(fragment)
+      base_frags = fragment.split ","
+      frags = []
+      i = 0
+      while i < base_frags.size
+        frag = base_frags[i]
+        while inconsistent_fragment?(frag)
+          i += 1
+          frag += ",#{base_frags[i]}"
+        end
+        frags << frag
+        i += 1;
+      end
+      return frags
+    end
+
+    def inconsistent_fragment?(fragment)
+      return fragment.count("([{") != fragment.count(")]}") ||
+             fragment.count(%q{"'/}).odd?
+    end
+  end
+end

data/lib/named_parameter/version.rb

@@ -0,0 +1,3 @@
+module NamedParameter
+  VERSION = "1.0.1"
+end

data/lib/named_parameter.rb

@@ -1,3 +1,4 @@
+require 'named_parameter/version'
 require 'named_parameter/named_method'
 require 'named_parameter/named_method_transmuter'
 require 'named_parameter/errors'
@@ -5,3 +6,4 @@ require 'named_parameter/error'
 require 'named_parameter/named_above'
 require 'named_parameter/named_inline'
 require 'named_parameter/named_parameter'
+require 'named_parameter/parameters_adapter'

data/named_parameter.gemspec

@@ -1,70 +1,17 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/named_parameter/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = "named_parameter"
-  s.version = "1.0.0"
+Gem::Specification.new do |gem|
+  gem.authors       = ["Hugo Roque"]
+  gem.email         = ["hugolnx@gmail.com"]
+  gem.description   = %q{Allows named parameter in ruby}
+  gem.summary       = %Q{named_parameter-#{NamedParameter::VERSION}}
+  gem.homepage      = "http://github.com/hugolnx/named_parameter/"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Hugo Roque (a.k.a HugoLnx)"]
-  s.date = "2012-08-08"
-  s.description = "Allows named parameter in ruby"
-  s.email = "hugolnx@gmail.com"
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "Gemfile",
-    "README.md",
-    "Rakefile",
-    "lib/named_parameter.rb",
-    "lib/named_parameter/error.rb",
-    "lib/named_parameter/errors.rb",
-    "lib/named_parameter/errors/not_hash.rb",
-    "lib/named_parameter/errors/required_parameters.rb",
-    "lib/named_parameter/errors/undefined_parameters.rb",
-    "lib/named_parameter/named_above.rb",
-    "lib/named_parameter/named_inline.rb",
-    "lib/named_parameter/named_method.rb",
-    "lib/named_parameter/named_method_transmuter.rb",
-    "lib/named_parameter/named_parameter.rb",
-    "lib/named_parameter/parameters.rb",
-    "named_parameter.gemspec",
-    "spec/features/named_above/class_self_named_method_feature_spec.rb",
-    "spec/features/named_above/individual_named_method_feature_spec.rb",
-    "spec/features/named_above/singleton_named_method_feature_spec.rb",
-    "spec/features/named_inline/class_self_named_method_feature_spec.rb",
-    "spec/features/named_inline/individual_named_method_feature_spec.rb",
-    "spec/features/named_inline/singleton_named_method_feature_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/unit/error_spec.rb",
-    "spec/unit/errors/not_hash_spec.rb",
-    "spec/unit/errors/required_parameters_spec.rb",
-    "spec/unit/errors/undefined_parameters_spec.rb",
-    "spec/unit/named_method_spec.rb",
-    "spec/unit/named_method_transmuter_spec.rb"
-  ]
-  s.homepage = "http://github.com/hugolnx/named_parameter"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
-  s.summary = "Allows named parameter in ruby"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
-    else
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-    end
-  else
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-  end
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "named_parameter"
+  gem.require_paths = ["lib"]
+  gem.version       = NamedParameter::VERSION
 end
-

data/spec/bug_fixing/parameters_order_spec.rb

@@ -0,0 +1,253 @@
+require 'spec_helper'
+
+describe "BugFix: should suport any kind use combination of optional parameters" do
+  describe 'Named Parameter' do
+    context %q{named def whatever(a="z",b="z",c="z",d="z",e="z",f="z")} do
+      specify "inline" do
+        class SomeClass
+          extend NamedParameter
+
+          named def whatever(a="z",b="z",c="z",d="z",e="z",f="z")
+            return [a,b,c,d,e,f]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        obj.whatever(
+          a: "a",
+          c: "c",
+          d: "d",
+          f: "f"
+        ).should == %w{a z c d z f}
+      end
+
+      specify "above" do
+        class SomeClass
+          extend NamedParameter
+
+          named
+          def whatever(a="z",b="z",c="z",d="z",e="z",f="z")
+            return [a,b,c,d,e,f]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        obj.whatever(
+          a: "a",
+          c: "c",
+          d: "d",
+          f: "f"
+        ).should == %w{a z c d z f}
+      end
+    end
+
+    context %q{named def whatever(a="z",b="z",c="z", \n d="z",e="z",f="z")} do
+      specify "inline" do
+        class SomeClass
+          extend NamedParameter
+
+          named def whatever(a="z",b="z",c="z",
+                             d="z",e="z",f="z")
+            return [a,b,c,d,e,f]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        obj.whatever(
+          a: "a",
+          c: "c",
+          d: "d",
+          f: "f"
+        ).should == %w{a z c d z f}
+      end
+
+      specify "above" do
+        class SomeClass
+          extend NamedParameter
+
+          named
+          def whatever(a="z",b="z",c="z",
+                       d="z",e="z",f="z")
+            return [a,b,c,d,e,f]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        obj.whatever(
+          a: "a",
+          c: "c",
+          d: "d",
+          f: "f"
+        ).should == %w{a z c d z f}
+      end
+    end
+
+
+    context %q{named def whatever(a="z",b="z",c="z", d="z",e,f)} do
+      specify "inline" do
+        class SomeClass
+          extend NamedParameter
+
+          named def whatever(a,b,c="z", d="z",e="z",f="z")
+            return [a,b,c,d,e,f]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        obj.whatever(
+          a: "a",
+          b: "b",
+          c: "c",
+          d: "d",
+          f: "f"
+        ).should == %w{a b c d z f}
+      end
+
+      specify "above" do
+        class SomeClass
+          extend NamedParameter
+
+          named
+          def whatever(a,b,c="z", d="z",e="z",f="z")
+            return [a,b,c,d,e,f]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        obj.whatever(
+          a: "a",
+          b: "b",
+          c: "c",
+          d: "d",
+          f: "f"
+        ).should == %w{a b c d z f}
+      end
+    end
+
+    context %q{named def whatever(a,b="z",c=lambda{|arg1,arg2| arg1[1,2] + "test"})} do
+      specify "inline" do
+        class SomeClass
+          extend NamedParameter
+
+          named def whatever(a,b="z",c=lambda{|arg1,arg2| arg1[1,2] + "test"},d="z")
+            return [a,b,c,d]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        return_ = obj.whatever(
+          a: "a",
+          d: "d"
+        )
+        return_[0].should == "a"
+        return_[1].should == "z"
+        return_[2].should be_a Proc
+        return_[3].should == "d"
+      end
+
+      specify "above" do
+        class SomeClass
+          extend NamedParameter
+
+          named
+          def whatever(a,b="z",c=lambda{|arg1,arg2| arg1[1,2] + "test"},d="z")
+            return [a,b,c,d]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        return_ = obj.whatever(
+          a: "a",
+          d: "d"
+        )
+        return_[0].should == "a"
+        return_[1].should == "z"
+        return_[2].should be_a Proc
+        return_[3].should == "d"
+      end
+    end
+
+    context %q{named def whatever(a,b="z",c="z,z",d="z")} do
+      specify "inline" do
+        class SomeClass
+          extend NamedParameter
+
+          named def whatever(a,b="z",c="z,z",d="z")
+            return [a,b,c,d]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        obj.whatever(
+          a: "a",
+          d: "d"
+        ).should == %w{a z z,z d}
+      end
+
+      specify "above" do
+        class SomeClass
+          extend NamedParameter
+
+          named
+          def whatever(a,b="z",c="z,z",d="z")
+            return [a,b,c,d]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        obj.whatever(
+          a: "a",
+          d: "d"
+        ).should == %w{a z z,z d}
+      end
+    end
+
+    context %q{named def whatever(a,b="z",c=/z,z/,d="z")} do
+      specify "inline" do
+        class SomeClass
+          extend NamedParameter
+
+          named def whatever(a,b="z",c=/z,z/,d="z")
+            return [a,b,c,d]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        obj.whatever(
+          a: "a",
+          d: "d"
+        ).should == ["a", "z", /z,z/, "d"]
+      end
+
+      specify "above" do
+        class SomeClass
+          extend NamedParameter
+
+          named
+          def whatever(a,b="z",c=/z,z/,d="z")
+            return [a,b,c,d]
+          end
+        end
+
+        obj = SomeClass.new
+        
+        obj.whatever(
+          a: "a",
+          d: "d"
+        ).should == ["a", "z", /z,z/, "d"]
+      end
+    end
+
+  end
+end

data/spec/unit/parameters_adapter_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+module NamedParameter
+  describe ParametersAdapter do
+    context "two optional parameters" do
+      it 'maintain the default value in the middle too' do
+        def test_method(arg1 = "default1", arg2 = "default2");end
+
+        method = method(:test_method)
+        adapter = ParametersAdapter.new(method)
+        arguments = adapter.hash_to_args({arg2: "argument2"})
+
+        arguments.should == ["default1", "argument2"]
+      end
+    end
+
+    context "one parameter with default value as a lambda" do
+      it 'maintain the default value in the middle too' do
+        def test_method(a,b="z",c=lambda{|arg1,arg2| arg1 + "test"},d="z");end
+
+        method = method(:test_method)
+        adapter = ParametersAdapter.new(method)
+        arguments = adapter.hash_to_args({a: "a", d: "d"})
+
+        arguments[0].should == "a"
+        arguments[1].should == "z"
+        arguments[2].should be_a Proc
+        arguments[3].should == "d"
+      end
+    end
+  end
+end

metadata

@@ -1,45 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: named_parameter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
-- Hugo Roque (a.k.a HugoLnx)
+- Hugo Roque
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &77836440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *77836440
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &77835570 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *77835570
+date: 2012-09-09 00:00:00.000000000 Z
+dependencies: []
 description: Allows named parameter in ruby
-email: hugolnx@gmail.com
+email:
+- hugolnx@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - README.md
 - Rakefile
@@ -47,6 +26,7 @@ files:
 - lib/named_parameter/error.rb
 - lib/named_parameter/errors.rb
 - lib/named_parameter/errors/not_hash.rb
+- lib/named_parameter/errors/on_irb_exception.rb
 - lib/named_parameter/errors/required_parameters.rb
 - lib/named_parameter/errors/undefined_parameters.rb
 - lib/named_parameter/named_above.rb
@@ -55,7 +35,10 @@ files:
 - lib/named_parameter/named_method_transmuter.rb
 - lib/named_parameter/named_parameter.rb
 - lib/named_parameter/parameters.rb
+- lib/named_parameter/parameters_adapter.rb
+- lib/named_parameter/version.rb
 - named_parameter.gemspec
+- spec/bug_fixing/parameters_order_spec.rb
 - spec/features/named_above/class_self_named_method_feature_spec.rb
 - spec/features/named_above/individual_named_method_feature_spec.rb
 - spec/features/named_above/singleton_named_method_feature_spec.rb
@@ -69,9 +52,9 @@ files:
 - spec/unit/errors/undefined_parameters_spec.rb
 - spec/unit/named_method_spec.rb
 - spec/unit/named_method_transmuter_spec.rb
-homepage: http://github.com/hugolnx/named_parameter
-licenses:
-- MIT
+- spec/unit/parameters_adapter_spec.rb
+homepage: http://github.com/hugolnx/named_parameter/
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -93,5 +76,20 @@ rubyforge_project:
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: Allows named parameter in ruby
-test_files: []
+summary: named_parameter-1.0.1
+test_files:
+- spec/bug_fixing/parameters_order_spec.rb
+- spec/features/named_above/class_self_named_method_feature_spec.rb
+- spec/features/named_above/individual_named_method_feature_spec.rb
+- spec/features/named_above/singleton_named_method_feature_spec.rb
+- spec/features/named_inline/class_self_named_method_feature_spec.rb
+- spec/features/named_inline/individual_named_method_feature_spec.rb
+- spec/features/named_inline/singleton_named_method_feature_spec.rb
+- spec/spec_helper.rb
+- spec/unit/error_spec.rb
+- spec/unit/errors/not_hash_spec.rb
+- spec/unit/errors/required_parameters_spec.rb
+- spec/unit/errors/undefined_parameters_spec.rb
+- spec/unit/named_method_spec.rb
+- spec/unit/named_method_transmuter_spec.rb
+- spec/unit/parameters_adapter_spec.rb