stacker_bee 2.1.0.pre180 → 2.1.0.pre181

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjM2MmUzMTI4NjMzMTkxMjUxOTAzYzk0NzBlN2ZmNGJlNDQ3NjFjYw==
+    NDBlNGIwYTAxNmY5Yjk5ZDVkZGZhNmQzMzc3NTlhMWZhN2Y2MDViMQ==
   data.tar.gz: !binary |-
-    Yjg3ZGM0M2E3MTU2Yzg1M2Q4YmY3NDZhZjMzNjRiYzIyOWY2ZjhmOQ==
+    ZTc3ZDY2NmRkNGJhMWJlMmUyOTJjMGEwOWYwOGMwMzMzNjAzN2RmMA==
 SHA512:
   metadata.gz: !binary |-
-    N2I1ODhiMTY2NWVhYmUxNzE4OWViNTVmZDY4MjgzM2QyOGI0MTkyZDdiNzY1
-    OTk1YjJiMGIzMDUyYmZlZDQ5NGY4OTQzYzNhMjExZjg5MDk4MDc3ZmZiNzg0
-    ZTEzZDAxNzdiOTcxMDM0OWM2ZmI1NGRkN2JmNzUxZWZhOGFmYjE=
+    ODQwYTg0ODAxNzBiZDFkODQyMzVhMjU1YTcyY2YwOGI0OGNjZTFlOGFlOTRj
+    MjQxN2M2N2U2ZDY4YmVhMDgxZWY1YmI4OTc4MWJlYWMyYjI4N2UxZjRlZGEw
+    MmIwMzlmOGJkMTE1ZWQ2Nzc1YmZmYTQzNGQzMzQ1OGMyMDg1ZGM=
   data.tar.gz: !binary |-
-    ZGIzOWIyYWM0MjZhYTBjOTNiZjVhOWUxZGJiNDg2NDA0MTE3NTM5NDUyN2Jl
-    ZGU1NzFjMzRhOTUzOTRmNTg4NjQ5NmE0MDBjYWU0NDZlYmExYjk0NDdlZTQ3
-    MmM0OGZmNTY1MmJlMWRjNzEwOGNjNjc5OGU4OTM4ODViZTUyYzA=
+    MDM2NTkxMWY4NDg0ZDQ0MzczYjBkYWMwZmYzODE5MDNjZTRkNTViMmM3MDQz
+    NTFjNzA5NzdiZjNjZmVlZmY2ZDQ4NGVmYTRkNWZjOTIwZjU2NTQwYjg1ZjNi
+    MzVkYjU1OTQ4ZGYwMWIyNzUxNThlNTVmMjZjNDdkZGJmNTRmYjg=

data/lib/stacker_bee/connection.rb

@@ -17,8 +17,11 @@ module StackerBee
       uri.path = ''
       fail ConnectionError, "no protocol specified" unless uri.scheme
 
-      ssl_verify = !configuration.ssl_verify.nil? ?
-        configuration.ssl_verify : true
+      ssl_verify = if !configuration.ssl_verify.nil?
+                     configuration.ssl_verify
+                   else
+                     true
+                   end
 
       initialize_faraday(url: uri.to_s,
                          ssl: { verify: ssl_verify })
@@ -31,14 +34,14 @@ module StackerBee
 
         configuration.faraday_middlewares.call faraday
 
-        unless has_adapter?(faraday.builder.handlers)
+        unless using_adapter?(faraday.builder.handlers)
           faraday.adapter  Faraday.default_adapter  # Net::HTTP
         end
       end
     end
 
-    def has_adapter?(handlers)
-      handlers.detect do |handler|
+    def using_adapter?(handlers)
+      handlers.find do |handler|
         handler.klass.ancestors.include?(Faraday::Adapter)
       end
     end
@@ -47,7 +50,7 @@ module StackerBee
       @faraday.get(path, params)
     rescue Faraday::Error::ConnectionFailed => error
       raise ConnectionError,
-        "Failed to connect to #{configuration.url}, #{error}"
+            "Failed to connect to #{configuration.url}, #{error}"
     end
   end
 end

data/lib/stacker_bee/middleware/clean_response.rb

@@ -4,20 +4,20 @@ module StackerBee
       def after(env)
         body = env.response.body
 
