miasma 0.2.26 → 0.2.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2845acc35f272e51fc8089eee658042c7a6d4b3
-  data.tar.gz: 52ac10e0bd6fb1cd6d69adbe3964a7843d4ffd47
+  metadata.gz: 3b2d18aa4668b4cd91f5d0c98895983fbded4a0d
+  data.tar.gz: 203bbd13208a023c62f71d6c30d034df3043af82
 SHA512:
-  metadata.gz: dc57cc9f7fcaee18c30a50729fa3e51af1c44347474db1eb2fcec9bc79d82ad7456bca2fc397dc3264c32f5e201e9c3d4bbf9e77277a4d5f5feb066a4d864cf7
-  data.tar.gz: bf0e77ce3a6ef2f6a9850bfbc25add286114236934c01dc664b46e03db7eabd04c4caa38ba46099aa012762da5c2dc06b187952b4df1a8a4276501e1aac55a60
+  metadata.gz: 5ff97e15e0702de0fb9606bcba54de85730416d666235dfe70050d2a19c2d88202d70228e511fbd5626d0b4d575fb82d06b09b27ecdba5452c7f507e1c63b2eb
+  data.tar.gz: c8873ed07fb88bf5375f1b2f2db2f21647dbf22bfcdc1e0d7f1a1f6dd663f1299fcc2191bfc9eb1f74b952f6a7795616bb15c7985af50d8beccc1b40939fbfee

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.2.28
+* Include original exception information on API load failures
+* Provide better retry functionality on non-modify requests
+
 # v0.2.26
 * Update Collection#get to not match name if nil
 

data/lib/miasma.rb

@@ -48,7 +48,7 @@ module Miasma
         raise Error.new "Failed to locate requested API type #{args[:type].inspect} for #{args[:provider].inspect}"
       end
     rescue NameError => e
-      raise Error.new "Failed to locate requested API type #{args[:type].inspect}"
+      raise Error.new "Failed to load requested API type #{args[:type].inspect} (Reason: #{e.class} - #{e})"
     end
   end
 

data/lib/miasma/types/api.rb

@@ -10,8 +10,6 @@ module Miasma
       VALID_REQUEST_RETRY_METHODS=[:get, :head]
       # Maximum allowed HTTP request retries (for non-HTTP related errors)
       MAX_REQUEST_RETRIES=5
-      # Seconds to pause between retries
-      REQUEST_RETRY_DELAY=0.5
 
       include Miasma::Utils::Lazy
       include Miasma::Utils::Memoization
@@ -111,10 +109,11 @@ module Miasma
           _connection = connection
         end
         result = retryable_request(http_method) do
-          make_request(_connection, http_method, request_args)
-        end
-        unless([args.fetch(:expects, 200)].flatten.compact.map(&:to_i).include?(result.code))
-          raise Error::ApiError::RequestError.new(result.reason, :response => result)
+          res = make_request(_connection, http_method, request_args)
+          unless([args.fetch(:expects, 200)].flatten.compact.map(&:to_i).include?(res.code))
+            raise Error::ApiError::RequestError.new(res.reason, :response => res)
+          end
+          res
         end
         format_response(result, !args[:disable_body_extraction])
       end
@@ -126,19 +125,15 @@ module Miasma
       # @param http_method [Symbol] HTTP request method
       # @yield request to be retried if allowed
       # @return [Object] result of block
-      def retryable_request(http_method)
-        attempts = VALID_REQUEST_RETRY_METHODS.include?(http_method) ? 0 :nil
-        begin
-          yield
-        rescue => e
-          if(attempts && attempts < MAX_REQUEST_RETRIES)
-            attempts += 1
-            sleep REQUEST_RETRY_DELAY
-            retry
-          else
-            raise
-          end
-        end
+      def retryable_request(http_method, &block)
+        Bogo::Retry.build(
+          data.fetch(:retry_type, :exponential),
+          :max_attempts => VALID_REQUEST_RETRY_METHODS.include?(http_method) ? data.fetch(:retry_max, MAX_REQUEST_RETRIES) : 1,
+          :wait_interval => data[:retry_interval],
+          :ui => data[:retry_ui],
+          :auto_run => false,
+          &block
+        ).run!
       end
 
       # Perform request

data/lib/miasma/version.rb

@@ -1,4 +1,4 @@
 module Miasma
   # current library version
-  VERSION = Gem::Version.new('0.2.26')
+  VERSION = Gem::Version.new('0.2.28')
 end

data/miasma.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'multi_json'
   s.add_runtime_dependency 'multi_xml'
   s.add_runtime_dependency 'xml-simple'
-  s.add_runtime_dependency 'bogo', '>= 0.1.20', '< 1.0'
+  s.add_runtime_dependency 'bogo', '>= 0.1.27', '< 1.0'
   # Include provider libs that do not have outside deps
   s.add_runtime_dependency 'miasma-aws'
   s.add_runtime_dependency 'miasma-open-stack'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma
 version: !ruby/object:Gem::Version
-  version: 0.2.26
+  version: 0.2.28
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -72,7 +72,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.27
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.27
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -262,3 +262,4 @@ signing_key:
 specification_version: 4
 summary: Smoggy API
 test_files: []
+has_rdoc: