forwarder19 0.1.1 → 0.2.0.rc3

data/lib/forwarder/arguments.rb

@@ -1,3 +1,5 @@
+require 'forwarder/evaller'
+
 module Forwarder
   class Arguments
     attr_reader :args, :message, :target
@@ -34,6 +36,10 @@ module Forwarder
       @params[ :to_chain ]
     end
 
+    def complete_args *args
+      (self.args || []) + args
+    end
+
     def custom_target?
       @params[:to_object]
     end
@@ -42,8 +48,11 @@ module Forwarder
       !aop? && !custom_target? && !all? && !chain? && !args && !lambda?
     end
 
-    def complete_args *args
-      (self.args || []) + args
+    def evaluable?
+      !lambda? &&
+        !aop? &&
+        ( !args || args.all?{|a| Evaller.evaluable? a } ) &&
+        ( !custom_target? || Evaller.evaluable?( custom_target? ) )
     end
 
     def lambda default=nil
@@ -60,6 +69,10 @@ module Forwarder
       return unless custom_target?
       target == :self ? default : target
     end
+
+    def serialized_params
+      Evaller.serialize args
+    end
       
     def translation alternative=nil, &blk
       @params[ :as ].tap do | tltion |
@@ -74,6 +87,12 @@ module Forwarder
       @__aop_values__ ||= @params.values_at( :after, :before ).compact
     end
 
+    def check_for_incompatibilities!
+      raise ArgumentError, "cannot provide translations for forward_all" if @__all__ && translation
+      raise ArgumentError, "cannot provide arguments for forward_all" if @__all__ && args?
+
+    end
+
     def initialize *args, &blk
       @message = args.shift
       raise ArgumentError, "need one message and a hash of kwd params, plus an optional block" unless args.size == 1 && args.first.is_a?( Hash )
@@ -81,6 +100,7 @@ module Forwarder
       set_message
       set_target
       set_args blk
+      check_for_incompatibilities!
     end
 
     def set_args blk

data/lib/forwarder/compiler.rb

@@ -0,0 +1,45 @@
+require 'forwarder/evaller'
+module Forwarder
+  class Compiler
+    attr_reader :arguments
+
+    
+    def compile
+      # Cannot compile because of intrinsic uncompilable traits of arguments
+      # TODO: implement compilable inside arguments
+      return unless !arguments.lambda? && !arguments.aop? && !arguments.custom_target?
+      # Cannot compile because arguments cannot be compiled
+      @compiled_args = Evaller.serialize arguments.args
+      return unless @compiled_args
+      # Can compile :)))
+      return compile_to_all if arguments.message.is_a? Array
+      compile_one
+    end
+
+    private
+
+    def compile_to_all
+      arguments.message.map{ |msg|
+        "def #{msg} *args, &blk; #{arguments.target}.#{msg}( *args, &blk ) end"
+      }.join("\n")
+    end
+
+    def compile_one
+      tltion = arguments.translation arguments.message
+      "def #{arguments.message} *args, &blk; " +
+        "#{self.class.compile_target arguments.target}.#{tltion}( " +
+        @compiled_args +
+        "*args, &blk ) end"
+    end
+
+    def initialize args
+      @arguments = args 
+    end
+    
+    class << self
+      def compile_target target
+        [ target ].flatten.join( "." )
+      end
+    end
+  end # class Compiler
+end # module Forwarder

data/lib/forwarder/evaller.rb

@@ -0,0 +1,59 @@
+module Forwarder
+  module Evaller extend self
+
+    NotSerializable = Class.new RuntimeError
+
+    def evaluable? an_object, cache={}
+      !!_serialize_one( an_object, cache )
+    rescue NotSerializable
+      false
+    end
+
+    def serialize args
+      return "" if args.nil? || args.empty?
+      serialize_without_arg_suffix( args ).join(", ") + ", "
+    rescue NotSerializable
+      nil
+    end
+
+    def serialize_without_arg_suffix args, cache={}
+      args.map{ | arg |
+        _serialize_one arg, cache
+      }
+    end
+
+    private
+    def _serialize_hash hsh, cache
+      hsh.inject [] do | r, (k, v) |
+        k = _serialize_one k, cache
+        v = _serialize_one v, cache
+        r << "#{k} => #{v}"
+      end.join( ", ")
+    end
+
+    def _serialize_one arg, cache
+      case arg
+      when String
+        "'" + arg + "'"
+      when Symbol, Fixnum, NilClass, FalseClass, TrueClass
+        arg.inspect
+      else
+        _serialize_object arg, cache
+      end
+    end
+
+    def _serialize_object arg, cache
+      oid = arg.object_id
+      raise NotSerializable if cache[oid]
+      cache[oid]=true
+      case arg
+      when Array
+        ["[ ", serialize_without_arg_suffix( arg, cache ).join(", "), " ]"].join
+      when Hash
+        [ "{ ", _serialize_hash( arg, cache ), " }" ].join
+      else
+        raise NotSerializable
+      end
+    end
+  end # module Evaller
+end # module Forwarder

data/lib/forwarder/params.rb

@@ -1,14 +1,16 @@
 require 'forwarder/arguments'
+require 'forwarder/compiler'
 require 'forwarder/meta'
 module Forwarder
   class Params
     attr_reader :forwardee, :arguments
     def forward!
