named_parameter 1.0.1 → 1.0.2

data/README.md

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

data/lib/named_parameter/defaults_extractor/default_parameters_extractor.rb

@@ -0,0 +1,43 @@
+module NamedParameter
+  module DefaultsExtractor
+    class DefaultParametersExtractor
+      def defaults_of(method)
+        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
+
+        rb_content = File.read(filepath)
+
+        extractor = SignatureExtractor.new
+        signature = extractor.signature_of(rb_content, linenumber);
+
+        created_method = method_with_signature(signature, method)
+
+        defaults = call_with_required_params(created_method)
+
+        defaults
+      end
+
+      def method_with_signature(signature, original)
+        argnames = original.parameters.map{|(_, name)| name}
+        method_code = "#{signature}; return [#{argnames.join(",")}];end"
+        eval(method_code)
+
+        method(original.name)
+      end
+
+      def call_with_required_params(method)
+        required = method.parameters
+          .find_all{|(tag, _)| tag == :req}
+          .map{|(_, name)| name}
+
+        args = [nil] * required.size
+        method.call(*args)
+      end
+    end
+  end
+end

data/lib/named_parameter/defaults_extractor/signature_extractor.rb

@@ -0,0 +1,48 @@
+module NamedParameter
+  module DefaultsExtractor
+    class SignatureExtractor
+      module EndLineValidators
+        WITH_PARENTESIS = lambda{|line| line.strip.end_with?(")")}
+        WITHOUT_PARENTESIS = lambda{|line| !line.strip.end_with?(",")}
+      end
+
+      def signature_of(content, linenumber)
+        content = extract_until_signature_starts(content, linenumber)
+
+        signature_end = find_signature_end content
+
+        signature = content[0..signature_end].split("\n").map{|line| line.strip}.join
+
+        signature
+      end
+
+      def extract_until_signature_starts(content, linenumber)
+        content
+          .split("\n")[(linenumber-1)..-1]
+          .join("\n")
+          .gsub(";", "\n")
+          .strip
+          .reverse.gsub(/ fed.*$/, " fed").reverse
+      end
+
+      def find_signature_end(signature)
+        if signature =~ /^def +[A-Za-z_\?]+ *\(/
+          sign_end_validator = EndLineValidators::WITH_PARENTESIS
+        else
+          sign_end_validator = EndLineValidators::WITHOUT_PARENTESIS
+        end
+
+        lines = signature.split("\n")
+        sign_end = 0
+        i = 0
+        until sign_end_validator.call(lines[i])
+          sign_end += lines[i].size + 1
+          i += 1
+        end
+        sign_end += lines[i].size
+
+        sign_end
+      end
+    end
+  end
+end

data/lib/named_parameter/defaults_extractor.rb

@@ -0,0 +1,2 @@
+require 'named_parameter/defaults_extractor/default_parameters_extractor'
+require 'named_parameter/defaults_extractor/signature_extractor'

data/lib/named_parameter/parameters_adapter.rb

@@ -33,54 +33,16 @@ module NamedParameter
       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
+        extractor = DefaultsExtractor::DefaultParametersExtractor.new
+        defaults = extractor.defaults_of(@method)
         
-        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
+          no_argument ? defaults[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

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

data/lib/named_parameter.rb

@@ -7,3 +7,4 @@ require 'named_parameter/named_above'
 require 'named_parameter/named_inline'
 require 'named_parameter/named_parameter'
 require 'named_parameter/parameters_adapter'
+require 'named_parameter/defaults_extractor'

data/spec/bug_fixing/parameters_order_spec.rb

@@ -87,7 +87,7 @@ describe "BugFix: should suport any kind use combination of optional parameters"
     end
 
 
-    context %q{named def whatever(a="z",b="z",c="z", d="z",e,f)} do
+    context %q{named def whatever(a,b,c="z", d="z",e="z",f="z")} do
       specify "inline" do
         class SomeClass
           extend NamedParameter

data/spec/unit/defaults_extractor/default_parameters_extractor_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+module NamedParameter
+  module DefaultsExtractor
+    describe DefaultParametersExtractor do
+      it 'extract for parameters with one required at right' do
+        def sample(a="a", b="b", c)
+        end
+
+        extractor = DefaultParametersExtractor.new
+        defaults = extractor.defaults_of(method(:sample))
+
+        defaults.should == ["a", "b", nil]
+      end
+
+      it 'extract for parameters with ;' do
+        def sample(a="a", b="b", c, d);end
+
+        extractor = DefaultParametersExtractor.new
+        defaults = extractor.defaults_of(method(:sample))
+
+        defaults.should == ["a", "b", nil, nil]
+      end
+
+      it 'extract from 2 required at left' do
+        def sample(a,b,c="c", d="d",e="e",f="f");end
+
+        extractor = DefaultParametersExtractor.new
+        defaults = extractor.defaults_of(method(:sample))
+
+        defaults.should == [nil, nil, "c", "d", "e", "f"]
+      end
+    end
+  end
+end

data/spec/unit/defaults_extractor/signature_extractor_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+module NamedParameter
+  module DefaultsExtractor
+    describe SignatureExtractor  do
+      it 'extract for parameters with simple strings as defaults' do
+        code =
+        %q{class Teste
+            def sample(a="a", b="b", c)
+            end
+          end}
+
+        extractor = SignatureExtractor.new
+        signature = extractor.signature_of(code, 2)
+
+        signature.should == %q{def sample(a="a", b="b", c)}
+      end
+
+      it 'extract from no parentesis methods' do
+        code =
+        %q{class Teste
+            def sample a="a", b="b", c
+            end
+          end}
+
+        extractor = SignatureExtractor.new
+        signature = extractor.signature_of(code, 2)
+
+        signature.should == %q{def sample a="a", b="b", c}
+      end
+
+      it 'extract from methods with more than one line' do
+        code =
+        %q{class Teste
+            def sample a="a",
+              b="b",
+              c
+            end
+          end}
+
+        extractor = SignatureExtractor.new
+        signature = extractor.signature_of(code, 2)
+
+        signature.should == %q{def sample a="a",b="b",c}
+      end
+
+      it 'extract from methods with more than one line and parentesis' do
+        code =
+        %q{class Teste
+            def sample(a="a",
+              b="b",
+              c
+              )
+            end
+          end}
+
+        extractor = SignatureExtractor.new
+        signature = extractor.signature_of(code, 2)
+
+        signature.should == %q{def sample(a="a",b="b",c)}
+      end
+
+      it 'extract from methods with something before def' do
+        code =
+        %q{class Teste
+            named def sample(a="a",
+              b="b",
+              c
+              )
+            end
+          end}
+
+        extractor = SignatureExtractor.new
+        signature = extractor.signature_of(code, 2)
+
+        signature.should == %q{def sample(a="a",b="b",c)}
+      end
+
+
+      it 'can have an "def" in the middle of the signature' do
+        code =
+        %q{class Teste
+            def sample(arg="default");end
+          end}
+
+        extractor = SignatureExtractor.new
+        signature = extractor.signature_of(code, 2)
+
+        signature.should == %q{def sample(arg="default")}
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: named_parameter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-10-20 00:00:00.000000000 Z
 dependencies: []
 description: Allows named parameter in ruby
 email:
@@ -23,6 +23,9 @@ files:
 - README.md
 - Rakefile
 - lib/named_parameter.rb
+- lib/named_parameter/defaults_extractor.rb
+- lib/named_parameter/defaults_extractor/default_parameters_extractor.rb
+- lib/named_parameter/defaults_extractor/signature_extractor.rb
 - lib/named_parameter/error.rb
 - lib/named_parameter/errors.rb
 - lib/named_parameter/errors/not_hash.rb
@@ -46,6 +49,8 @@ files:
 - 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/defaults_extractor/default_parameters_extractor_spec.rb
+- spec/unit/defaults_extractor/signature_extractor_spec.rb
 - spec/unit/error_spec.rb
 - spec/unit/errors/not_hash_spec.rb
 - spec/unit/errors/required_parameters_spec.rb
@@ -76,7 +81,7 @@ rubyforge_project:
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: named_parameter-1.0.1
+summary: named_parameter-1.0.2
 test_files:
 - spec/bug_fixing/parameters_order_spec.rb
 - spec/features/named_above/class_self_named_method_feature_spec.rb
@@ -86,6 +91,8 @@ test_files:
 - 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/defaults_extractor/default_parameters_extractor_spec.rb
+- spec/unit/defaults_extractor/signature_extractor_spec.rb
 - spec/unit/error_spec.rb
 - spec/unit/errors/not_hash_spec.rb
 - spec/unit/errors/required_parameters_spec.rb
@@ -93,3 +100,4 @@ test_files:
 - spec/unit/named_method_spec.rb
 - spec/unit/named_method_transmuter_spec.rb
 - spec/unit/parameters_adapter_spec.rb
+has_rdoc: