miasma 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d96b86dbb247d22f846177758907886638e4eec
-  data.tar.gz: 5c052aae2f76878d06868e1c60daa01b38921fd2
+  metadata.gz: d32bced5ab7a65f5cec7aae1a717904e71dc8a94
+  data.tar.gz: 53581473453536b82a3afd67a9bd754f1ee43446
 SHA512:
-  metadata.gz: 13d34cdd67c7bfea1470f25ffcd0a37a225a9900c59d1c49fa69a61e302e5dfa733f51c4d85ddd04e402b43e261f847bd2ba83c8b0899302a6cae25b933df57e
-  data.tar.gz: e7e9a45b0ea4380ba9474b2ba6cdf26f3265bdcff1ce2ebe68a4a193bf4f931b83f347668a8e8ddd6f6d02660d7c04ba3a6813bc8f4579df5b32405c6279c854
+  metadata.gz: 4b02c183a44ba32b24e20f72260f6a89ed84c88efab319955326fc0fef4a0543fea459262ceec9ac32da60a05a52dbd7f508270bb557dda8e59ebb0e33f77651
+  data.tar.gz: 6b72a033e7ef5293dd764c92da47abe2faaaf1024359d88b1781d2682e541de304015d7c62948f621195c82c90f24f8f6e265b6db6295cc152920520bfc5d288

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.4
+* Make `Storage::File#body` setup provider responsibility
+* Fix module usage within RS to properly squash existing methods
+* Allow RS identity to be shared where applicable
+* Fix creation time attribute population of stacks within OpenStack provider
+
 # v0.2.2
 * Add support for pre-signed AWS URLs
 * Add `#url` method to `Storage::File` model

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

@@ -52,7 +52,7 @@ module Miasma
                 'KeepRoot' => true
               )
               req_args[:headers] = Smash.new(
-                'Content-Length' => req_args[:body].length.to_s
+                'Content-Length' => req_args[:body].size.to_s
               )
             end
             request(req_args)
@@ -167,11 +167,11 @@ module Miasma
                 end
               end.compact
             ]
-            if(file.attributes[:body].is_a?(IO) && file.body.length >= Storage::MAX_BODY_SIZE_FOR_STRINGIFY)
+            if(file.attributes[:body].is_a?(IO) && file.body.size >= Storage::MAX_BODY_SIZE_FOR_STRINGIFY)
               upload_id = request(
                 args.merge(
                   Smash.new(
-                    :path => uri_escape(file.name),
+                    :path => file_path(file),
                     :endpoint => bucket_endpoint(bucket),
                     :params => {
                       :uploads => true
@@ -187,7 +187,7 @@ module Miasma
                   count,
                   request(
                     :method => :put,
-                    :path => uri_escape(file.name),
+                    :path => file_path(file),
                     :endpoint => bucket_endpoint(bucket),
                     :headers => Smash.new(
                       'Content-Length' => content.size,
@@ -215,7 +215,7 @@ module Miasma
               )
               result = request(
                 :method => :post,
-                :path => uri_escape(file.name),
+                :path => file_path(file),
                 :endpoint => bucket_endpoint(file.bucket),
                 :params => Smash.new(
                   'UploadId' => upload_id
@@ -228,7 +228,7 @@ module Miasma
               file.etag = result.get(:body, 'CompleteMultipartUploadResult', 'ETag')
             else
               if(file.attributes[:body].is_a?(IO) || file.attributes[:body].is_a?(StringIO))
-                args[:headers]['Content-Length'] = file.body.length.to_s
+                args[:headers]['Content-Length'] = file.body.size.to_s
                 file.body.rewind
                 args[:body] = file.body.read
                 file.body.rewind
@@ -237,7 +237,7 @@ module Miasma
                 args.merge(
                   Smash.new(
                     :method => :put,
-                    :path => uri_escape(file.name),
+                    :path => file_path(file),
                     :endpoint => bucket_endpoint(file.bucket)
                   )
                 )
@@ -258,7 +258,7 @@ module Miasma
           if(file.persisted?)
             request(
               :method => :delete,
-              :path => file.name,
+              :path => file_path(file),
               :endpoint => bucket_endpoint(file.bucket),
               :expects => 204
             )
@@ -276,7 +276,7 @@ module Miasma
           if(file.persisted?)
             name = file.name
             result = request(
-              :path => uri_escape(file.name),
+              :path => file_path(file),
               :endpoint => bucket_endpoint(file.bucket)
             )
             file.data.clear && file.dirty.clear
@@ -300,7 +300,7 @@ module Miasma
         def file_url(file, timeout_secs)
           if(file.persisted?)
             signer.generate_url(
-              :get, ::File.join(uri_escape(file.bucket.name), uri_escape(file.name)),
+              :get, ::File.join(uri_escape(file.bucket.name), file_path(file)),
               :headers => Smash.new(
                 'Host' => aws_host
               ),
@@ -322,11 +322,20 @@ module Miasma
         def file_body(file)
           if(file.persisted?)
             result = request(
-              :path => uri_escape(file.name),
+              :path => file_path(file),
               :endpoint => bucket_endpoint(file.bucket)
             )
             content = result[:body]
-            content.is_a?(String) ? StringIO.new(content) : content
+            begin
+              if(content.is_a?(String))
+                StringIO.new(content)
+              else
+                content.stream!
+                content
+              end
+            rescue HTTP::StateError
+              StringIO.new(content.to_s)
+            end
           else
             StringIO.new('')
           end
@@ -346,6 +355,13 @@ module Miasma
           true
         end
 
+        # @return [String] escaped file path
+        def file_path(file)
+          file.name.split('/').map do |part|
+            uri_escape(part)
+          end.join('/')
+        end
+
       end
     end
   end

data/lib/miasma/contrib/open_stack.rb

@@ -220,7 +220,6 @@ module Miasma
             attribute :open_stack_tenant_name, String
             attribute :open_stack_domain, String
             attribute :open_stack_project, String
-
           end
         end
 
@@ -260,6 +259,8 @@ module Miasma
         'identity' => 'keystone'
       )
 
+      include Miasma::Utils::Memoization
+
       # @return [Miasma::Contrib::OpenStackApiCore::Authenticate]
       attr_reader :identity
 
@@ -269,10 +270,15 @@ module Miasma
       # @return [self]
       def initialize(creds)
         @credentials = creds
+        memo_key = "miasma_open_stack_identity_#{creds.checksum}"
         if(creds[:open_stack_identity_url].include?('v3'))
-          @identity = identity_class('Authenticate::Version3').new(creds)
+          @identity = memoize(memo_key, :direct) do
+            identity_class('Authenticate::Version3').new(creds)
+          end
         elsif(creds[:open_stack_identity_url].include?('v2'))
-          @identity = identity_class('Authenticate::Version2').new(creds)
+          @identity = memoize(memo_key, :direct) do
+            identity_class('Authenticate::Version2').new(creds)
+          end
         else
           # @todo allow attribute to override?
           raise ArgumentError.new('Failed to determine Identity service version')

data/lib/miasma/contrib/open_stack/orchestration.rb

@@ -160,7 +160,7 @@ module Miasma
             Stack.new(
               self,
               :id => s[:id],
-              :creation_time => Time.parse(s[:creation_time]),
+              :created => Time.parse(s[:creation_time]),
               :description => s[:description],
               :name => s[:stack_name],
               :state => s[:stack_status].downcase.to_sym,

data/lib/miasma/contrib/rackspace.rb

@@ -33,21 +33,29 @@ module Miasma
         # @param klass [Class]
         def self.included(klass)
           klass.attributes.clear
+
           klass.class_eval do
             attribute :rackspace_api_key, String, :required => true
             attribute :rackspace_username, String, :required => true
             attribute :rackspace_region, String, :required => true
-          end
-        end
 
-        # @return [Miasma::Contrib::RackspaceApiCore]
-        def open_stack_api
-          key = "miasma_rackspace_api_#{attributes.checksum}".to_sym
-          memoize(key, :direct) do
-            Miasma::Contrib::RackspaceApiCore.new(attributes)
+            # @return [Miasma::Contrib::RackspaceApiCore]
+            def open_stack_api
+              key = "miasma_rackspace_api_#{attributes.checksum}".to_sym
+              memoize(key, :direct) do
+                Miasma::Contrib::RackspaceApiCore.new(attributes)
+              end
+            end
+
+            # @return [String]
+            def open_stack_region
+              rackspace_region
+            end
+
           end
         end
 
+
       end
 
       # @return [Smash] Authentication endpoints

data/lib/miasma/contrib/rackspace/auto_scale.rb

@@ -5,6 +5,7 @@ module Miasma
     class AutoScale
       class Rackspace < AutoScale
 
+        include Contrib::OpenStackApiCore::ApiCommon
         include Contrib::RackspaceApiCore::ApiCommon
 
         # Save auto scale group

data/lib/miasma/contrib/rackspace/load_balancer.rb

@@ -5,6 +5,7 @@ module Miasma
     class LoadBalancer
       class Rackspace < LoadBalancer
 
+        include Contrib::OpenStackApiCore::ApiCommon
         include Contrib::RackspaceApiCore::ApiCommon
 
         # Save load balancer

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

@@ -45,13 +45,7 @@ module Miasma
         # @note object returned will provide #readpartial
         def body
           unless(attributes[:body])
-            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
+            data[:body] = api.file_body(self)
           end
           attributes[:body]
         end

data/lib/miasma/utils/lazy.rb

@@ -222,7 +222,11 @@ module Miasma
             class << self
 
               def inherited(klass)
-                klass.set_attributes(self.attributes)
+                klass.set_attributes(
+                  MultiJson.load(
+                    MultiJson.dump(self.attributes)
+                  ).to_smash
+                )
               end
 
             end

data/lib/miasma/version.rb

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

metadata

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