-      return if delegate
-      return if delegate_all
-      return if delegate_chain  
-      return if delegate_object
-      general_delegate
+      compiled = compile_forward
+      if compiled
+        forwardee.module_eval compiled, __FILE__, __LINE__
+      else
+        general_delegate
+      end
     end
 
     def prepare_forward *args, &blk
@@ -17,54 +19,76 @@ module Forwarder
     
     private
 
-    def delegate
-      return unless arguments.delegatable? 
-      delegate_to_forwardee
-      true
-    end
-
-    def delegate_all
-      return unless arguments.all?
-      delegate_all_to_forwardee
-      true
-    end
-
-    def delegate_all_to_forwardee
-      forwardee.extend Forwardable
-      forwardee.def_delegators( arguments.target, *arguments.message )
-    end
-
-
-    def delegate_chain
-      return unless arguments.chain?
-      delegate_to_chain
-      true
-    end
-
-    def delegate_to_chain
-      Meta.new( forwardee, arguments ).forward_chain
-    end
-
-    def delegate_object
-      return unless arguments.custom_target?
-      Meta.new( forwardee, arguments ).forward_object
-      true
-    end
-      
-    def delegate_to_forwardee
-      forwardee.extend Forwardable
-      arguments.translation do | tltion |
-        forwardee.def_delegator arguments.target, tltion, arguments.message
-      end or
-        forwardee.def_delegator arguments.target, arguments.message
+    def compile_forward
+      compiler = Compiler.new arguments
+      compiler.compile 
     end
 
+#     def delegate
+#       return unless arguments.delegatable? 
+#       delegate_to_forwardee
+#       true
+#     end
+# 
+#     def delegate_all
+#       return unless arguments.all?
+#       delegate_all_to_forwardee
+#       true
+#     end
+# 
+#     def delegate_all_to_forwardee
+#       arguments.message.each do | msg |
+#         forwardee.module_eval(
+#           "def #{msg} *args, &blk; #{arguments.target}.#{msg}( *args, &blk ) end",
+#           __FILE__,
+#           __LINE__
+#         )
+#       end
+#     end
+# 
+# 
+#     def delegate_chain
+#       return unless arguments.chain?
+#       delegate_to_chain
+#       true
+#     end
+# 
+#     def delegate_to_chain
+#       tltion = arguments.translation arguments.message
+#       forwardee.module_eval(
+#         "def #{arguments.message} *args, &blk; #{arguments.target.join(".")}.#{tltion}( *args, &blk ) end",
+#           __FILE__,
+#           __LINE__
+#       )
+#     end
+# 
+#     def delegate_object
+#       return unless arguments.custom_target?
+#       Meta.new( forwardee, arguments ).forward_object
+#       true
+#     end
+#       
+#     def delegate_to_forwardee
+#       tltion = arguments.translation arguments.message
+#       forwardee.module_eval(
+#         "def #{arguments.message} *args, &blk; #{arguments.target}.#{tltion}( #{arguments.serialized_params}*args, &blk ) end",
+#         __FILE__,
+#         __LINE__
+#       )
+#     end
+# 
     def initialize forwardee
       @forwardee = forwardee
     end
 
     def general_delegate
-      Meta.new( forwardee, arguments ).forward
+      if arguments.chain?
+        Meta.new( forwardee, arguments ).forward_chain
+      elsif arguments.custom_target?
+        Meta.new( forwardee, arguments ).forward_object
+      else
+        Meta.new( forwardee, arguments ).forward
+      end
     end
   end # class Params
 end # module Forwarder

data/lib/forwarder/version.rb

@@ -1,3 +1,3 @@
 module Forwarder
-  VERSION = '0.1.1'
+  VERSION = '0.2.0.rc3'
 end # module Forwarder

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: forwarder19
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0.rc3
+  prerelease: 6
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000Z
+date: 2012-04-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lab419_core
-  requirement: &83003930 !ruby/object:Gem::Requirement
+  requirement: &7941200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *83003930
+  version_requirements: *7941200
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &83003660 !ruby/object:Gem::Requirement
+  requirement: &7938300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.11'
   type: :development
   prerelease: false
-  version_requirements: *83003660
+  version_requirements: *7938300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &83003420 !ruby/object:Gem::Requirement
+  requirement: &7789180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *83003420
+  version_requirements: *7789180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83003190 !ruby/object:Gem::Requirement
+  requirement: &7124460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *83003190
+  version_requirements: *7124460
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &83002960 !ruby/object:Gem::Requirement
+  requirement: &7119940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *83002960
+  version_requirements: *7119940
 - !ruby/object:Gem::Dependency
   name: wirble
-  requirement: &83002730 !ruby/object:Gem::Requirement
+  requirement: &7118380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *83002730
+  version_requirements: *7118380
 description: ! 'Ruby''s core Forwardable gets the job done(barely) and produces most
   unreadable code. Furthermore it is about twice as slow (1.9.2-p290) or thrice as
   slow (1.9.3-p0) as it needs to be.
@@ -101,12 +101,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/forwarder.rb
+- lib/forwarder/evaller.rb
 - lib/forwarder/arguments.rb
-- lib/forwarder/meta.rb
-- lib/forwarder/params.rb
 - lib/forwarder/helpers.rb
 - lib/forwarder/version.rb
-- lib/forwarder.rb
+- lib/forwarder/params.rb
+- lib/forwarder/meta.rb
+- lib/forwarder/compiler.rb
 - LICENSE
 - README.md
 homepage: https://github.com/RobertDober/Forwarder19
@@ -125,12 +127,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Delegation And AOP Filters For It