expo 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: e2adac9afd2f867a5dcddbb99894e152751ee5dd
-  data.tar.gz: 2bea473e524ac3731807e9f2a72e81f9c9ca0ee8
-SHA512:
-  metadata.gz: b14918533eaa177485f8b8cca4f4d9970ed8986efcd7c38811c4eb70dbb439f0ae12546a3cc7f76fb91d5d83ba3e6de7bdf095153cfc000319e9889d994f59c5
-  data.tar.gz: 715722146c1d048d62cc0165a9b82876f6d8e0908365e55e1eba736c1c980dfc06833952b8a1b38bd5cc90c3f7e3db2ae3a62b0c256ae0077f47459314a56a2b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2YxMTQyZjdiMDc3ZDk2M2U3MmJmZWY0OWQwYjBlNWZiZjI0ZTI3OQ==
+  data.tar.gz: !binary |-
+    MTc5ZTRkOGRkMTA4N2ZjOGNiMTZlYTY3NjYwYWJhYjhkNTVlMWFjZA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODZhMTA4NzA3MDc0ZTdiMDkyNGRiMzIyZTM1YjM4NzY3MWFkZmViYTAzMGVi
+    MjJlZjVmNjJhMzFhN2UyNTFmNjU0YTRhZDg0MTRiZmU3ZDU5ODM5OGE5YmY1
+    MzZiYTAwZTczN2ZlYzQzODQ0ZGJkZTMzNTg3YmM3OGE5ZDU4OTk=
+  data.tar.gz: !binary |-
+    NGNiNzNjMTRiMjZiYjNhYzNlNjliNjNjMzNjZmZjMTk5N2Y4MTQyZjY0YTVh
+    MjE3MjliYjljNjNlNmM5YTBhMjc1YTIzYTVlMmM3M2JkZDE1YTE5OGIzYWJk
+    NTk0MTIyNjk0NzkyY2ZkNTUzNWYzNTIzNjIzOThiNzI2MTZlNGY=

data/lib/expo2.rb

@@ -1,25 +1,21 @@
 class Expo2
   def initialize(prototype=nil, &block)
     @block = block
-    # @built = false
-    @prototype = prototype
+    @prototype = prototype || NULL_EXPO
+    @presenters ||= []
+    self.instance_exec &@block if @block
   end
 
-  def prototype_presenters(object)
-    Array(@prototype && @prototype.go_presenters(object))
+  def inspect
+    "<Expo2:#{self.object_id}, @prototype=#{@prototype.inspect}, @presenters=#{@presenters.map(&:inspect)}>"
   end
 
-  def go_presenters(object)
-    self.instance_exec &@block if @block && !@built
-    # @built = true
-    @cache ||= (prototype_presenters(object) + presenters)
-  end
 
   def expo(object, context={}, index=nil)
     return nil if object.nil?
-    preso = {}
-    go_presenters(object).each do |pres|
-      preso.merge!(pres.go(object, context, index))
+    preso = @prototype.expo(object, context, index)
+    @presenters.each do |pres|
+      preso = deep_merge(preso, pres.go(object, context, index))
     end
     preso
   end
@@ -37,21 +33,25 @@ class Expo2
       end
       preso
     end
+
+    def inspect
+      "<Expo2::Pres>"
+    end
   end
 
   class Asider < Struct.new(:presenter, :key_map)
     def go(object, context, index=nil)
       preso = {}
-      perspective = if self.presenter
-        self.presenter.to_proc.call(object)
-      else
-        object
-      end
+      perspective = self.presenter.to_proc.call(object)
       self.key_map.each do |k,v|
         context[v] = perspective.send(k)
       end
       {}
     end
+
+    def inspect
+      "<Expo2::Asider>"
+    end
   end
 
   class Exposer < Struct.new(:key_map)
@@ -62,23 +62,23 @@ class Expo2
       end
       preso
     end
+
+    def inspect
+      "<Expo2::Exposer>"
+    end
   end
 
   class Merger < Struct.new(:block)
     def go(object, context, index=nil)
       self.block.call(context, index)
     end
+    def inspect
+      "<Expo2::Merger>"
+    end
   end
 
-  # class RecursiveSubExpo < Struct.new(:presenter, :key, :sub_expo, :block)
-    # def go(object, context, index=nil, user_expo)
-      # associated = self.presenter.new(object).send(self.key)
-      # # sub = Expo2.new(self.sub_expo, &self.block)
-      # { self.key => sub.expo(associated, context) }
-    # end
-  # end
   class SubExpo < Struct.new(:presenter, :key, :sub_expo, :block)
