forwardablex 0.1.3 → 0.1.4

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-19mode
+script: rake test

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in forwardablex.gemspec
 gemspec
+
+gem 'simplecov', :require => false, :group => :test
+gem 'coveralls', :require => false, :group => :test

data/HISTORY.md

@@ -1,5 +1,9 @@
 # History of ForwardableX
 
+## 0.1.4
+
+* Added receiver keyword :identity.
+
 ## 0.1.3
 
 * Added forward_as_key and forward_as_key! that forward key to receiver.

data/README.md

@@ -2,6 +2,8 @@
 
 ForwardableX is a Ruby library to extend forwardable.rb.
 
+[![Gem Version](https://badge.fury.io/rb/forwardablex.png)](http://badge.fury.io/rb/forwardablex) [![Build Status](https://travis-ci.org/keita/forwardablex.png?branch=master)](https://travis-ci.org/keita/forwardablex) [![Coverage Status](https://coveralls.io/repos/keita/forwardablex/badge.png?branch=master)](https://coveralls.io/r/keita/forwardablex) [![Code Climate](https://codeclimate.com/github/keita/forwardablex.png)](https://codeclimate.com/github/keita/forwardablex)
+
 ## Installation
 
     gem install forwardablex
@@ -43,7 +45,6 @@ Forwarder.new.m #=> "forwarded"
 ### Class Method Accessor
 
 ```ruby
-Receiver = Struct(:name)
 class Forwarder
   class << self
     def m
@@ -65,9 +66,22 @@ class Forwarder
     @table = {:key => "forwarded"}
   end
 end
-Forwarder.new.key # => "forwarded"
+Forwarder.new.key #=> "forwarded"
 ```
 
+### Identity
+
+```ruby
+class Forwarder
+  foward :identity, :self
+end
+Forwarder.new {|x| x == x.self} #=> true
+```
+
+## Documentation
+
+- [API Documentation](http://rubydoc.info/gems/forwardablex)
+
 ## Licence
 
 ForwardableX is free software distributed under MIT licence.

data/Rakefile

@@ -14,3 +14,5 @@ desc 'Show undocumented function list'
 task 'html:undoc' do
   sh "bundle exec yard stats --list-undoc --no-api --compact"
 end
+
+task :default => :test

data/forwardablex.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "bacon"
-  gem.add_development_dependency "yard", "~> 0.8.5"
-  gem.add_development_dependency "redcarpet"
+  gem.add_development_dependency "yard"
+  gem.add_development_dependency "redcarpet" unless RUBY_PLATFORM == 'java'
 end

data/lib/forwardablex.rb

@@ -57,21 +57,15 @@ module ForwardableX
     context.instance_eval do
       case receiver
       when :class
-        define_method(name) do |*args, &b|
-          self.class.__send__(method, *args, &b)
-        end
+        forward_class_receiver(method, name)
+      when :identity
+        forward_identity_receiver(name)
       when Symbol, String
-        define_method(name) do |*args, &b|
-          instance_variable_get(receiver).__send__(method, *args, &b)
-        end
+        forward_named_receiver(receiver, method, name)
       when Proc
-        define_method(name) do |*args, &b|
-          instance_eval(&receiver).__send__(method, *args, &b)
-        end
+        forward_proc_receiver(receiver, method, name)
       else
-        define_method(name) do |*args, &b|
-          receiver.__send__(method, *args, &b)
-        end
+        forward_object_receiver(receiver, method, name)
       end
     end
   end
@@ -122,21 +116,15 @@ module ForwardableX
     context.instance_eval do
       case receiver
       when :class
-        define_method(name) do |*args, &b|
-          self.class.__send__(:[], key, *args, &b)
-        end
+        forward_class_receiver(:[], name, key)
+      when :identity
+        forward_identity_receiver(name)
       when Symbol, String
-        define_method(name) do |*args, &b|
-          instance_variable_get(receiver).__send__(:[], key, *args, &b)
-        end
+        forward_named_receiver(receiver, :[], name, key)
       when Proc
-        define_method(name) do |*args, &b|
-          instance_eval(&receiver).__send__(:[], key, *args, &b)
-        end
+        forward_proc_receiver(receiver, :[], name, key)
       else
-        define_method(name) do |*args, &b|
-          receiver.__send__(:[], key, *args, &b)
-        end
+        forward_object_receiver(receiver, :[], name, key)
       end
     end
   end
@@ -151,6 +139,85 @@ module ForwardableX
   def forward_as_key!(receiver, *keys)
     keys.each {|key| forward_as_key(receiver, key)}
   end
+
+  private
+
+  # Forward the name to class receiver.
+  #
+  # @param method [Symbol]
+  #   method name of the class
+  # @param name [Symbol]
+  #   forwarder method name
+  # @param _args [Array<Object>]
+  #   additional arguments
+  # @return [void]
+  def forward_class_receiver(method, name, *_args)
+    define_method(name) do |*args, &b|
+      self.class.__send__(method, *_args, *args, &b)
+    end
+  end
+
+  # Forward the name to the named receiver.
+  #
+  # @param receiver [Symbol]
+  #   receiver's name
+  # @param method [Symbol]
+  #   method name of the receiver
+  # @param name [Symbol]
+  #   forwarder method name
+  # @param _args [Array<Object>]
+  #   additional arguments
+  # @return [void]
+  def forward_named_receiver(receiver, method, name, *_args)
+    define_method(name) do |*args, &b|
+      instance_variable_get(receiver).__send__(method, *_args, *args, &b)
+    end
+  end
+
+  # Forward the name to the Proc result.
+  #
+  # @param proc [Proc]
+  #   Proc object that generate the receiver
+  # @param method [Symbol]
+  #   method name of the proc result
+  # @param name [Symbol]
+  #   forwarder method name
+  # @param _args [Array<Object>]
+  #   additional arguments
+  # @return [void]
+  def forward_proc_receiver(proc, method, name, *_args)
+    define_method(name) do |*args, &b|
+      instance_eval(&proc).__send__(method, *_args, *args, &b)
+    end
+  end
+
+  # Forward the name to the identity function.
+  #
+  # @param name [Symbol]
+  #   forwarder method name
+  # @return [void]
+  def forward_identity_receiver(name)
+    define_method(name) do |*args, &b|
+      self
+    end
+  end
+
+  # Forward the name to the object.
+  #
+  # @param receiver [Object]
+  #   receiver object
+  # @param method [Symbol]
+  #   method name of the object
+  # @param name [Symbol]
+  #   forwarder method name
+  # @param _args [Array<Object>]
+  #   additional arguments
+  # @return [void]
+  def forward_object_receiver(receiver, method, name, *_args)
+    define_method(name) do |*args, &b|
+      receiver.__send__(method, *args, &b)
+    end
+  end
 end
 
 # @api private

data/lib/forwardablex/version.rb

@@ -1,4 +1,4 @@
 module ForwardableX
   # version of ForwardableX
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/spec_forwardablex.rb

@@ -1,3 +1,12 @@
+require 'simplecov'
+require 'coveralls'
+Coveralls.wear!
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start {add_filter 'test'}
+
 require 'forwardable'
 require 'forwardablex'
 
@@ -109,12 +118,30 @@ class KeyForwarder
   forward_as_key :@table, :a
   forward_as_key :@table, :a, :b
   forward_as_key! :@table, :c, :d, :e
+  forward_as_key :class, :f
+  forward_as_key Proc.new{@table}, :g
+  forward_as_key Receiver.new, :h
+
+  class << self
+    def [](key)
+      {f: 1}[key]
+    end
+  end
 
   def initialize(table={})
     @table = table
   end
 end
 
+class IdentityForwarder
+  forward :identity, :a
+  forward :identity, :a, :b
+  forward! :identity, :c, :d, :e
+  forward_as_key :identity, :f
+  forward_as_key :identity, :f, :g
+  forward_as_key! :identity, :h, :i, :j
+end
+
 describe 'ForwardableX' do
   [ XForwarder.new,
     DefDelegatorForwarder.new,
@@ -150,12 +177,29 @@ describe 'ForwardableX' do
   end
 
   it 'should forward to the table as key' do
-    KeyForwarder.new(a: 1, b: 2, c: 3, d: 4, e: 5).tap do |obj|
+    KeyForwarder.new(a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8).tap do |obj|
       obj.a.should == 1
       obj.b.should == 1
       obj.c.should == 3
       obj.d.should == 4
       obj.e.should == 5
+      obj.f.should == 1
+      obj.g.should == 7
+      obj.h.should == :[]
     end
   end
+
+  it 'should forward to identity' do
+    forwarder = IdentityForwarder.new
+    forwarder.a.should == forwarder
+    forwarder.b.should == forwarder
+    forwarder.c.should == forwarder
+    forwarder.d.should == forwarder
+    forwarder.e.should == forwarder
+    forwarder.f.should == forwarder
+    forwarder.g.should == forwarder
+    forwarder.h.should == forwarder
+    forwarder.i.should == forwarder
+    forwarder.j.should == forwarder
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forwardablex
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -32,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - HISTORY.md
 - LICENSE.txt
@@ -96,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Forwardable extension