expo 0.2.6 → 0.2.7

data/lib/expo.rb

@@ -61,7 +61,20 @@ class Expo
     end
   end
 
-  private
+  def aside(*messages)
+    array, hash = parse_arguments(messages)
+    @context.merge!(hasherize(array) {|msg| @preso.send(msg) })
+    hash.each do |k,v|
+      @context[v] = @preso.send(k)
+    end
+    nil
+  end
+
+  def expose(*messages)
+    array, hash = parse_arguments(messages)
+    @message_map.merge!(hasherize(array).merge(hash))
+    nil
+  end
 
   def sub_expo(key, object, sub_expo_passed)
     @inner_calls << {
@@ -81,6 +94,8 @@ class Expo
     nil
   end
 
+  private
+
   def set_id(id)
     @id = id
     self
@@ -121,37 +136,21 @@ class Expo
     nil
   end
 
-  def aside(*messages)
-    receiver = @preso
-    last = messages.pop
-    if last.is_a?(Hash)
-      last.each do |k,v|
-        @context[v] = receiver.send(k)
-      end
-    elsif last
-      @context[last] = receiver.send(last)
-    end
-    if messages.any?
-      @context.merge!(hasherize(messages) {|msg| receiver.send(msg) })
-    end
-    nil
+  def hasherize(array, &block)
+    block ||= ->(e) { e }
+    Hash[*array.map{|e| [e, block.call(e)] }.flatten]
   end
 
-  def expose(*messages)
-    last = messages.pop
+  def parse_arguments(args)
+    last = args.pop
+    array = args
+    hash = {}
     if last.is_a?(Hash)
-      @message_map.merge!(last)
+      hash = last
     elsif last
-      @message_map[last] = last
+      array << last
     end
-    if messages.any?
-      @message_map.merge!(hasherize(messages) {|msg| msg })
-    end
-    nil
-  end
-
-  def hasherize(array, &block)
-    Hash[*array.map{|e| [e, block.call(e)] }.flatten]
+    [array, hash]
   end
 
   class Proxy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expo
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors: