loverload 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjRlMDExM2QwMGU4ZmQwMmY4NjQ5OGViMGQzNWIyNzNhMDllOTE1ZA==
+  data.tar.gz: !binary |-
+    YmRhMzc2YmU3OGU0Mzg1YjM4MjkzYWJjMmM4OTkwMzQ1OGY3OGJjOA==
+SHA512:
+  metadata.gz: !binary |-
+    MTc1MzRjZTIxM2VhYTY0MTFhMGIwNjM5ZmMyMWMyY2M0ZDNiNDZkNWM2MjNh
+    ODcwMTZjMWJkOGI5ODk3ZGZlMGU3MWNhNTNlMjBkYzA0ZDBmMDZlMjIwN2Jj
+    ODUwMjRhMTQyYjkyZGM0YmUzODAxOWU0ODFmYThjODlmZDY5MTI=
+  data.tar.gz: !binary |-
+    MjAwNGQzMjhkYWI0MWFmMDQzMmZjNWJlNzI3NWI0MzlmNWI0MTlmNjdmYTBk
+    ZmQ5N2IwMzRmOWU5NjgzZjBhZGMyNmE0ZTNmMWIyMjE2NGNhMjRjZDdlOGUz
+    YjUyOGE0NGQ4ZTQ5OTY4NDlhNGI0ZGJkZmNmYjE1MjRmNjNmNDE=

data/lib/loverload/block.rb

@@ -0,0 +1,11 @@
+module Loverload
+  class Block
+
+    attr_reader :block
+
+    def initialize(&block)
+      @block = block.to_proc
+    end
+
+  end
+end

data/lib/loverload/method.rb

@@ -2,28 +2,38 @@ module Loverload
   class Method
     def initialize klass, method_name, &with_params_block
       @klass, @method_name = klass, method_name
-      @klass.instance_variable_set :@__dictionary__, {} unless
-        @klass.instance_variable_defined? :@__dictionary__
+
+      dictionary || @klass.instance_variable_set(:@__dictionary__, {})
 
       instance_eval(&with_params_block)
     end
 
     def with_params *pars, &block
-      dictionary[method_signature(block.arity, *pars)] = block
+      arg_count = block.arity
+      arg_count += 1 if pars.last == ::Loverload::Block
+      dictionary[method_signature(arg_count, *pars)] = block
     end
 
-    def overload instance, *args
-      instance.instance_exec *args, &find(*args)
+    def overload instance, *args, &block
+      if block_given?
+        args << Block.new(&block)
+        found = find(*args)
+        instance.instance_exec *args do |*args|
+          found.call(*args, &(args.pop.block))
+        end
+      else
+        instance.instance_exec *args, &find(*args)
+      end
     end
 
     private
-      def find *args
+      def find(*args)
         dictionary.find do |signature, _|
           match? signature, method_signature(args.size, *args)
         end.tap{ |arr| raise NoMethodError unless arr }.last
       end
 
-      def match? signature, args
+      def match?(signature, args)
         signature.zip(args).all? do |type, arg|
           type === arg
         end
@@ -33,7 +43,7 @@ module Loverload
         @klass.instance_variable_get(:@__dictionary__)
       end
 
-      def method_signature size, *meta
+      def method_signature(size, *meta)
         [*@method_name, size, *meta]
       end
   end

data/lib/loverload/version.rb

@@ -1,3 +1,3 @@
 module Loverload
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/loverload.rb

@@ -1,4 +1,5 @@
 require "loverload/version"
+require "loverload/block"
 require "loverload/method"
 
 module Loverload
@@ -9,18 +10,18 @@ module Loverload
   end
 
   module ClassMethods
-    def def_overload method_name_or_class, method_name = NULL, &with_params_block
+    def def_overload(method_name_or_class, method_name = NULL, &with_params_block)
       if method_name_or_class.is_a?(Class) && method_name != NULL
         method = Method.new(method_name_or_class, method_name, &with_params_block)
 
-        define_singleton_method method_name do |*args|
-          method.overload(method_name_or_class, *args)
+        define_singleton_method method_name do |*args, &block|
+          method.overload(method_name_or_class, *args, &block)
         end
       else
         method = Method.new(self, method_name_or_class, &with_params_block)
 
-        define_method method_name_or_class do |*args|
-          method.overload(self, *args)
+        define_method method_name_or_class do |*args, &block|
+          method.overload(self, *args, &block)
         end
       end
     end

data/spec/loverload/loverload_spec.rb

@@ -246,6 +246,28 @@ describe Loverload do
     dummy.hello(2).should eql 'Two'
   end
 
+  it "supports blocks" do
+    class Dummy
+      include Loverload
+
+      def_overload :hello do
+        with_params String do |s|
+          "Arg 1: #{s}. No block."
+        end
+
+        with_params String, Block do |s, &block|
+          "Arg 1: #{s}. Block present; results in: #{block.yield}."
+        end
+      end
+    end
+
+    dummy = Dummy.new
+    dummy.hello('str1').should eql 'Arg 1: str1. No block.'
+    dummy.hello 'str2' do
+      'str3' 
+    end.should eql 'Arg 1: str2. Block present; results in: str3.'
+  end
+
   it "works with inheritance" do
     class Dummy
       include Loverload
@@ -348,4 +370,30 @@ describe Loverload do
     dummy = Dummy.new
     [*0..10].map(&dummy.method(:fibonnaci)).should eql [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55]
   end
+
+  it "can pass lambda and yielded" do
+    class Dummy
+      include Loverload
+
+      def_overload :pass_block do
+        with_params Proc do |blok|
+          blok.call
+        end
+
+        with_params String, Proc do |append_me, blok|
+          blok.call(append_me)
+        end
+      end
+    end
+
+    dummy = Dummy.new
+
+    expect{ dummy.pass_block('Hello from lambda') }.to raise_error
+
+    dummy.pass_block(lambda{ 'Hello from lambda' }).should eql 'Hello from lambda'
+    dummy.pass_block(->{ 'Hello from lambda' }).should eql 'Hello from lambda'
+    dummy.pass_block( Proc.new{ 'Hello from lambda' }).should eql 'Hello from lambda'
+
+    dummy.pass_block('Append me', lambda{ |s| "#{ s } and Hello from lambda" }).should eql 'Append me and Hello from lambda'
+  end
 end

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: loverload
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Teja Sophista V.R.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: bundler
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rake
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rspec
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: debugger
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 description: DSL for building method overloading in Ruby more magical
 email:
 - tejanium@yahoo.com
@@ -88,6 +79,7 @@ files:
 - README.md
 - Rakefile
 - lib/loverload.rb
+- lib/loverload/block.rb
 - lib/loverload/method.rb
 - lib/loverload/version.rb
 - loverload.gemspec
@@ -95,6 +87,7 @@ files:
 homepage: http://github.com/tejanium/loverload
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -103,25 +96,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2984216650687558397
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2984216650687558397
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DSL for building method overloading in Ruby
 test_files:
 - spec/loverload/loverload_spec.rb