-        return if !is_hash?(body)
+        return unless hash?(body)
 
-        if has_count?(body)
-          env.response.body =remove_count(body)
+        if contains_count?(body)
+          env.response.body = remove_count(body)
         elsif single_hash?(body)
           env.response.body = first_hash(body)
         end
       end
 
-      def is_hash?(body)
+      def hash?(body)
         body.respond_to?(:keys)
       end
 
-      def has_count?(body)
+      def contains_count?(body)
         body.size == 2 && body.key?("count")
       end
 
@@ -39,4 +39,3 @@ module StackerBee
     end
   end
 end
-

data/lib/stacker_bee/middleware/dictionary_flattener.rb

@@ -27,7 +27,9 @@ module StackerBee
         hashes.each do |hash_name, hash|
           remove_empties(hash).each_with_index do |(key, value), index|
             hash_url_key = self.class.tokenize("#{hash_name}[#{index}]")
-            params["#{hash_url_key}.key"] = params["#{hash_url_key}.name"] = key
+
+            params["#{hash_url_key}.key"]   = key
+            params["#{hash_url_key}.name"]  = key
             params["#{hash_url_key}.value"] = value
           end
           params.delete hash_name
@@ -39,6 +41,5 @@ module StackerBee
         hash.reject { |_, v| v.nil? || v == "" }
       end
     end
-
   end
 end

data/lib/stacker_bee/middleware/endpoint_normalizer.rb

@@ -3,9 +3,7 @@ module StackerBee
     class EndpointNormalizer < Base
       def before(env)
         new_endpoint_name = endpoint_name_for(env.request.endpoint_name)
-        if new_endpoint_name
-          env.request.endpoint_name = new_endpoint_name
-        end
+        env.request.endpoint_name = new_endpoint_name if new_endpoint_name
       end
 
       def endpoint_name_for(name)

data/spec/integration/console_spec.rb

@@ -16,6 +16,6 @@ describe "A request sent to CloudStack for console access", :vcr do
   subject(:console_access) { client.console_access(vm: vm) }
 
   it "returns html for console access" do
-    expect(console_access).to match %r{<html>.*<frame src=.*</html>}
+    expect(console_access).to match(/<html>.*<frame src=.*<\/html>/)
   end
 end

data/spec/integration/request_spec.rb

@@ -12,7 +12,7 @@ describe "A response to a request sent to the CloudStack API", :vcr do
       middlewares: middlewares
     }
   end
-  let(:middlewares) { proc { } }
+  let(:middlewares) { proc {} }
 
   let(:client) do
     StackerBee::Client.new(config_hash)

data/spec/units/stacker_bee/client_spec.rb

@@ -16,11 +16,11 @@ describe StackerBee::Client, "calling endpoint" do
   let(:client) do
     StackerBee::Client.new(
       url: "http://example.com",
-      middlewares: ->(builder) do
+      middlewares: lambda do |builder|
         builder.before middleware_class,
-          expected_endpoint_name: endpoint_name,
-          expected_params:        params,
-          response_body:          response_body
+                       expected_endpoint_name: endpoint_name,
+                       expected_params:        params,
+                       response_body:          response_body
       end
     )
   end
@@ -28,8 +28,8 @@ describe StackerBee::Client, "calling endpoint" do
   let(:middleware_class) do
     Class.new StackerBee::Middleware::Base do
       def call(env)
-        raise unless env.request.endpoint_name == expected_endpoint_name
-        raise unless env.request.params == expected_params
+        fail unless env.request.endpoint_name == expected_endpoint_name
+        fail unless env.request.params == expected_params
 
         env.response.body = response_body
       end
@@ -60,7 +60,6 @@ describe StackerBee::Client, "calling endpoint" do
   end
 end
 
-
 describe StackerBee::Client, "configuration" do
   let(:default_url)         { "default_cloud-stack.com" }
   let(:default_api_key)     { "default-cloud-stack-api-key" }

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

@@ -17,7 +17,7 @@ describe StackerBee::Middleware::Adapter do
   let(:middleware) { described_class.new(app: app, connection: connection) }
 
   let(:raw_response) do
