expo 0.0.6 → 0.1.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjhiNzk1N2U5NjBiMzJhNGI1Y2Q4NzM1MDg0Y2QxOTJkY2E2MGU5ZA==
+  data.tar.gz: !binary |-
+    ZGY4YmZiOWRjYmQ4ZTgyZjc5N2M3Y2RiNDZlMTk1ODc0NGMzMWFjYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODliMjNhYTM1ZGUzYjA4NGFhODQ5NzU4ZDRhNzU1MDMyM2MxZjk1ZjlkN2E3
+    NjQzZDlhOTU1OTA3NTdiNmNmNDRmZjFmNDRkMWYzY2I1YjRlODcwMzRkODQ3
+    Yjg3ZjczMzcyZDMxYzc0MGQxMmIwZmU3YWExYTg3ODZmMzI3M2U=
+  data.tar.gz: !binary |-
+    NTdjYTk3OWU5OTkxYjAxYjZmOTAwMTE5NzE3MWFiNDFlNGFhNTZlNmEzYzg2
+    NDBiOTAxMGUxYzcyOWYwODMxZmViZmE0OTNlZmViZWUxMTAyMDIxZGMxNTY0
+    NDIyMGVjNGIzZGIwMjI2ZmE2MDBmYzAyYTQ1Y2ZhZjRiYWUzNmE=

data/lib/expo.rb

@@ -1,14 +1,18 @@
 class Expo
-  CALL_ORDER = [:summon, :aside, :expose, :sub_expo, :collection]
-  CALL_IMMEDIATELY = [:summon, :aside, :expose]
+  CALL_ORDER = [:aside, :expose, :sub_expo, :collection]
+  CALL_IMMEDIATELY = [:aside, :expose]
   CALL_LATER = [:sub_expo, :collection]
+  TRIVIAL_PRESENTER = Class.new do
+    def present(object)
+      object
+    end
+  end.new
 
   def initialize(presenter=nil, &block)
     @presenter = presenter
     @block = block
     @message_map = {}
     @subs = {}
-    @summons = {}
     @collections = {}
     @inner_calls = []
   end
@@ -19,19 +23,22 @@ class Expo
     end
     @object = object
     @context = context
+    @preso = Proxy.new(
+      (@presenter || TRIVIAL_PRESENTER).present(object),
+      object
+    )
     if !@block
       return {}
     end
-    block_return = self.instance_exec object, context, &@block
+    block_return = self.instance_exec @preso, context, &@block
     @inner_calls.sort_by{|call| CALL_ORDER.index(call[:method])}.each do |call|
       self.send(call[:method], *call[:args], &call[:block])
     end
     exposition = {}
     @message_map.each do |k,v|
-      receiver = (@presenter || object)
-      exposition[v] = receiver.send(k)
+      # puts "sending #{k}"
+      exposition[v] = @preso.send(k)
     end
-    exposition.merge!(@summons)
     exposition.merge!(@subs)
     exposition.merge!(@collections)
     if block_return
@@ -58,21 +65,23 @@ class Expo
     nil
   end
   def sub_expo_inner(object, sub_expo_passed, key)
+    recurse_expo = sub_expo_passed
     if sub_expo_passed == self
-      return
+      recurse_expo = Expo.new(@presenter, &@block)
     end
-    sub = sub_expo_passed.expo(object, @context)
+    sub = recurse_expo.expo(object, @context)
     @subs[key] = sub if sub
     nil
   end
 
   def collection_inner(key, collection, item_expo)
+    recurse_expo = item_expo
     if item_expo == self
-      return
+      recurse_expo = Expo.new(@presenter, &@block)
     end
     collection_exposition = []
     collection.each.with_index do |item, index|
-      collection_exposition << item_expo.expo(item, @context.merge({
+      collection_exposition << recurse_expo.expo(item, @context.merge({
         "#{key}_index".to_sym => index
       }))
     end
@@ -80,13 +89,8 @@ class Expo
     nil
   end
 
-  def summon_inner(*asides)
-    @summons = hasherize(asides) {|aside| @context[aside]}
-    nil
-  end
-
   def aside_inner(*messages)
-    receiver = (@presenter || @object)
+    receiver = @preso
     last = messages.pop
     if last.is_a?(Hash)
       last.each do |k,v|
@@ -117,4 +121,18 @@ class Expo
   def hasherize(array, &block)
     Hash[*array.map{|e| [e, block.call(e)] }.flatten]
   end
+
+  class Proxy
+    def initialize(*objects)
+      @objects = objects
+    end
+
+    def method_missing(method, *args, &block)
+      # puts "missing #{method}"
+      @objects.detect{|obj| obj.respond_to? method}.send(
+        method, *args, &block
+      )
+    end
+
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expo
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Serguei Filimonov
@@ -20,26 +19,25 @@ files:
 - lib/expo.rb
 homepage: https://github.com/sergueif/expo
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Expo of object presentations
 test_files: []