expo 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f1986931d0e1f91a4827833cd0d353a042b3ac8
-  data.tar.gz: 51100ca3aa75dd72d7c74c953a525f01731f11f3
+  metadata.gz: 24572c0179b82dbc9aafb5bf8456a9c3668c8d54
+  data.tar.gz: d3de7785f3bf3ec7cb6b77e5038ede6f8a24b2b2
 SHA512:
-  metadata.gz: 7563815ae9e21f700fa88e1d906f1c18051e5097e74c4ffaf28a24f913673900146bf8d7b0263d08d15ce00d0cb4c8a33d8e48cb03e7d35fdfc903b72362ebde
-  data.tar.gz: 797d477836805ab0e553a872ee24ff8eb40e95df4ee3f4308fcc88d4b1b46a83b873d9667232d34f03fe8f8ae754920495f3522aa1185a20e87d3bbd2e47c5de
+  metadata.gz: 5c85a08f6e60eefd9a5ff061d6f9cdc1c2c92b436693c44c596a126c335ecc7c97f95f0737d63932badf009b8b5967d2cb456b67b89ac3ed2f47c132cad41c24
+  data.tar.gz: 9fdf0f2cd49cb39e3f96be3668b307b465245effeb852b008324c1857592d3f689cd02d465efd74c15b7a2017574b02fac30dedced06fc108fc006947dc7d491

data/lib/expo2.rb

@@ -94,7 +94,23 @@ class Expo2
     end
   end
 
-      #presenters << SubCollection.new(associator, key, sub_expo, block)
+  class MergeExpo < Struct.new(:presenter, :sub_expo, :block)
+    def go(object, context, index=nil, user_expo)
+      assoc = self.presenter
+      associated = if assoc.respond_to?(:new)
+        assoc.new(object)
+      else
+        assoc.call(object)
+      end
+      sub = Expo2.new(self.sub_expo, &self.block)
+      if associated
+        sub.expo(associated, context)
+      else
+        {}
+      end
+    end
+  end
+
   class SubCollection < Struct.new(:associator, :key, :sub_expo, :block)
     def go(object, context, index=nil)
       assoc = self.associator
@@ -144,6 +160,10 @@ class Expo2
     presenters << Merger.new(block)
   end
 
+  def merge_expo(pres, sub_expo, &block)
+    presenters << MergeExpo.new(pres, sub_expo, block)
+  end
+
   def sub_expo(pres, key, sub_expo, &block)
     presenters << SubExpo.new(pres, key, sub_expo, block)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expo
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Serguei Filimonov