-    double(env: { response_headers: response_headers}, body: response_body)
+    double(env: { response_headers: response_headers }, body: response_body)
   end
   let(:response_headers) { { "content-type" => content_type } }
   let(:content_type) { "text/javascript; charset=UTF-8"  }
@@ -43,7 +43,7 @@ describe StackerBee::Middleware::Adapter do
     end
 
     it "sorts the paramers" do
-      connection.should have_received(:get).with([["a", "a"], ["z", "z"]], path)
+      connection.should have_received(:get).with([%w(a a), %w(z z)], path)
     end
   end
 

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

@@ -11,7 +11,7 @@ describe StackerBee::Middleware::Base do
   let(:middleware) { subclass.new(app: app) }
 
   let(:subclass) { Class.new(StackerBee::Middleware::Base, &subclass_body) }
-  let(:subclass_body) { proc { } }
+  let(:subclass_body) { proc {} }
 
   describe "#call" do
     before do

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

@@ -34,4 +34,3 @@ describe StackerBee::Middleware::CloudStackAPI do
     its([:command])  { should eq "endpoint-name" }
   end
 end
-

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

@@ -42,9 +42,8 @@ describe StackerBee::Middleware::ConsoleAccess do
   describe "#endpoint_name_for" do
     context "given names it reponds to" do
       %w[consoleAccess console_access CONSOLEACCESS].each do |name|
-        it "returns consoleAccess for '#{name}'" do
-          middleware.endpoint_name_for(name).should == described_class::ENDPOINT
-        end
+        subject { middleware.endpoint_name_for(name) }
+        it { should eq described_class::ENDPOINT }
       end
     end
 

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

@@ -6,7 +6,7 @@ describe StackerBee::Middleware::FormatValues do
   let(:params) do
     {
       single: 1,
-      list:  [1,2,3]
+      list:  [1, 2, 3]
     }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stacker_bee
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre180
+  version: 2.1.0.pre181
 platform: ruby
 authors:
 - Greg Sterndale
@@ -226,7 +226,6 @@ files:
 - spec/cassettes/A_response_to_a_request_sent_to_the_CloudStack_API/space_character_in_a_request_parameter/properly_signs_the_request.yml
 - spec/fixtures/4.2.json
 - spec/fixtures/simple.json
-- spec/integration/check_spec.rb
 - spec/integration/configure_middleware_spec.rb
 - spec/integration/console_spec.rb
 - spec/integration/request_spec.rb
@@ -300,7 +299,6 @@ test_files:
 - spec/cassettes/A_response_to_a_request_sent_to_the_CloudStack_API/space_character_in_a_request_parameter/properly_signs_the_request.yml
 - spec/fixtures/4.2.json
 - spec/fixtures/simple.json
-- spec/integration/check_spec.rb
 - spec/integration/configure_middleware_spec.rb
 - spec/integration/console_spec.rb
 - spec/integration/request_spec.rb

data/spec/integration/check_spec.rb

@@ -1,48 +0,0 @@
-if false
-require 'spec_helper'
-
-describe "Client initialization configures the middleware" do
-  context "pass a new middleware to the client" do
-    subject { StackerBee::Client.new(config_hash) }
-
-    let(:url) { CONFIG["url"] }
-    let(:config_hash) do
-      {
-        url:        url,
-        api_key:    api_key,
-        secret_key: secret_key,
-        apis_path:  File.join(File.dirname(__FILE__), '../fixtures/4.2.json'),
-        faraday_middlewares: ->(faraday) { faraday.use middleware_class }
-      }
-    end
-
-    let(:middleware_class) do
-      Class.new(Faraday::Middleware) do
-        def call(env)
-          $query = env[:url].query
-          fail "MiddlewareUsed"
-        end
-      end
-    end
-
-    before do
-      $query = nil
-    end
-
-    data = JSON.parse(File.read("/Users/mike/Desktop/stuff.json"))
-    data.each do |request|
-      context "something" do
-        let(:api_key)    { request["config"]["api_key"] }
-        let(:secret_key) { request["config"]["secret_key"] }
-        it do
-          expect {
-            subject.request(*request["input"])
-          }.to raise_exception "MiddlewareUsed"
-
-          $query.should == request["query"]
-        end
-      end
-    end
-  end
-end
-end