octiron 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77fcd14d6034f8507cd48bcccad8e1c842895bd7
-  data.tar.gz: fd7c20ee199a1406e6973ef92519617c14cd628a
+  metadata.gz: 627a770c9aeffaf9d8eeb4edf178ea2213435793
+  data.tar.gz: f69c0af13d7767fb12e33051500cfacfdc58c7e5
 SHA512:
-  metadata.gz: 292f9c0256bec186e77be6ca75bb864a6d5b5ea99f1179be7202c6fbe941f4fbe3c4d238f056ad2539f6ed4f12d70f04beb8fce24b9b8616b22b429333447265
-  data.tar.gz: ce519cfd7d727e6241a745417c74319b84fd47f403a6a92f7e732e954921d69d1fdd106d633c32650564c2c880ec4d36673d1956d3185c29e6698968eca86271
+  metadata.gz: 534a3573c278df28a51f29a6575d8701c5532bd27e28afd02f6666a9929fb00ed29fa43989dbd68b29e0282f9e89a3590116f79d31c1cb5f37f37e4ea8d7b5c3
+  data.tar.gz: 5a2482c73a63b62f4d5778b6f069af047b26dbd6239a496b35459331ea41a6415ea559010e722ce2ce58aee79053dc679f3299322d6d458d91bd61631c71d7ef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    octiron (0.3.0)
+    octiron (0.4.0)
       collapsium (~> 0.8)
       rgl (~> 0.5)
 

data/lib/octiron/transmogrifiers/registry.rb

@@ -128,7 +128,10 @@ module Octiron::Transmogrifiers
 
     ##
     # Transmogrify an object of one class into another class.
-    def transmogrify(from, to)
+    # If `verify_results` is true, the transmogrification result is checked
+    # to match the target class or hash, and an error is raised if there is no
+    # match.
+    def transmogrify(from, to, verify_results = true)
       # Get lookup keys
       from_name = from.class.to_s
       if from.is_a?(Hash)
@@ -158,15 +161,21 @@ module Octiron::Transmogrifiers
         result = @transmogrifiers[key].call(input)
 
         # Verify result
-        if step_to.is_a?(Hash)
-          result.extend(::Collapsium::PrototypeMatch)
-          if not result.prototype_match(step_to)
-            raise "Transmogrifier returned Hash that did not match prototype "\
-                  "#{step_to}, aborting!"
+        if verify_results
+          if result.nil?
+            raise "Transmogrifier returned nil result!"
+          end
+
+          if step_to.is_a?(Hash)
+            result.extend(::Collapsium::PrototypeMatch)
+            if not result.prototype_match(step_to)
+              raise "Transmogrifier returned Hash that did not match prototype "\
+                    "#{step_to}, aborting!"
+            end
+          elsif result.class.to_s != step_to
+            raise "Transmogrifier returned result of invalid class "\
+                "#{result.class}, aborting!"
           end
-        elsif result.class.to_s != step_to
-          raise "Transmogrifier returned result of invalid class "\
-              "#{result.class}, aborting!"
         end
 
         # Result is input for the next transmogrifier in the chain

data/lib/octiron/version.rb

@@ -8,5 +8,5 @@
 #
 module Octiron
   # The current release version
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/octiron/world.rb

@@ -71,9 +71,9 @@ module Octiron::World
   # Delegator for the autotransmogiry(FROM).to TO syntax
   # @api private
   class AutoTransmogrifyDelegator < TransmogrifierRegistrator
-    def initialize(from, raise_on_nil)
+    def initialize(from, verify_results = false)
       @from = from
-      @raise_on_nil = raise_on_nil
+      @verify_results = verify_results
     end
 
     def to(to, transmogrifier_object = nil, &transmogrifier_proc)
@@ -85,14 +85,11 @@ module Octiron::World
       ::Octiron::World.event_bus.subscribe(@from) do |event|
         # By default, we don't want to raise errors if the transmogrifier
         # returns nil. Still, raising should be activated optionally.
-        begin
-          new_ev = ::Octiron::World.transmogrifier_registry.transmogrify(event, to)
-          ::Octiron::World.event_bus.publish(new_ev)
-        rescue RuntimeError
-          if @raise_on_nil
-            raise
-          end
-        end
+        new_ev = ::Octiron::World.transmogrifier_registry.transmogrify(
+            event, to,
+            @verify_results
+        )
+        ::Octiron::World.event_bus.publish(new_ev)
       end
     end
   end
@@ -108,8 +105,8 @@ module Octiron::World
   # By default, a transmogrifier that returns a nil object simply does not
   # publish a result.
   def autotransmogrify(from, options = {})
-    raise_on_nil = options[:raise_on_nil] || false
-    return AutoTransmogrifyDelegator.new(from, raise_on_nil)
+    verify_results = options[:verify_results] || false
+    return AutoTransmogrifyDelegator.new(from, verify_results)
   end
 
   ##

data/spec/world_spec.rb

@@ -89,7 +89,7 @@ describe Octiron::World do
     end
 
     it "can raise on nil transmogrification results" do
-      @tester.autotransmogrify(Test1, raise_on_nil: true).to Test2 do |_|
+      @tester.autotransmogrify(Test1, verify_results: true).to Test2 do |_|
         # Nothing happening here
       end
       expect { @tester.publish(Test1.new) }.to raise_error(RuntimeError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octiron
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jens Finkhaeuser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler