invokr 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f009f090d42fffdb02fe1cd916b919a28293514
-  data.tar.gz: 782395ed64c4c75428814b1c19c0745a99395b1e
+  metadata.gz: 808ea736022fc954541d33ff6329fa5f08d97cba
+  data.tar.gz: 51e16c3ffd417e064e5012ae2a706d85641bf69c
 SHA512:
-  metadata.gz: 89edb83a6244b666ecff82383ff770aa4620f2db555f7a94ce835b79f657ab63402628a3cfe48a208e05ed2d1d3b237e15412181e783403ef36e5f0303971a22
-  data.tar.gz: a130fa4abcf671a293cd6bb46f43aaf7512a9638b826b1afb2156107ac57f11983fe6d1d5dea0fe6612757630a0df46d3669f1ae9f9eeff5d4506a81a8bae7bb
+  metadata.gz: 401bd351f434a91efa23ec097abed40ef186b2cbeb5b80dd294cfef9fe5d78a6283c0ddc864225199256a5d860c2bdc82c03445ec794147c4a2f9576571ab459
+  data.tar.gz: 62d71c2fd5e803f80dcfb5abfc6238b7ac28b44c5d5e5538f0fd331dacdfee84bf0608bad17c5f8ca80e9631a0115a7e6b8e7eb065dadcf7f7e6d8016031c75c

data/lib/invokr/builder.rb

@@ -64,6 +64,11 @@ module Invokr
       @keyword_args[identifier] = injector[identifier]
     end
 
+    def handle_rest_arg identifier
+      raise UnsupportedArgumentsError.new(self, [identifier])
+    end
+    alias_method :handle_keyrest_arg, :handle_rest_arg
+
     def handle_block_arg identifier
       if injector.has_key? identifier and @implicit_block
         unused_args << identifier and return

data/lib/invokr/dependency_injection.rb

@@ -9,9 +9,8 @@ module Invokr
 
     Injector = Struct.new :resolver, :klass do
       def inject
-        invocation = Builder.build initializer, self, nil
-        invocation.method = :new
-        invocation.invoke! klass
+        method = Invokr.query_method klass.instance_method :initialize
+        method.invoke method: :new, with: self
       end
 
       def keys

data/lib/invokr/errors.rb

@@ -49,6 +49,12 @@ module Invokr
     end
   end
 
+  class UnsupportedArgumentsError < BadArgumentsError
+    def message
+      %(unsupported splat argument(s) #{formatted_args} when invoking method `#{builder.method.name}' on #{builder.method.owner.inspect})
+    end
+  end
+
   class OptionalPositionalArgumentError < StandardError
     attr :message
 

data/lib/invokr/method.rb

@@ -1,38 +1,50 @@
-Method = Struct.new :method do
-  def invoke receiver = method.owner, hsh_args
-    unless receiver == method.owner or receiver.kind_of? method.owner
-      raise TypeError, "no implicit conversion of #{receiver.class} into #{method.owner.name}"
+module Invokr
+  Method = Struct.new :method do
+    def invoke args = {}
+      receiver, method_name, hsh_args = extract_args! args
+      unless receiver == method.owner or receiver.kind_of? method.owner
+        raise TypeError, "no implicit conversion of #{receiver.class} into #{method.owner.name}"
+      end
+      invocation = Builder.build method, hsh_args, args[:block]
+      invocation.method = method_name unless method_name == method.name
+      invocation.invoke! receiver
     end
-    Invokr.invoke method: method.name, on: receiver, with: hsh_args
-  end
 
-  def trim_args hsh_args
-    hsh_args.select { |key, _| dependencies.include? key }
-  end
+    def trim_args hsh_args
+      hsh_args.select { |key, _| dependencies.include? key }
+    end
 
-  def dependencies
-    map_identifiers parameters
-  end
+    def dependencies
+      map_identifiers parameters
+    end
 
-  def optional_dependencies
-    map_identifiers select_parameters_by_type [:opt, :key]
-  end
+    def optional_dependencies
+      map_identifiers select_parameters_by_type [:opt, :key]
+    end
 
-  def required_dependencies
-    map_identifiers select_parameters_by_type [:req, :keyreq]
-  end
+    def required_dependencies
+      map_identifiers select_parameters_by_type [:req, :keyreq]
+    end
 
-  def parameters
-    method.parameters
-  end
+    def parameters
+      method.parameters
+    end
 
-  private
+    private
 
-  def select_parameters_by_type types
-    parameters.select do |type, _| types.include? type end
-  end
+    def extract_args! args
+      receiver = args.fetch :receiver do method.owner end
+      method_name = args.fetch :method do method.name end
+      with = args.fetch :with
+      [receiver, method_name, with]
+    end
+
+    def select_parameters_by_type types
+      parameters.select do |type, _| types.include? type end
+    end
 
-  def map_identifiers parameters
-    parameters.map do |_, identifier| identifier end
+    def map_identifiers parameters
+      parameters.map do |_, identifier| identifier end
+    end
   end
 end

data/lib/invokr/version.rb

@@ -1,3 +1,3 @@
 module Invokr
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/keyword_args_test.rb

@@ -29,6 +29,21 @@ module KeywordArgsTest
 
       assert_equal [:album], method.optional_dependencies
     end
+
+    def test_passing_in_splat_raises_error
+      error = assert_raises Invokr::UnsupportedArgumentsError do
+        Invokr.invoke(
+          method: :keyword_splat_argument,
+          on:     TestMethodBank,
+          with:   { guitarist: 'trey' },
+        )
+      end
+
+      assert_equal(
+        "unsupported splat argument(s) `rest' when invoking method `keyword_splat_argument' on #<TestMethodBank:0xdeadbeef>",
+        error.message,
+      )
+    end
   end
 
   class RequiredKeywordArgsTest < Minitest::Test

data/test/query_test.rb

@@ -17,23 +17,31 @@ class QueryTest < Minitest::Test
   end
 
   def test_invoking_singleton_from_query_object
-    assert_equal ['junta', 'trey'], @method.invoke(album: 'junta')
+    assert_equal ['junta', 'trey'], @method.invoke(with: { album: 'junta' })
   end
 
   def test_invoking_instance_from_query_object
     test_klass = define_test_klass
     method = Invokr.query_method test_klass.instance_method :upcase
 
-    val = method.invoke test_klass.new, dep: 'phIsh'
+    val = method.invoke receiver: test_klass.new, with: { dep: 'phIsh' }
     assert_equal "PHISH", val
   end
 
+  def test_invoking_alternate_method
+    test_klass = define_test_klass
+    method = Invokr.query_method test_klass.instance_method :upcase
+
+    val = method.invoke receiver: test_klass.new, method: :downcase, with: { dep: 'PHiSH' }
+    assert_equal "phish", val
+  end
+
   def test_cannot_invoke_instance_not_type_other_than_method_owner
     test_klass = define_test_klass
     method = Invokr.query_method test_klass.instance_method :upcase
 
     error = assert_raises TypeError do
-      method.invoke Array.new, dep: 'phIsh'
+      method.invoke receiver: Array.new, with: { dep: 'phIsh' }
     end
 
     assert_equal 'no implicit conversion of Array into TestKlass', error.message
@@ -55,6 +63,10 @@ class QueryTest < Minitest::Test
       def upcase dep
         dep.upcase
       end
+
+      def downcase dep
+        dep.downcase
+      end
     end
   end
 end

data/test/rest_args_test.rb

@@ -0,0 +1,16 @@
+class RestArgsTest < Minitest::Test
+  def test_passing_in_splat
+    error = assert_raises Invokr::UnsupportedArgumentsError do
+      Invokr.invoke(
+        method: :splat_argument,
+        on:     TestMethodBank,
+        with:   { guitarist: 'trey' },
+      )
+    end
+
+    assert_equal(
+      "unsupported splat argument(s) `rest' when invoking method `splat_argument' on #<TestMethodBank:0xdeadbeef>",
+      error.message,
+    )
+  end
+end

data/test/test_helper.rb

@@ -33,6 +33,10 @@ module TestMethodBank
     [album, guitarist]
   end
 
+  def splat_argument album = 'junta', *rest
+    [album, *rest]
+  end
+
   def just_yields
     yield
   end
@@ -46,6 +50,10 @@ module TestMethodBank
       def optional_keyword_argument album: 'pitcher_of_nectar'
         album
       end
+
+      def keyword_splat_argument album: 'pitcher_of_nectar', **rest
+        [album, **rest]
+      end
     RB
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invokr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - ntl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,7 @@ files:
 - test/optional_args_test.rb
 - test/query_test.rb
 - test/required_args_test.rb
+- test/rest_args_test.rb
 - test/test_helper.rb
 homepage: https://github.com/ntl/invokr
 licenses:
@@ -128,4 +129,5 @@ test_files:
 - test/optional_args_test.rb
 - test/query_test.rb
 - test/required_args_test.rb
+- test/rest_args_test.rb
 - test/test_helper.rb