heracles-wrapper 0.0.1 → 0.0.2

data/lib/heracles-wrapper/exceptions.rb

@@ -1,10 +1,18 @@
+require 'json'
 module Heracles
   module Wrapper
+    DefaultErrorObject = Hash
     class RequestFailure < RuntimeError
-      attr_reader :code, :messages, :response
+      attr_reader :code, :errors, :response
       def initialize(response)
         @code = response.respond_to?(:code) ? response.code : 500
-        @messages = response.respond_to?(:body) ? response.body : ''
+        begin
+          @errors = response.respond_to?(:body) ?
+            JSON.parse(response.body).fetch('errors',{}) :
+            {}
+        rescue JSON::ParserError
+          @errors = {"response" => "Not JSON format; See response.body"}
+        end
         @response = response
         super("code: #{@code}")
       end

data/lib/heracles-wrapper/request/create_job.rb

@@ -31,10 +31,12 @@ class Heracles::Wrapper::Request::CreateJob
   def as_json
     {
       :api_key => config.api_key,
-      :workflow_name => workflow_name,
-      :parameters => parameters
+      :job => {
+        :workflow_name => workflow_name,
+        :parameters => parameters
+      }
     }.tap {|hash|
-      hash[:parent_job_id] = parent_job_id if parent_job_id
+      hash[:job][:parent_job_id] = parent_job_id if parent_job_id
     }
   end
 

data/lib/heracles-wrapper/request_success.rb

@@ -9,14 +9,14 @@ module Heracles
       attr_reader(
         :job_id,
         :location,
-        :messages,
+        :errors,
         :code
       )
       def initialize(http_response)
         super(http_response)
         @json = JSON.parse(http_response.body)
-        @job_id = @json.fetch('job_id').to_i
-        @messages = @json.fetch('messages',[]).to_a
+        @job_id = @json.fetch('job').fetch('id').to_i
+        @errors = @json.fetch('errors',{})
         @location = http_response.headers.fetch(:location)
         @code = http_response.code
       end

data/lib/heracles-wrapper/test_helper.rb

@@ -6,7 +6,7 @@ module Heracles::Wrapper
     RESPONSE_JOB_ID = 1234.freeze
     RESPONSE_CODE = 201.freeze
 
-    def with_heracles_service_failure_stub(service_name, messages = [])
+    def with_heracles_service_failure_stub(service_name, errors = [])
       wrap_service_with_proxy(service_name) do
         Heracles::Wrapper.send(
           "#{service_name}_service=",
@@ -18,7 +18,7 @@ module Heracles::Wrapper
               :parameters => options.fetch(:parameters, {})
             ).tap { |obj|
               def obj.call
-                raise Heracles::Wrapper::RequestFailure.new(messages)
+                raise Heracles::Wrapper::RequestFailure.new(errors)
               end
             }
           }
@@ -37,7 +37,7 @@ module Heracles::Wrapper
           "/jobs/#{response[:job_id]}"
         )
         response[:code] ||= RESPONSE_CODE
-        response[:messages] ||= []
+        response[:errors] ||= []
 
         Heracles::Wrapper.send(
           "#{service_name}_service=",

data/lib/heracles-wrapper/version.rb

@@ -1,5 +1,5 @@
 module Heracles
   module Wrapper
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/heracles-wrapper/exceptions_spec.rb

@@ -8,11 +8,20 @@ describe Heracles::Wrapper::RequestFailure do
       OpenStruct.new(:code => expected_code, :body => expected_body)
     }
     let(:expected_code) { 123 }
-    let(:expected_body) { 'Hello' }
-    it('has #code') { subject.code.must_equal expected_code }
-    it('has #messages') { subject.messages.must_equal expected_body }
-    it('has #response') { subject.response.must_equal response }
-    it('has #to_s') { subject.to_s.must_equal "code: #{expected_code}" }
+    describe 'without errors' do
+      let(:expected_body) { "{\"hello\":\"world\"}" }
+      it('has #code') { subject.code.must_equal expected_code }
+      it('has #errors') { subject.errors.must_equal({}) }
+      it('has #response') { subject.response.must_equal response }
+      it('has #to_s') { subject.to_s.must_equal "code: #{expected_code}" }
+    end
+    describe 'with errors' do
+      let(:expected_body) { "{\"errors\": {\"world\": 1}}" }
+      it('has #code') { subject.code.must_equal expected_code }
+      it('has #errors') { subject.errors.fetch('world').must_equal 1 }
+      it('has #response') { subject.response.must_equal response }
+      it('has #to_s') { subject.to_s.must_equal "code: #{expected_code}" }
+    end
   end
   describe 'poorly formed response as per a timeout' do
     subject { Heracles::Wrapper::RequestFailure.new(response) }
@@ -20,8 +29,8 @@ describe Heracles::Wrapper::RequestFailure do
     let(:expected_code) { 500 }
     let(:expected_body) { '' }
     it('has #code') { subject.code.must_equal expected_code }
-    it('has #messages') { subject.messages.must_equal expected_body }
+    it('has #errors') { subject.errors.must_equal({}) }
     it('has #response') { subject.response.must_equal response }
     it('has #to_s') { subject.to_s.must_equal "code: #{expected_code}" }
   end
-end
+end

data/spec/heracles-wrapper/request/create_job_spec.rb

