stacker_bee 2.1.0.pre227 → 2.1.0.pre228

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmIxNjBiNGExMjdmODM0MGRjMmE5MWE2YWQ1ZjNhYzVhYzAwNDM3NQ==
+    MDA2ODU4ZTIwYTgxMmFlYTIwZGNlYzJmNTg1MGUzNDg5NThlMjRjYg==
   data.tar.gz: !binary |-
-    NWQwY2I1MmZlZjBmMGQwMGQ4OTVlNGNhMWMxY2YzMWY5MzA3YTlhOA==
+    ZDMxMDUyNWFmZTc1ZTY2ZGQ2NTNmZGFmOGQ0MGY5NGFjZTRmZGM4YQ==
 SHA512:
   metadata.gz: !binary |-
-    MTM1YWVhMTFjNmY2MTAxZjk5MDZkZmNhNmE4YTBhZjUwMmU4ZTIxZWU4MzYz
-    YWI0ODFlNDk2ZmQyN2FlMTFmMzJiZjc5ZDlkZGNiZmRlMmVlYWM5NWU2OTAy
-    NzUxNGUyODE3Y2U1MWUwZGUxZDRhNzQ2OGFhMDMxZDM1MmVkYTM=
+    OGRmMjc5NWY5MGUzYTY0NzhjY2FmNTNjOThkODYxODk1MjdlODQ3MDFmODkx
+    MWQwMjY2NmFjYTEwOWJjZmUwODZhNTNlZTE4MTgxZjU1MzNmOTMzZjI4NWIz
+    YjNmZGZjNTM3MzI4MTM3MDliOTkxNDhlY2VkY2IzNjQxYmI5ZGY=
   data.tar.gz: !binary |-
-    NGVhYzA2MDM4MTU1M2YxZjgxZGVhMGRhZjJhNGJmNmE4YzY1YTM1MmRlOWIx
-    YjM0NTlmZDUyMzcyMjg4ZWZhOWVmM2RkMTNhNmMyMTliY2FkYjM0MDA0Njg4
-    MmFlNjBkNjM2Yzc0ZjUzNzgzMDIxMjc2MmJiNDhlYzczZjc2ZjE=
+    ZTM0ZGJjNGIxYjk5YjdkMDRkZWJhMGE1ZWE5Y2RkNzIwNTQ3OWI3YzExN2Rh
+    YWJkOGZmNmVhNmRlMmM3NDRjMWU3ZjgzZDcxMzcxY2U5NmEwZjMzODFlZDUy
+    MDk5YWM3NTA5OTRmODU1Mzc5NzY4NjM4NjMxODMwMDAxYjJiMWQ=

data/lib/stacker_bee/client.rb

@@ -20,6 +20,7 @@ require "stacker_bee/middleware/clean_response"
 require "stacker_bee/middleware/raise_on_http_error"
 require "stacker_bee/middleware/http_status"
 require "stacker_bee/middleware/console_access"
+require "stacker_bee/middleware/error_message"
 
 # rubocop:disable ClassLength
 module StackerBee
@@ -46,6 +47,7 @@ module StackerBee
 
       # response
       builder.use Middleware::RaiseOnHTTPError
+      builder.use Middleware::ErrorMessage
       builder.use Middleware::HTTPStatus
       builder.use Middleware::CleanResponse
       builder.use Middleware::RashifyResponse

data/lib/stacker_bee/middleware/error_message.rb

@@ -0,0 +1,15 @@
+module StackerBee
+  module Middleware
+    class ErrorMessage < Base
+      def after(env)
+        unless env.response.success?
+          env.response.error = env.response.body[:errortext]
+        end
+      end
+
+      def content_types
+        /javascript/
+      end
+    end
+  end
+end

data/lib/stacker_bee/middleware/http_status.rb

@@ -4,10 +4,6 @@ module StackerBee
       def after(env)
         env.response.status  = env.raw_response.status
         env.response.success = env.raw_response.success?
-
-        unless env.response.success?
-          env.response.error = env.response.body[:errortext]
-        end
       end
     end
   end

data/spec/units/stacker_bee/middleware/error_message_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe StackerBee::Middleware::ErrorMessage do
+  subject { env.response }
+  before { middleware.after(env) }
+
+  let(:middleware) { described_class.new }
+  let(:env) do
+    StackerBee::Middleware::Environment.new.tap do |env|
+      env.response.body    = body
+      env.response.success = is_success?
+    end
+  end
+  let(:body) { { errortext: message } }
+  let(:message) { "Unable to execute API command deployvirtualmachine " }
+  let(:is_success?) { true }
+
+  it "doesn't apply to HTML responses" do
+    middleware.content_types.should_not match("text/html; charset=utf-8")
+  end
+  it "applies to JSON responses" do
+    middleware.content_types.should match("text/javascript; charset=utf-8")
+  end
+
+  context "given an error" do
+    let(:is_success?) { false }
+    its(:error) { should eq message }
+  end
+
+  context "given a success" do
+    let(:is_success?) { true }
+    its(:error) { should be_nil }
+  end
+end

data/spec/units/stacker_bee/middleware/http_status_spec.rb

@@ -11,15 +11,13 @@ describe StackerBee::Middleware::HTTPStatus do
       env.response.body = body
     end
   end
-  let(:body) { { errorcode: http_status, errortext: message } }
-  let(:message) { "Unable to execute API command deployvirtualmachine " }
+  let(:body) { { errorcode: http_status } }
 
   context "given an error" do
     let(:http_status) { 431 }
     let(:success?) { false }
 
     its(:status) { should eq http_status }
-    its(:error) { should eq message }
     it { should_not be_success }
   end
 
@@ -28,7 +26,6 @@ describe StackerBee::Middleware::HTTPStatus do
     let(:success?) { true }
 
     its(:status) { should eq http_status }
-    its(:error) { should be_nil }
     it { should be_success }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stacker_bee
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre227
+  version: 2.1.0.pre228
 platform: ruby
 authors:
 - Greg Sterndale
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -195,6 +195,7 @@ files:
 - lib/stacker_bee/middleware/dictionary_flattener.rb
 - lib/stacker_bee/middleware/endpoint_normalizer.rb
 - lib/stacker_bee/middleware/environment.rb
+- lib/stacker_bee/middleware/error_message.rb
 - lib/stacker_bee/middleware/format_keys.rb
 - lib/stacker_bee/middleware/format_values.rb
 - lib/stacker_bee/middleware/http_status.rb
@@ -243,6 +244,7 @@ files:
 - spec/units/stacker_bee/middleware/console_access_spec.rb
 - spec/units/stacker_bee/middleware/dictionary_flattener_spec.rb
 - spec/units/stacker_bee/middleware/endpoint_normalizer_spec.rb
+- spec/units/stacker_bee/middleware/error_message_spec.rb
 - spec/units/stacker_bee/middleware/format_keys_spec.rb
 - spec/units/stacker_bee/middleware/format_values_spec.rb
 - spec/units/stacker_bee/middleware/http_status_spec.rb
@@ -315,6 +317,7 @@ test_files:
 - spec/units/stacker_bee/middleware/console_access_spec.rb
 - spec/units/stacker_bee/middleware/dictionary_flattener_spec.rb
 - spec/units/stacker_bee/middleware/endpoint_normalizer_spec.rb
+- spec/units/stacker_bee/middleware/error_message_spec.rb
 - spec/units/stacker_bee/middleware/format_keys_spec.rb
 - spec/units/stacker_bee/middleware/format_values_spec.rb
 - spec/units/stacker_bee/middleware/http_status_spec.rb