expo 0.6.0 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2YxMTQyZjdiMDc3ZDk2M2U3MmJmZWY0OWQwYjBlNWZiZjI0ZTI3OQ==
+    YmM1NmEwZGE1YmE3MDFhODFhZDUzZDQ5MGRkYjYwMzU2Njg2NDgxNw==
   data.tar.gz: !binary |-
-    MTc5ZTRkOGRkMTA4N2ZjOGNiMTZlYTY3NjYwYWJhYjhkNTVlMWFjZA==
+    NTI2YmM5MWUyNTY2Nzg3M2QwMTQ0OWJmZDhmZjdlNmM1YTJiZGRkNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODZhMTA4NzA3MDc0ZTdiMDkyNGRiMzIyZTM1YjM4NzY3MWFkZmViYTAzMGVi
-    MjJlZjVmNjJhMzFhN2UyNTFmNjU0YTRhZDg0MTRiZmU3ZDU5ODM5OGE5YmY1
-    MzZiYTAwZTczN2ZlYzQzODQ0ZGJkZTMzNTg3YmM3OGE5ZDU4OTk=
+    NzY1Mjc3OWU3NDQwMjc4ZDhmOGU4MzQyMGI0YTYzYjEwZGU2Y2NiNjdiNWEx
+    MjNkNzJiMjE4M2M3NDYzYzI2NDAyM2YxYmQzMDFkNTUwMmU4ZGM1NWM1OTcy
+    MTBjNDc5MDY5YzZkZjMwZWQ1MTI3NzgxZDIwMTM3MWQ5MmZmODE=
   data.tar.gz: !binary |-
-    NGNiNzNjMTRiMjZiYjNhYzNlNjliNjNjMzNjZmZjMTk5N2Y4MTQyZjY0YTVh
-    MjE3MjliYjljNjNlNmM5YTBhMjc1YTIzYTVlMmM3M2JkZDE1YTE5OGIzYWJk
-    NTk0MTIyNjk0NzkyY2ZkNTUzNWYzNTIzNjIzOThiNzI2MTZlNGY=
+    ZmUwODgyNzA3YzJlODA3MTQ2NjQwZTBjZjJhZDljZjYzNjZjYWM3MWY3Y2E3
+    NjBhZGM2NThhMjE0MzY1NTFhYmZkZjNmMTAwYWVlZGFmOTM1MDUzOGMzNmQ3
+    MzRmMTkzMmFlY2U0ZTJhYTlhY2Q2YzA5YTRkM2E3YjViNzFkMmQ=

data/lib/argument_parser.rb

@@ -0,0 +1,17 @@
+class ArgumentParser
+  def new
+    @instance ||= super
+  end
+
+  def parse_arguments(args)
+    last = args.pop
+    array = args
+    hash = {}
+    if last.is_a?(Hash)
+      hash = last
+    elsif last
+      array << last
+    end
+    [array, hash]
+  end
+end

data/lib/expo.rb

@@ -1,4 +1,6 @@
 require 'expo2'
+require 'hash_helper'
+
 class Expo
   CALL_ORDER = [:aside, :expose, :sub_expo, :collection]
   TRIVIAL_PRESENTER = Class.new do

data/lib/expo2.rb

@@ -1,7 +1,12 @@
+require 'null_expo'
+require 'hash_helper'
+require 'argument_parser'
+require 'presenters'
+
 class Expo2
   def initialize(prototype=nil, &block)
     @block = block
-    @prototype = prototype || NULL_EXPO
+    @prototype = prototype || NullExpo.new
     @presenters ||= []
     self.instance_exec &@block if @block
   end
@@ -15,7 +20,8 @@ class Expo2
     return nil if object.nil?
     preso = @prototype.expo(object, context, index)
     @presenters.each do |pres|
-      preso = deep_merge(preso, pres.go(object, context, index))
+      #TODO: warn on key collision
+      preso = HashHelper.new.deep_merge(preso, pres.go(object, context, index))
     end
     preso
   end
@@ -24,125 +30,23 @@ class Expo2
     objects.extend(Enumerable).map.with_index{|o, i| expo(o, context, i) }
   end
 
-  class Pres < Struct.new(:presenter, :key_map)
-    def go(object, context, index=nil)
-      preso = {}
-      perspective = self.presenter.to_proc.call(object)
-      self.key_map.each do |k,v|
-        preso[v] = perspective.send(k)
-      end
-      preso
-    end
-
-    def inspect
-      "<Expo2::Pres>"
-    end
-  end
-
-  class Asider < Struct.new(:presenter, :key_map)
-    def go(object, context, index=nil)
-      preso = {}
-      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)
-    def go(object, context, index=nil)
-      preso = {}
-      self.key_map.each do |k,v|
-        preso[v] = object.send(k)
-      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 SubExpo < Struct.new(:presenter, :key, :sub_expo, :block)
-    def go(object, context, index=nil)
-      associated = self.presenter.to_proc.call(object)
-      sub = Expo2.new(self.sub_expo, &self.block)
-      if associated
-        { self.key => sub.expo(associated, context) }
-      else
-        {}
-      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)
-      associated = self.presenter.to_proc.call(object)
-      sub = Expo2.new(self.sub_expo, &self.block)
-      if associated
-        sub.expo(associated, context)
-      else
-        {}
-      end
-    end
-    def inspect
-      "<Expo2::MergeExpo>"
-    end
-  end
-
-  class SubCollection < Struct.new(:associator, :key, :sub_expo, :block)
-    def go(object, context, index=nil)
-      associated = self.associator.to_proc.call(object)
-      sub = Expo2.new(self.sub_expo, &self.block)
-      { self.key => sub.expo_collection(associated, context) }
-    end
-    def inspect
-      "<Expo2::SubCollection>"
-    end
-  end
-
   private
+
   def expose(*keys)
-    array, hash = parse_arguments(keys)
-    key_map = hasherize(array).merge(hash)
+    array, hash = ArgumentParser.new.parse_arguments(keys)
+    key_map = HashHelper.new.hasherize(array).merge(hash)
     @presenters << Exposer.new(key_map)
   end
 
   def aside(presenter, *keys)
-    array, hash = parse_arguments(keys)
-    key_map = hasherize(array).merge(hash)
+    array, hash = ArgumentParser.new.parse_arguments(keys)
+    key_map = HashHelper.new.hasherize(array).merge(hash)
     @presenters << Asider.new(presenter, key_map)
   end
 
   def augment(presenter, *keys)
-    array, hash = parse_arguments(keys)
-    key_map = hasherize(array).merge(hash)
+    array, hash = ArgumentParser.new.parse_arguments(keys)
+    key_map = HashHelper.new.hasherize(array).merge(hash)
     @presenters << Pres.new(presenter, key_map)
   end
 
@@ -166,39 +70,8 @@ class Expo2
     @presenters << SubCollection.new(associator, key, expo, block)
   end
 
-  def parse_arguments(args)
-    last = args.pop
-    array = args
-    hash = {}
-    if last.is_a?(Hash)
-      hash = last
-    elsif last
-      array << last
-    end
-    [array, hash]
-  end
-
-  def hasherize(array, &block)
-    block ||= ->(e) { e }
-    Hash[*array.map{|e| [e, block.call(e)] }.flatten]
+  def inline(&block)
+    @presenters << InlineExpo.new(block)
   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

data/lib/hash_helper.rb

@@ -0,0 +1,18 @@
+class HashHelper
+  def self.new
+    @instance ||= super
+  end
+
+  def hasherize(array, &block)
+    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
+end

data/lib/null_expo.rb

@@ -0,0 +1,17 @@
+class NullExpo
+  def self.new
+    @instance ||= super
+  end
+
+  def expo(object, context, index)
+    {}
+  end
+
+  def expo_collection(coll, context)
+    []
+  end
+
+  def inspect
+    "nil"
+  end
+end

data/lib/presenters/asider.rb

@@ -0,0 +1,14 @@
+class Asider < Struct.new(:presenter, :key_map)
+  def go(object, context, index=nil)
+    preso = {}
+    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

data/lib/presenters/exposer.rb

@@ -0,0 +1,14 @@
+class Exposer < Struct.new(:key_map)
+  def go(object, context, index=nil)
+    preso = {}
+    self.key_map.each do |k,v|
+      preso[v] = object.send(k)
+    end
+    preso
+  end
+
+  def inspect
+    "<Expo2::Exposer>"
+  end
+end
+

data/lib/presenters/inline_expo.rb

@@ -0,0 +1,9 @@
+class InlineExpo < Struct.new(:block)
+  def go(object, context, index=nil)
+    self.block.call(object, context, index)
+  end
+
+  def inspect
+    "<Expo2::InlineExpo>"
+  end
+end

data/lib/presenters/merge_expo.rb

@@ -0,0 +1,14 @@
+class MergeExpo < Struct.new(:presenter, :sub_expo, :block)
+  def go(object, context, index=nil)
+    associated = self.presenter.to_proc.call(object)
+    sub = Expo2.new(self.sub_expo, &self.block)
+    if associated
+      sub.expo(associated, context)
+    else
+      {}
+    end
+  end
+  def inspect
+    "<Expo2::MergeExpo>"
+  end
+end

data/lib/presenters/merger.rb

@@ -0,0 +1,9 @@
+class Merger < Struct.new(:block)
+  def go(object, context, index=nil)
+    self.block.call(context, index)
+  end
+  def inspect
+    "<Expo2::Merger>"
+  end
+end
+

data/lib/presenters/pres.rb

@@ -0,0 +1,14 @@
+class Pres < Struct.new(:presenter, :key_map)
+  def go(object, context, index=nil)
+    preso = {}
+    perspective = self.presenter.to_proc.call(object)
+    self.key_map.each do |k,v|
+      preso[v] = perspective.send(k)
+    end
+    preso
+  end
+
+  def inspect
+    "<Expo2::Pres>"
+  end
+end

data/lib/presenters/recurser.rb

@@ -0,0 +1,11 @@
+require 'presenters/sub_expo'
+
+class Recurser < SubExpo
+  def initialize(presenter, key, recurser)
+    super(presenter, key, recurser)
+  end
+  def inspect
+    "<Expo2::Recurser>"
+  end
+end
+

data/lib/presenters/sub_collection.rb

@@ -0,0 +1,11 @@
+class SubCollection < Struct.new(:associator, :key, :sub_expo, :block)
+  def go(object, context, index=nil)
+    associated = self.associator.to_proc.call(object)
+    sub = Expo2.new(self.sub_expo, &self.block)
+    { self.key => sub.expo_collection(associated, context) }
+  end
+
+  def inspect
+    "<Expo2::SubCollection>"
+  end
+end

data/lib/presenters/sub_expo.rb

@@ -0,0 +1,14 @@
+class SubExpo < Struct.new(:presenter, :key, :sub_expo, :block)
+  def go(object, context, index=nil)
+    associated = self.presenter.to_proc.call(object)
+    sub = Expo2.new(self.sub_expo, &self.block)
+    if associated
+      { self.key => sub.expo(associated, context) }
+    else
+      {}
+    end
+  end
+  def inspect
+    "<Expo2::SubExpo>"
+  end
+end

data/lib/presenters.rb

@@ -0,0 +1,9 @@
+require 'presenters/pres'
+require 'presenters/asider'
+require 'presenters/exposer'
+require 'presenters/sub_expo'
+require 'presenters/merger'
+require 'presenters/recurser'
+require 'presenters/merge_expo'
+require 'presenters/sub_collection'
+require 'presenters/inline_expo'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expo
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Serguei Filimonov
@@ -17,8 +17,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/argument_parser.rb
 - lib/expo.rb
 - lib/expo2.rb
+- lib/hash_helper.rb
+- lib/null_expo.rb
+- lib/presenters/asider.rb
+- lib/presenters/exposer.rb
+- lib/presenters/inline_expo.rb
+- lib/presenters/merge_expo.rb
+- lib/presenters/merger.rb
+- lib/presenters/pres.rb
+- lib/presenters/recurser.rb
+- lib/presenters/sub_collection.rb
+- lib/presenters/sub_expo.rb
+- lib/presenters.rb
 homepage: https://github.com/sergueif/expo
 licenses: []
 metadata: {}