@@ -41,7 +41,7 @@ describe 'Heracles::Wrapper::Request::CreateJob' do
       stub_request(:post, subject.url.to_s).
       to_return(
         {
-          :body => %({"job_id" : "#{expected_job_id}"}),
+          :body => %({"job" : { "id" : "#{expected_job_id}" } }),
           :status => 201,
           :headers => {
             :content_type => 'application/json',
@@ -58,14 +58,21 @@ describe 'Heracles::Wrapper::Request::CreateJob' do
       stub_request(:post, subject.url.to_s).to_timeout
       lambda {
         subject.call
-      }.must_raise Heracles::Wrapper::RequestFailure
+      }.must_raise(Heracles::Wrapper::RequestFailure)
     end
 
     it 'handles redirection' do
       stub_request(:post, subject.url.to_s).to_return(:status => 302)
       lambda {
         subject.call
-      }.must_raise Heracles::Wrapper::RequestFailure
+      }.must_raise(Heracles::Wrapper::RequestFailure)
+    end
+
+    it 'handles server error' do
+      stub_request(:post, subject.url.to_s).to_return(:status => 500)
+      lambda {
+        subject.call
+      }.must_raise(Heracles::Wrapper::RequestFailure)
     end
 
     it 'handles 404' do
@@ -116,8 +123,10 @@ describe 'Heracles::Wrapper::Request::CreateJob' do
         subject.as_json.must_equal(
           {
             :api_key => expected_api_key,
-            :workflow_name => expected_workflow_name,
-            :parameters => {}
+            :job => {
+              :workflow_name => expected_workflow_name,
+              :parameters => {}
+            }
           }
         )
       end
@@ -129,9 +138,11 @@ describe 'Heracles::Wrapper::Request::CreateJob' do
         subject.as_json.must_equal(
           {
             :api_key => expected_api_key,
-            :workflow_name => expected_workflow_name,
-            :parent_job_id => expected_parent_job_id,
-            :parameters => {}
+            :job => {
+              :workflow_name => expected_workflow_name,
+              :parent_job_id => expected_parent_job_id,
+              :parameters => {}
+            }
           }
         )
       end
@@ -153,8 +164,10 @@ describe 'Heracles::Wrapper::Request::CreateJob' do
         subject.as_json.must_equal(
           {
             :api_key => expected_api_key,
-            :workflow_name => expected_workflow_name,
-            :parameters => options[:parameters]
+            :job => {
+              :workflow_name => expected_workflow_name,
+              :parameters => options[:parameters]
+            }
           }
         )
       end

data/spec/heracles-wrapper/request_success_spec.rb

@@ -5,45 +5,72 @@ require File.expand_path('../../../lib/heracles-wrapper/config', __FILE__)
 require 'minitest/autorun'
 require 'webmock/minitest'
 require 'ostruct'
+require 'json'
 
 describe 'Heracles::Wrapper::RequestSuccess' do
   subject { Heracles::Wrapper::RequestSuccess.new(http_response) }
   let(:expected_job_id) { 1234 }
-  let(:expected_messages) { ['one message'] }
+  let(:expected_errors) { %({"name" : "one message"}) }
   let(:expected_code) { 201 }
   let(:expected_location) { 'http://somewhere.over/the/rainbown' }
-  let(:http_response) {
-    OpenStruct.new(
-      :body => %(
-        {
-          "job_id": #{expected_job_id},
-          "messages": #{expected_messages.inspect}
-        }
-      ),
-      :headers => { :location => expected_location },
-      :code => expected_code
-    ).tap { |obj|
-      def obj.foo_bar; 'Baz'; end
+  describe 'without errors' do
+    let(:http_response) {
+      OpenStruct.new(
+        :body => %(
+          {
+            "job": {
+              "id": #{expected_job_id}
+            }
+          }
+        ),
+        :headers => { :location => expected_location },
+        :code => expected_code
+      ).tap { |obj|
+        def obj.foo_bar; 'Baz'; end
+      }
     }
-  }
+    it 'has #errors' do
+      subject.errors.must_equal({})
+    end
 
-  it 'has #code' do
-    subject.code.must_equal expected_code
-  end
 
-  it 'has #job_id' do
-    subject.job_id.must_equal expected_job_id
   end
+  describe 'with errors' do
+    let(:http_response) {
+      OpenStruct.new(
+        :body => %(
+          {
+            "job": {
+              "id": #{expected_job_id}
+            },
+            "errors": #{expected_errors}
+          }
+        ),
+        :headers => { :location => expected_location },
+        :code => expected_code
+      ).tap { |obj|
+        def obj.foo_bar; 'Baz'; end
+      }
+    }
 
-  it 'has #location' do
-    subject.location.must_equal expected_location
-  end
+    it 'has #code' do
+      subject.code.must_equal expected_code
+    end
 
-  it 'has #messages' do
-    subject.messages.must_equal expected_messages
-  end
+    it 'has #job_id' do
+      subject.job_id.must_equal expected_job_id
+    end
+
+    it 'has #location' do
+      subject.location.must_equal expected_location
+    end
+
+    it 'has #errors' do
+      subject.errors.must_equal JSON.parse(expected_errors)
+    end
 
-  it 'delegates everything else to the http_response' do
-    subject.foo_bar.must_equal 'Baz'
+    it 'delegates everything else to the http_response' do
+      subject.foo_bar.must_equal 'Baz'
+    end
   end
 end

data/spec/heracles-wrapper/test_helper_spec.rb

@@ -43,7 +43,7 @@ describe Heracles::Wrapper::TestHelper do
           :create_job, input_parameters
         ).call
         @response.job_id.must_be_kind_of Fixnum
-        @response.messages.must_be_kind_of Array
+        @response.errors.must_be_kind_of Array
         @response.code.must_be_kind_of Fixnum
         @response.location.must_be_kind_of String
       end
@@ -73,7 +73,7 @@ describe Heracles::Wrapper::TestHelper do
       ).
       to_return(
         {
-          :body => %({"job_id" : "#{expected_job_id}"}),
+          :body => %({"job" : {"id" : "#{expected_job_id}"}}),
           :status => expected_code,
           :headers => {
             :content_type => 'application/json',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heracles-wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -936023584342832564
+      hash: 3196260337063136150
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -936023584342832564
+      hash: 3196260337063136150
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24