oni 1.0.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Yzg0ZTUxZTdiN2E0YmVkM2M2NGFkYTNiMWY0ZDZiNDVhZDAyMmM1Ng==
-  data.tar.gz: !binary |-
-    MzJiNjliMjhiZjcwZTk4NTkyZjFkZjU4YTI1YjJkMmEyNjQ0Y2EwYw==
-SHA512:
-  metadata.gz: !binary |-
-    OTE4MzgzNjMxZDI5YzZhYjVmYWQ2OTUzZWE1MTI5NzY5YzUzNWY0ZjY4MjNl
-    MzhhN2JkOGFjNTEzMzk2ODU0YjlhNTE5YmY2NGQ3MzMxZTI5MDk3YmFjZWU5
-    YjYwZmI5MmU0NGFmNjkwY2RhMGIxMzk1NDUwYzg4OTUwZGFiNTQ=
-  data.tar.gz: !binary |-
-    NjAzNWExYjhmNWI0ZWQzMjY2NWY0NTMwYjQ1MjZlNjExNDg2NjJlNWY5MmNl
-    ZGY2Y2JiMTExMDgwNGE3ODVlMDJiNjk5NWRmMWM1ZjYwODg4YmQzNWMxYTUz
-    ZDFiNjcxZGM0OTdiYTBhYWZmMjE3MjcxOWVlZmY2MDZmMmMzODc=
+--- 
+SHA1: 
+  metadata.gz: 2a436542360d389809d0b76b7108599fbb75bfe1
+  data.tar.gz: 778e26a13382c6f4fe71acbaeff5f1a6b3c76b99
+SHA512: 
+  metadata.gz: e6bd9b3db19847a9b3c52cc16e59d373290a74a2ba5c07c07004c7adb5ee9e24dbbfde99c3ccda1871591264f79e5c94634796624547f06a1749bed472673e92
+  data.tar.gz: 665c8b07e6728aa0aee95f869338d9a910b96e5b9cfa1f313a027f0c2077c3e97e36c33077750991a208506efd4a74768d57ed571f9c4381e798abb425875cbb

data/.travis.yml

@@ -1,5 +1,5 @@
 ---
-script: rake
+script: bundle exec rake
 
 rvm:
   - 1.9.3
@@ -8,7 +8,7 @@ rvm:
   - jruby
   - jruby-head
   - jruby-1.7.4
-  - rbx-2.1.1
+  - rbx-2.2.1
 
 notifications:
   email:
@@ -21,3 +21,5 @@ notifications:
 branches:
   only:
     - master
+
+#cache: bundler

data/doc/changelog.md

@@ -1,6 +1,11 @@
 # @title Changelog
 # Changelog
 
+## 2.0.0 - December 16th, 2013
+
+* Error callbacks now take an optional argument that contains extra error data
+  as returned by a worker.
+
 ## 1.0.0 - November 18th, 2013
 
 The first public release of Oni.

data/lib/oni/daemon.rb

@@ -101,7 +101,12 @@ module Oni
       mapper = create_mapper
       input  = mapper.map_input(message)
       worker = option(:worker).new(*input)
-      output = worker.process
+
+      begin
+        output = worker.process
+      rescue => error
+        error(error, worker.extra_error_data)
+      end
 
       return mapper.map_output(output)
     end
@@ -139,8 +144,9 @@ module Oni
     # exception occured, not from the main thread.
     #
     # @param [StandardError] error
+    # @param [Mixed] extra_data Extra data made available to the method.
     #
-    def error(error)
+    def error(error, extra_data = nil)
       raise error
     end
 

data/lib/oni/version.rb

@@ -1,3 +1,3 @@
 module Oni
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end # Oni

data/lib/oni/worker.rb

@@ -14,5 +14,20 @@ 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,6 +22,10 @@ describe Oni::Daemon do
       def process
         return @number * 2
       end
+
+      def extra_error_data
+        return @number
+      end
     end
 
     Class.new(Oni::Daemon) do
@@ -43,6 +47,10 @@ describe Oni::Daemon do
         yield({:number => 10})
       end
 
+      def error(error, extra_data = nil)
+        raise "#{error.message}: #{extra_data}"
+      end
+
       def complete(message, output, timings)
         @message = message
         @output  = output
@@ -133,7 +141,7 @@ describe Oni::Daemon do
       Class.new(example_daemon) do
         set :threads, 0
 
-        def error(error)
+        def error(error, extra_data = nil)
           raise 'custom error'
         end
       end
@@ -151,4 +159,16 @@ 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
+  end
 end

metadata

@@ -1,134 +1,93 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: oni
-version: !ruby/object:Gem::Version
-  version: 1.0.0
+version: !ruby/object:Gem::Version 
+  version: 2.0.0
 platform: ruby
-authors:
+authors: 
 - Yorick Peterse
 - Wilco van Duinkerken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-12-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - &id002 
+      - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: simplecov
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: kramdown
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: ci_reporter
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: aws-sdk
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - *id002
+  type: :development
+  version_requirements: *id009
 description: Framework for building concurrent daemons in Ruby.
 email: 
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -161,30 +120,31 @@ files:
 - task/tag.rake
 - task/test.rake
 homepage: 
-licenses:
+licenses: 
 - MIT
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.9.3
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id002
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.1.2
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Framework for building concurrent daemons in Ruby.
-test_files:
+test_files: 
 - spec/oni/configurable_spec.rb
 - spec/oni/daemon_spec.rb
 - spec/oni/daemons/sqs_spec.rb