-    def go(object, context, index=nil, user_expo)
+    def go(object, context, index=nil)
       associated = self.presenter.to_proc.call(object)
       sub = Expo2.new(self.sub_expo, &self.block)
       if associated
@@ -87,10 +87,22 @@ class Expo2
         {}
       end
     end
+    def inspect
+      "<Expo2::SubExpo>"
+    end
+  end
+
+  class Recurser < SubExpo
+    def initialize(presenter, key, recurser)
+      super(presenter, key, recurser)
+    end
+    def inspect
+      "<Expo2::Recurser>"
+    end
   end
 
   class MergeExpo < Struct.new(:presenter, :sub_expo, :block)
-    def go(object, context, index=nil, user_expo)
+    def go(object, context, index=nil)
       associated = self.presenter.to_proc.call(object)
       sub = Expo2.new(self.sub_expo, &self.block)
       if associated
@@ -99,6 +111,9 @@ class Expo2
         {}
       end
     end
+    def inspect
+      "<Expo2::MergeExpo>"
+    end
   end
 
   class SubCollection < Struct.new(:associator, :key, :sub_expo, :block)
@@ -107,57 +122,50 @@ class Expo2
       sub = Expo2.new(self.sub_expo, &self.block)
       { self.key => sub.expo_collection(associated, context) }
     end
+    def inspect
+      "<Expo2::SubCollection>"
+    end
   end
 
-  def presenters
-    @presenters ||= []
-  end
-
+  private
   def expose(*keys)
     array, hash = parse_arguments(keys)
     key_map = hasherize(array).merge(hash)
-    presenters << Exposer.new(key_map)
-  end
-
-  def aside(*keys)
-    array, hash = parse_arguments(keys)
-    key_map = hasherize(array).merge(hash)
-    presenters << Asider.new(nil, key_map)
+    @presenters << Exposer.new(key_map)
   end
 
-  def aside(*keys)
-    pres = nil
-    !keys.first.is_a?(Symbol) && (
-      pres = keys.shift
-    )
+  def aside(presenter, *keys)
     array, hash = parse_arguments(keys)
     key_map = hasherize(array).merge(hash)
-    presenters << Asider.new(pres, key_map)
+    @presenters << Asider.new(presenter, key_map)
   end
 
   def augment(presenter, *keys)
     array, hash = parse_arguments(keys)
     key_map = hasherize(array).merge(hash)
-    presenters << Pres.new(presenter, key_map)
+    @presenters << Pres.new(presenter, key_map)
   end
 
   def merge(&block)
-    presenters << Merger.new(block)
+    @presenters << Merger.new(block)
   end
 
   def merge_expo(pres, sub_expo=nil, &block)
-    presenters << MergeExpo.new(pres, sub_expo, block)
+    @presenters << MergeExpo.new(pres, sub_expo, block)
   end
 
   def sub_expo(pres, key, sub_expo=nil, &block)
-    presenters << SubExpo.new(pres, key, sub_expo, block)
+    @presenters << SubExpo.new(pres, key, sub_expo, block)
+  end
+
+  def recurse(pres, key)
+    @presenters << Recurser.new(pres, key, self)
   end
 
   def collection(associator, key, expo=nil, &block)
-    presenters << SubCollection.new(associator, key, expo, block)
+    @presenters << SubCollection.new(associator, key, expo, block)
   end
 
-  private
   def parse_arguments(args)
     last = args.pop
     array = args
@@ -174,4 +182,23 @@ class Expo2
     block ||= ->(e) { e }
     Hash[*array.map{|e| [e, block.call(e)] }.flatten]
   end
+
+  def deep_merge(hash, other_hash)
+    hash.merge(other_hash) do |key, oldval, newval|
+      oldval = oldval.to_hash if oldval.respond_to?(:to_hash)
+      newval = newval.to_hash if newval.respond_to?(:to_hash)
+      oldval.class.to_s == 'Hash' && newval.class.to_s == 'Hash' ? deep_merge(oldval, newval) : newval
+    end
+  end
+
+  class NullExpo
+    def expo(object, context, index)
+      {}
+    end
+
+    def inspect
+      "nil"
+    end
+  end
+  NULL_EXPO = NullExpo.new
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expo
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Serguei Filimonov
@@ -28,12 +28,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []