oni 2.0.1 → 3.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2EyNTdkYTM0ZmE1MmExMzVhNDNmNjNiNjdjM2ViMTEyYmM5ZWZkYQ==
+    Y2JlMGI4N2NhZDZmMDdmYTVjNWY0ZjExY2E5YzlmNGVlOWQ0Y2FjNg==
   data.tar.gz: !binary |-
-    YzRlODYyZTdmNjI5YThkNjBkY2ZkN2ZkMTU5NTg0OTc2ODVmMTdkZg==
+    NjAyMmEwMDA0YzYwZjQ1ZWQzNWNjYjVmNGI5N2YxYmY1NTJmYjhjZg==
 SHA512:
   metadata.gz: !binary |-
-    N2FjOWI4YmQ2NzQ2ZWM1OTYwMTJjMjE3ZDBhNjNjYmFjZDlkNzQ3MzQxZDQ1
-    Y2QzMDc1YzVmMjRkMDU4MWIwNmRhNmVmYjgxNmQ4OTJkYTFjMWMxMDFlZTM4
-    MmNlMTFkZGY3NTE1YmZkNmJkZWY4YjE4ZWU2NTNkOTMxMGRkMTg=
+    ODZjNTI3ZjlkZjZlOTNkZmU5YmQ4YzE1Zjc2N2FjMzMxMjI3M2ZlNjFlNWRl
+    OGYzMDQ0YTgwMTFkYjE3MzJlOTQ5MGU2NGRmZDljMDk3NmU4YTYzM2Q4NTY4
+    MWJkZjM1ZDliOTEzMDM3ZDk0YzBkMTZjMjg1OGJjNmZhMjIxMDY=
   data.tar.gz: !binary |-
-    NDRiODhjYmIwNzRlMTIzZWY2MGJiY2IxYTVjYjViMmZhMDA3YTFhNGYzN2Fm
-    NjNhYzMyMGM0NDIzYzFlNjAwMDk0ZDE0MWY1NzU4YjZiMGFmMjMxYmYzYmNm
-    ZmQ2YTVlOGE3OTJmZTQwMjk3YzAyNDNiMzZlYTdhNjg4MTVhZWU=
+    MDI0MjdmMTE2MGE4ZDA3ZGE0NWJlYzAyNjliYmQxMjIzZjQ1ZjlhOGU2MmIy
+    ZTljNjNkNDkzNTYyZWRmZDU5YzE2YTk4NWNmZmVlODZhY2IyMjFjYTA4Y2Uy
+    OWQ1MzY1YzdmNDUzM2U3YTBmODEzZTA5MDYzMjNlNjBkNzc0OGM=

data/doc/changelog.md

@@ -1,6 +1,11 @@
 # @title Changelog
 # Changelog
 
+## 3.0.0 - December 17th, 2013
+
+This release reverts the changes of version 2.0.0 and 2.0.1 as they proved to
+be too problematic.
+
 ## 2.0.1 - December 17th, 2013
 
 * Fixed a bug where the complete() callback would be executed upon worker

data/lib/oni/daemon.rb

@@ -87,17 +87,13 @@ module Oni
         output = run_worker(message)
       end
 
-      complete(message, output, timings) unless output == false
+      complete(message, output, timings)
     end
 
     ##
     # Maps the input, runs the worker and then maps the output into something
     # that the daemon can understand.
     #
-    # If the worker's `process` method raises an error `false` is returned and
-    # the `complete` callback is skipped, otherwise the remapped output is
-    # returned.
-    #
     # @param [Mixed] message
     # @return [Mixed]
     #
@@ -105,15 +101,9 @@ module Oni
       mapper = create_mapper
       input  = mapper.map_input(message)
       worker = option(:worker).new(*input)
-      output = false
-
-      begin
-        output = mapper.map_output(worker.process)
-      rescue => error
-        error(error, worker.extra_error_data)
-      end
+      output = worker.process
 
-      return output
+      return mapper.map_output(output)
     end
 
     ##
@@ -145,13 +135,9 @@ module Oni
     # Called whenever an error is raised in the daemon, mapper or worker. By
     # default this method just re-raises the error.
     #
-    # Note that this callback method is called from a thread in which the
-    # exception occured, not from the main thread.
-    #
     # @param [StandardError] error
-    # @param [Mixed] extra_data Extra data made available to the method.
     #
-    def error(error, extra_data = nil)
+    def error(error)
       raise error
     end
 

data/lib/oni/version.rb

@@ -1,3 +1,3 @@
 module Oni
-  VERSION = '2.0.1'
+  VERSION = '3.0.0'
 end # Oni

data/lib/oni/worker.rb

@@ -14,20 +14,5 @@ module Oni
     def process
       raise NotImplementedError, 'You must implement #process yourself'
     end
-
-    ##
-    # Method for returning (optional) extra data that should be sent to
-    # {Oni::Daemon#error} upon encountering an error. This method can be used
-    # to for example return the mapped input so that it can be sent to Rollbar.
-    #
-    # @example
-    #  def extra_error_data
-    #    return {:user_id => current_user.id}
-    #  end
-    #
-    # @return [Mixed]
-    #
-    def extra_error_data
-    end
   end # Worker
 end # Oni

data/spec/oni/daemon_spec.rb

@@ -22,10 +22,6 @@ describe Oni::Daemon do
       def process
         return @number * 2
       end
-
-      def extra_error_data
-        return @number
-      end
     end
 
     Class.new(Oni::Daemon) do
@@ -159,30 +155,4 @@ describe Oni::Daemon do
       lambda { daemon.start }.should raise_error(RuntimeError, 'custom error')
     end
   end
-
-  context 'error handling with extra data' do
-    example 'include the extra data' do
-      instance = example_daemon.new
-
-      instance.option(:worker).any_instance.stub(:process) { raise 'example' }
-
-      block = lambda { instance.run_worker(:number => 10) }
-
-      block.should raise_error(RuntimeError, 'example: 10')
-    end
-
-    example 'skip the complete() callback upon failure' do
-      instance = example_daemon.new
-
-      instance.option(:worker).any_instance.stub(:process) { raise 'boom' }
-
-      block = lambda { instance.process(:number => 10) }
-
-      # The complete() callback should be skipped.
-      instance.should_not receive(:complete)
-
-      # Regular error handling should *not* be skipped.
-      block.should raise_error(RuntimeError, 'boom: 10')
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oni
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Yorick Peterse