miasma 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70ab81fefcaa4ab8942ca15c53e1ad296a5d5938
-  data.tar.gz: b2042bdf52407d095767388854adad5d8783526a
+  metadata.gz: 2d96b86dbb247d22f846177758907886638e4eec
+  data.tar.gz: 5c052aae2f76878d06868e1c60daa01b38921fd2
 SHA512:
-  metadata.gz: 6cb01229d765fc2f5d66ba690848af6dc1af060641e4ce4d0d3d791d27051d0a35511077a2dcfdc7ef3cc6e74aee3a395cf61703f1a507b38ee130061b409b49
-  data.tar.gz: f83fc149fb9b9bac850ef563a17eb133472d281a65ac6ce3db66c32da4bb4e12b5d367b761e1b040ad4f01305977067d07dc70cde63d9534752a6148f62fbd3f
+  metadata.gz: 13d34cdd67c7bfea1470f25ffcd0a37a225a9900c59d1c49fa69a61e302e5dfa733f51c4d85ddd04e402b43e261f847bd2ba83c8b0899302a6cae25b933df57e
+  data.tar.gz: e7e9a45b0ea4380ba9474b2ba6cdf26f3265bdcff1ce2ebe68a4a193bf4f931b83f347668a8e8ddd6f6d02660d7c04ba3a6813bc8f4579df5b32405c6279c854

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.2.2
+* Add support for pre-signed AWS URLs
+* Add `#url` method to `Storage::File` model
+* Relax content-type checks on response for more reliable auto-parse (#2)
+* Basic abstract spec coverage on storage
+* Fix response body result by adding streaming detection
+
 # v0.2.0
 * Add initial OpenStack provider support
 * Refactor of Rackspace provider support (build off OpenStack)

data/lib/miasma/contrib/aws.rb

@@ -156,23 +156,52 @@ module Miasma
           @service = service
         end
 
-        # Generate the signature
+        # Generate the signature string for AUTH
         #
         # @param http_method [Symbol] HTTP request method
         # @param path [String] request path
         # @param opts [Hash] request options
         # @return [String] signature
         def generate(http_method, path, opts)
+          signature = generate_signature(http_method, path, opts)
+          "#{algorithm} Credential=#{access_key}/#{credential_scope}, SignedHeaders=#{signed_headers(opts[:headers])}, Signature=#{signature}"
+        end
+
+        # Generate URL with signed params
+        #
+        # @param http_method [Symbol] HTTP request method
+        # @param path [String] request path
+        # @param opts [Hash] request options
+        # @return [String] signature
+        def generate_url(http_method, path, opts)
+          opts[:params].merge!(
+            Smash.new(
+              'X-Amz-SignedHeaders' => signed_headers(opts[:headers]),
+              'X-Amz-Algorithm' => algorithm,
+              'X-Amz-Credential' => "#{access_key}/#{credential_scope}"
+            )
+          )
+          signature = generate_signature(http_method, path, opts.merge(:body => 'UNSIGNED-PAYLOAD'))
+          params = opts[:params].merge('X-Amz-Signature' => signature)
+          "https://#{opts[:headers]['Host']}/#{path}?#{canonical_query(params)}"
+        end
+
+        # Generate the signature
+        #
+        # @param http_method [Symbol] HTTP request method
+        # @param path [String] request path
+        # @param opts [Hash] request options
+        # @return [String] signature
+        def generate_signature(http_method, path, opts)
           to_sign = [
             algorithm,
             AwsApiCore.time_iso8601,
             credential_scope,
             hashed_canonical_request(
-              build_canonical_request(http_method, path, opts)
+              can_req = build_canonical_request(http_method, path, opts)
             )
           ].join("\n")
           signature = sign_request(to_sign)
-          "#{algorithm} Credential=#{access_key}/#{credential_scope}, SignedHeaders=#{signed_headers(opts[:headers])}, Signature=#{signature}"
         end
 
         # Sign the request
@@ -226,6 +255,9 @@ module Miasma
         # @param opts [Hash] request options
         # @return [String] canonical request string
         def build_canonical_request(http_method, path, opts)
+          unless(path.start_with?('/'))
+            path = "/#{path}"
+          end
           [
             http_method.to_s.upcase,
             path,
@@ -281,7 +313,11 @@ module Miasma
           elsif(options[:form])
             body = URI.encode_www_form(options[:form])
           end
-          hmac.hexdigest_of(body)
+          if(body == 'UNSIGNED-PAYLOAD')
+            body
+          else
+            hmac.hexdigest_of(body)
+          end
         end
 
       end

data/lib/miasma/contrib/aws/storage.rb

@@ -167,7 +167,7 @@ module Miasma
                 end
               end.compact
             ]
-            if(file.attributes[:body].is_a?(IO) && file.body.length >= 102400)
+            if(file.attributes[:body].is_a?(IO) && file.body.length >= Storage::MAX_BODY_SIZE_FOR_STRINGIFY)
               upload_id = request(
                 args.merge(
                   Smash.new(
@@ -182,7 +182,7 @@ module Miasma
               count = 1
               parts = []
               file.body.rewind
-              while(content = file.body.read(102400))
+              while(content = file.body.read(Storage::READ_BODY_CHUNK_SIZE))
                 parts << [
                   count,
                   request(
@@ -260,7 +260,7 @@ module Miasma
               :method => :delete,
               :path => file.name,
               :endpoint => bucket_endpoint(file.bucket),
-              :expect => 204
+              :expects => 204
             )
             true
           else
@@ -293,6 +293,28 @@ module Miasma
           file
         end
 
+        # Create publicly accessible URL
+        #
+        # @param timeout_secs [Integer] seconds available
+        # @return [String] URL
+        def file_url(file, timeout_secs)
+          if(file.persisted?)
+            signer.generate_url(
+              :get, ::File.join(uri_escape(file.bucket.name), uri_escape(file.name)),
+              :headers => Smash.new(
+                'Host' => aws_host
+              ),
+              :params => Smash.new(
+                'X-Amz-Date' => Contrib::AwsApiCore.time_iso8601,
+                'X-Amz-Expires' => timeout_secs
+              )
+
+            )
+          else
+            raise Error::ModelPersistError.new "#{file} has not been saved!"
+          end
+        end
+
         # Fetch the contents of the file
         #
         # @param file [Models::Storage::File]

data/lib/miasma/contrib/open_stack.rb

@@ -220,6 +220,7 @@ module Miasma
             attribute :open_stack_tenant_name, String
             attribute :open_stack_domain, String
             attribute :open_stack_project, String
+
           end
         end
 

data/lib/miasma/error.rb

@@ -87,5 +87,8 @@ module Miasma
     # Invalid modification request
     class ImmutableError < Error; end
 
+    # Model has not been persisted
+    class ModelPersistError < Error; end
+
   end
 end

data/lib/miasma/models/storage.rb

@@ -5,6 +5,11 @@ module Miasma
     # Abstract storage API
     class Storage < Types::Api
 
+      # @return [Integer] max bytes allowed for storing body in string
+      MAX_BODY_SIZE_FOR_STRINGIFY = 102400
+      # @return [Integer] chunking size for reading IO
+      READ_BODY_CHUNK_SIZE = 102400
+
       autoload :Buckets, 'miasma/models/storage/buckets'
       autoload :Bucket, 'miasma/models/storage/bucket'
       autoload :Files, 'miasma/models/storage/files'

data/lib/miasma/models/storage/file.rb

@@ -45,7 +45,13 @@ module Miasma
         # @note object returned will provide #readpartial
         def body
           unless(attributes[:body])
-            data[:body] ||= api.file_body(self)
+            begin
+              _body = api.file_body(self)
+              _body.stream!
+              data[:body] = api.file_body(self)
+            rescue HTTP::StateError
+              data[:body] = StringIO.new(_body.to_s)
+            end
           end
           attributes[:body]
         end
@@ -55,14 +61,37 @@ module Miasma
         # @param io [IO, String]
         # @return [IO]
         def body=(io)
-          unless(io.is_a?(IO))
+          unless(io.respond_to?(:readpartial))
             io = StringIO.new(io)
           end
           dirty[:body] = io
         end
 
+        # Create accessible URL
+        #
+        # @param timeout_in_seconds [Integer] optional if private (default: 60)
+        # @return [String] URL
+        def url(timeout_in_seconds=60)
+          perform_file_url(timeout_in_seconds)
+        end
+
+        # Destroy file
+        #
+        # @return [self]
+        def destroy
+          perform_destroy
+          data.clear
+          dirty.clear
+          self
+        end
+
         protected
 
+        # Proxy URL action up to the API
+        def perform_file_url(secs)
+          api.file_url(self, secs)
+        end
+
         # Proxy reload action up to the API
         def perform_reload
           api.file_reload(self)

data/lib/miasma/types/api.rb

@@ -118,13 +118,13 @@ module Miasma
       # @return [Smash]
       def format_response(result)
         extracted_headers = Smash[result.headers.map{|k,v| [Utils.snake(k), v]}]
-        if(extracted_headers[:content_type].to_s.end_with?('json'))
+        if(extracted_headers[:content_type].to_s.include?('json'))
           begin
             extracted_body = MultiJson.load(result.body.to_s).to_smash
           rescue MultiJson::ParseError
             extracted_body = result.body.to_s
           end
-        elsif(extracted_headers[:content_type].to_s.end_with?('xml'))
+        elsif(extracted_headers[:content_type].to_s.include?('xml'))
           begin
             extracted_body = MultiXml.parse(result.body.to_s).to_smash
           rescue MultiXml::ParseError

data/lib/miasma/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie