huck 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab41afdccbfa3acca2682260a3f767f81df16c98
-  data.tar.gz: 10c43b6f14370e182b92354ab802f564d292262b
+  metadata.gz: ef804b8c7db217ba15215e4130274d571f28540e
+  data.tar.gz: 5725488dde39cbaa15655a171a146d3490131fd5
 SHA512:
-  metadata.gz: ae7aca31731c943519ec239dad61b262ee2ee7a4641a66b37b39748f544730a4fb3395bd83e008c200329a37fda09bd82420902a2bb2fd0e88770fec4efcb410
-  data.tar.gz: 461a94e2f90cb3ecd96594065d20bcbad9f96552fadbbb58fcc1e8ad28751ec663cfb95a69d67991ac29bd8e3612efd12ab8447be4676218fea2e08902c50894
+  metadata.gz: d732a5dc916c896c9fc806fbcc1d7104cea7a716fa53995f137d24f45c020b81f49ec57ab84cfa8afc90dd35ea3bf3a63a335b6de03f202bcbb195134b046b9c
+  data.tar.gz: fc996cf475ca5389e0a8d7da611f239a3e3caf8197ece289a9cd511acc8a5a099fd2044d5c8c0ed682e2372a6141af8f59bce5e81eb347416a004956759f2b74

data/lib/huck/generator.rb

@@ -4,33 +4,6 @@ module Huck
 
     attr_accessor :config
 
-    # This method will call the generation method, and return the data in the
-    # desired format.
-    #
-    # == Parameters:
-    # format::
-    #   The serialization format (json or yaml)
-    #
-    # == Returns:
-    # A string of serialized text
-    #
-    def dump kwargs = {}
-      format = Huck::getarg kwargs, :format, 'json'
-      data = generate
-      if !data.is_a? Hash
-        raise RuntimeError, 'cannot handle non-hash data'
-      end
-
-      case format
-      when 'json'
-        return JSON.dump data
-      when 'yaml'
-        return YAML.dump data
-      else
-        raise RuntimeError, "unknown format '#{format}'"
-      end
-    end
-
     # Given a generator's name (or no name), return a new generator instance
     #
     # == Parameters:

data/lib/huck/util.rb

@@ -64,4 +64,29 @@ module Huck
     end
   end
 
+  # Serialize a hash to a desired format.
+  #
+  # == Parameters:
+  # format::
+  #   The serialization format (json or yaml)
+  #
+  # == Returns:
+  # A string of serialized text
+  #
+  def self.serialize_hash data, kwargs = {}
+    format = Huck::getarg kwargs, :format, 'json'
+    if !data.is_a? Hash
+      raise RuntimeError, 'cannot serialize non-hash data'
+    end
+
+    case format
+    when 'json'
+      return JSON.dump data
+    when 'yaml'
+      return YAML.dump data
+    else
+      raise RuntimeError, "unknown format '#{format}'"
+    end
+  end
+
 end

data/lib/huck/version.rb

@@ -1,3 +1,3 @@
 module Huck
-  Version = '0.2.2'
+  Version = '0.2.3'
 end

data/lib/huck.rb

@@ -19,7 +19,10 @@ require 'huck/handlers/exec'
 
 module Huck
 
-  # Main method to run Huck and dump info
+  # Main method to run Huck and dump info. If a block is given, the block will
+  # be used as the generator code. Generator code must return a hash, anything
+  # else will cause a RuntimeException. If no block is passed, then the
+  # configured generator will be invoked instead.
   #
   # == Parameters:
   # config::
@@ -50,7 +53,8 @@ module Huck
     send_name = send_arg if !send_arg.nil?
     s = Sender::factory :name => send_name, :config => config
 
-    s.send g.dump
+    data = block_given? ? yield : g.generate
+    s.send Huck::serialize_hash data
   end
 
   # Main method to receive messages from a Huck client. If a block is given, the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: huck
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Ryan Uber