expo 0.2.4 → 0.2.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWEwMDY2NzQyNTJkYTE5OGE3NzU3OWJmYjM0YmM1YmQ4OGFjZDgwZA==
+  data.tar.gz: !binary |-
+    YWQ1ZWEyNGMyNGRkNWJiZmViMjc3ZmNmM2JjZDcxOGEyZTM5ZmRiYw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDMwM2ZmMWM3N2U0OTExNzYwNTgzZjBmZmIzZGI1NGEyMGQ1MWNjYWM3NjUw
+    NmU5MjQzOGZhNmYzMDA2ZTA1YmM4MTBkMGNkNThjNTc5YTI0MGQ3ZWRmMzE3
+    YjBhYjI3NzM1ODE2ZjFkMzlmNDgzYzdhNDBkYzQ2ZTc1ODZlNTE=
+  data.tar.gz: !binary |-
+    OTE2YjU3YmQxNGJhNDA1YjgwNTRjNGY1Y2YyZmFmMTNjYTgyYWFkZDA1Mjc2
+    ZDAzMDY4YzU1Y2FiOGU2NjQ2NjZjYWNkMjlmY2Y3M2JmZmJkZmYzZTU4NzMx
+    NDc3YTM0NmU1ZDhlMjYzZWRiZmQ5ZTIzYzllYWE1NGQ5NWVmZWQ=

data/lib/expo.rb

@@ -1,7 +1,5 @@
 class Expo
   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
@@ -15,6 +13,7 @@ class Expo
     @subs = {}
     @collections = {}
     @inner_calls = []
+    @id = self.object_id
   end
 
   def expo_collection(objects, context={})
@@ -23,7 +22,15 @@ class Expo
     end
   end
 
+  def reset
+    @message_map = {}
+    @subs = {}
+    @collections = {}
+    @inner_calls = []
+  end
+
   def expo(object, context={})
+
     @object = object
     @context = context
     if object.nil?
@@ -37,16 +44,16 @@ class Expo
       return {}
     end
     block_return = self.instance_exec @object, context, &@block
-    @inner_calls.sort_by{|call| CALL_ORDER.index(call[:method])}.each do |call|
+    @inner_calls.each do |call|
       self.send(call[:method], *call[:args], &call[:block])
     end
     exposition = {}
     @message_map.each do |k,v|
-      # puts "sending #{k}"
       exposition[v] = @preso.send(k)
     end
     exposition.merge!(@subs)
     exposition.merge!(@collections)
+    self.reset
     if block_return
       exposition.merge(block_return)
     else
@@ -56,25 +63,38 @@ class Expo
 
   private
 
-  def method_missing(meth, *args, &block)
-    if CALL_IMMEDIATELY.include? meth
-      self.send("#{meth}_inner".to_sym, *args, &block)
-    end
-    if CALL_LATER.include? meth
-      @inner_calls << {
-        method: "#{meth}_inner".to_sym,
-        args: args,
-        block: block
-      }
-    end
+  def sub_expo(object, sub_expo_passed, key)
+    @inner_calls << {
+      method: :sub_expo_inner,
+      args: [object, sub_expo_passed, key],
+      block: nil
+    }
+    nil
+  end
 
+  def collection(key, collection, item_expo)
+    @inner_calls << {
+      method: :collection_inner,
+      args: [key, collection, item_expo],
+      block: nil
+    }
     nil
   end
 
+  def set_id(id)
+    @id = id
+    self
+  end
+
+  def get_id
+    @id
+  end
+
   def sub_expo_inner(object, sub_expo_passed, key)
     recurse_expo = sub_expo_passed
-    if sub_expo_passed == self
-      recurse_expo = Expo.new(@presenter, &@block)
+    sub_id = sub_expo_passed.send(:get_id)
+    if sub_id == @id
+      recurse_expo = Expo.new(@presenter, &@block).send(:set_id, @id)
     end
     sub = recurse_expo.expo(object, @context)
     @subs[key] = sub if sub
@@ -83,8 +103,13 @@ class Expo
 
   def collection_inner(key, collection, item_expo)
     recurse_expo = item_expo
-    if item_expo == self
-      recurse_expo = Expo.new(@presenter, &@block)
+    sub_id = item_expo.send(:get_id)
+    if sub_id == @id
+      recurse_expo = Expo.new(@presenter, &@block).send(:set_id, @id)
+    end
+    if !collection
+      @collections[key] = nil
+      return nil
     end
     collection_exposition = []
     collection.each.with_index do |item, index|
@@ -96,7 +121,7 @@ class Expo
     nil
   end
 
-  def aside_inner(*messages)
+  def aside(*messages)
     receiver = @preso
     last = messages.pop
     if last.is_a?(Hash)
@@ -112,7 +137,7 @@ class Expo
     nil
   end
 
-  def expose_inner(*messages)
+  def expose(*messages)
     last = messages.pop
     if last.is_a?(Hash)
       @message_map.merge!(last)
@@ -135,7 +160,6 @@ class Expo
     end
 
     def method_missing(method, *args, &block)
-      # puts "missing #{method}"
       @objects.detect{|obj| obj.respond_to? method}.send(
         method, *args, &block
       )

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expo
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.2.5
 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: []