miasma 0.1.0 → 0.2.0

data/lib/miasma/error.rb

@@ -29,6 +29,7 @@ module Miasma
       def initialize(msg, args={})
         super
         @response = args.to_smash[:response]
+        @message = msg
         extract_error_message(@response)
       end
 
@@ -54,9 +55,11 @@ module Miasma
           rescue MultiJson::ParseError
             begin
               content = MultiXml.parse(response.body.to_s).to_smash
-              if(content.get('ErrorResponse', 'Error'))
-                @response_error_msg = "#{content.get('ErrorResponse', 'Error', 'Code')}: #{content.get('ErrorResponse', 'Error', 'Message')}"
-              end
+              @response_error_msg = [['ErrorResponse', 'Error'], ['Error']].map do |path|
+                if(result = content.get(*path))
+                  "#{result['Code']}: #{result['Message']}"
+                end
+              end.compact.first
             rescue MultiXml::ParseError
               content = Smash.new
             end
@@ -78,8 +81,7 @@ module Miasma
     # Orchestration error
     class OrchestrationError < Error
       # Template failed to validate
-      class InvalidTemplate < OrchestrationError
-      end
+      class InvalidTemplate < OrchestrationError; end
     end
 
     # Invalid modification request

data/lib/miasma/models/orchestration/resource.rb

@@ -14,7 +14,7 @@ module Miasma
           attribute :state, Symbol, :required => true, :allowed_values => Orchestration::VALID_RESOURCE_STATES
           attribute :status, [String, Symbol], :required => true, :coerce => lambda{|v| v.to_s.to_sym}
           attribute :status_reason, String
-          attribute :updated_time, Time, :coerce => lambda{|v| Time.parse(v.to_s)}
+          attribute :updated, Time, :coerce => lambda{|v| Time.parse(v.to_s)}
 
           attr_reader :stack
 

data/lib/miasma/models/orchestration/stack.rb

@@ -35,8 +35,8 @@ module Miasma
         attribute :outputs, Output, :coerce => lambda{|v, stack| Output.new(stack, v) }, :multiple => true
         attribute :status, String
         attribute :status_reason, String
-        attribute :creation_time, Time, :coerce => lambda{|v| Time.parse(v.to_s)}
-        attribute :updated_time, Time, :coerce => lambda{|v| Time.parse(v.to_s)}
+        attribute :created, Time, :coerce => lambda{|v| Time.parse(v.to_s)}
+        attribute :updated, Time, :coerce => lambda{|v| Time.parse(v.to_s)}
         attribute :parameters, Smash, :coerce => lambda{|v| v.to_smash }
         attribute :template, Smash, :depends => :perform_template_load, :coerce => lambda{|v| v = MultiJson.load(v) if v.is_a?(String); v.to_smash }
         attribute :template_url, String

data/lib/miasma/models/storage.rb

@@ -5,19 +5,26 @@ module Miasma
     # Abstract storage API
     class Storage < Types::Api
 
+      autoload :Buckets, 'miasma/models/storage/buckets'
+      autoload :Bucket, 'miasma/models/storage/bucket'
+      autoload :Files, 'miasma/models/storage/files'
+      autoload :File, 'miasma/models/storage/file'
+
       # Storage buckets
       #
       # @param filter [Hash] filtering options
       # @return [Types::Collection<Models::Storage::Bucket>] buckets
       def buckets(args={})
-        Buckets.new(self)
+        memoize(:buckets) do
+          Buckets.new(self)
+        end
       end
 
-      # Create a new bucket
+      # Save bucket
       #
       # @param bucket [Models::Storage::Bucket]
       # @return [Models::Storage::Bucket]
-      def bucket_create(bucket)
+      def bucket_save(bucket)
         raise NotImplementedError
       end
 
@@ -25,16 +32,15 @@ module Miasma
       #
       # @param bucket [Models::Storage::Bucket]
       # @return [TrueClass, FalseClass]
-      def bucket_delete(bucket)
+      def bucket_destroy(bucket)
         raise NotImplementedError
       end
 
-      # Rename bucket
+      # Reload the bucket
       #
       # @param bucket [Models::Storage::Bucket]
-      # @param new_name [String]
-      # @return [Models::Storage::Bucket] new bucket with updated name
-      def bucket_rename(bucket, new_name)
+      # @return [Models::Storage::Bucket]
+      def bucket_reload(bucket)
         raise NotImplementedError
       end
 
@@ -53,7 +59,29 @@ module Miasma
         raise NotImplementedError
       end
 
+      # Save file
+      #
+      # @param file [Models::Storage::File]
+      # @return [Models::Storage::File]
+      def file_save(file)
+        raise NotImplementedError
+      end
 
+      # Destroy file
+      #
+      # @param file [Models::Storage::File]
+      # @return [TrueClass, FalseClass]
+      def file_destroy(file)
+        raise NotImplementedError
+      end
+
+      # Reload the file
+      #
+      # @param file [Models::Storage::File]
+      # @return [Models::Storage::File]
+      def file_reload(file)
+        raise NotImplementedError
+      end
 
     end
   end

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

@@ -6,27 +6,40 @@ module Miasma
       # Abstract bucket
       class Bucket < Types::Model
 
-        attribute :metadata, Hash, :coerce => lambda{|o| o.to_smash}
+        attribute :name, String, :required => true
+        attribute :created, Time, :coerce => lambda{|t| Time.parse(t.to_s)}
+        attribute :metadata, Smash, :coerce => lambda{|o| o.to_smash}
+
+        # @return [Files]
+        def files
+          memoize(:files) do
+            Files.new(self)
+          end
+        end
 
         # Filter buckets
         #
         # @param filter [Hash]
         # @return [Array<Bucket>]
         def filter(filter={})
+          raise NotImplementedError
         end
 
-        # Rename bucket
-        #
-        # @param new_name [String]
-        # @return [self]
-        def rename(new_name)
-          perform_rename(new_name)
+        protected
+
+        # Proxy reload action up to the API
+        def perform_reload
+          api.bucket_reload(self)
         end
 
-        protected
+        # Proxy save action up to the API
+        def perform_save
+          api.bucket_save(self)
+        end
 
-        def perform_rename(new_name)
-          api.bucket_rename(self, new_name)
+        # Proxy destroy action up to the API
+        def perform_destroy
+          api.bucket_destroy(self)
         end
 
       end

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

@@ -6,15 +6,18 @@ module Miasma
     class Storage
 
       # Abstract file
-      class File < Types::Collection
+      class File < Types::Model
 
-        attribute :body, IO, :coerce => lambda{|v| StringIO.new(v.to_s) }
+        attribute :name, String, :required => true
         attribute :content_type, String
         attribute :content_disposition, String
+        attribute :content_encoding, String
         attribute :etag, String
-        attribute :last_modified, DateTime
+        attribute :updated, Time, :coerce => lambda{|t| Time.parse(t.to_s)}
         attribute :size, Integer
-        attribute :metadata, Hash, :coerce => lambda{|o| o.to_smash}
+        attribute :metadata, Smash, :coerce => lambda{|o| o.to_smash}
+
+        on_missing :reload
 
         # @return [Bucket] parent bucket
         attr_reader :bucket
@@ -38,6 +41,43 @@ module Miasma
           raise NotImplementedError
         end
 
+        # @return [IO-ish]
+        # @note object returned will provide #readpartial
+        def body
+          unless(attributes[:body])
+            data[:body] ||= api.file_body(self)
+          end
+          attributes[:body]
+        end
+
+        # Set file body
+        #
+        # @param io [IO, String]
+        # @return [IO]
+        def body=(io)
+          unless(io.is_a?(IO))
+            io = StringIO.new(io)
+          end
+          dirty[:body] = io
+        end
+
+        protected
+
+        # Proxy reload action up to the API
+        def perform_reload
+          api.file_reload(self)
+        end
+
+        # Proxy save action up to the API
+        def perform_save
+          api.file_save(self)
+        end
+
+        # Proxy destroy action up to the API
+        def perform_destroy
+          api.file_destroy(self)
+        end
+
       end
 
     end

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

@@ -30,7 +30,12 @@ module Miasma
 
         # @return [File] new unsaved instance
         def build(args={})
-          File.new(api, args.to_smash)
+          instance = self.model.new(bucket)
+          args.each do |m_name, m_value|
+            m_name = "#{m_name}="
+            instance.send(m_name, m_value)
+          end
+          instance
         end
 
         # @return [File] collection item class

data/lib/miasma/types/api.rb

@@ -75,8 +75,9 @@ module Miasma
           raise ArgumentError.new 'Invalid request method provided!'
         end
         request_args = [].tap do |ary|
+          _endpoint = args.delete(:endpoint) || endpoint
           ary.push(
-            File.join(endpoint, args[:path].to_s)
+            File.join(_endpoint, args[:path].to_s)
           )
           options = {}.tap do |opts|
             [:form, :params, :json, :body].each do |key|
@@ -117,20 +118,25 @@ 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].include?('application/json'))
+        if(extracted_headers[:content_type].to_s.end_with?('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].include?('text/xml'))
+        elsif(extracted_headers[:content_type].to_s.end_with?('xml'))
           begin
             extracted_body = MultiXml.parse(result.body.to_s).to_smash
           rescue MultiXml::ParseError
             extracted_body = result.body.to_s
           end
         else
-          extracted_body = result.body.to_s
+          # @note if body is over 100KB, do not extract
+          if(extracted_headers[:content_length].to_i < 102400)
+            extracted_body = result.body.to_s
+          else
+            extracted_body = result.body
+          end
         end
         Smash.new(
           :response => result,

data/lib/miasma/types/model.rb

@@ -6,6 +6,8 @@ module Miasma
     # Base model
     class Model < Data
 
+      include Utils::Memoization
+
       # @return [Miasma::Types::Api] underlying service API
       attr_reader :api
 
@@ -35,7 +37,7 @@ module Miasma
         @dirty = Smash.new
         if(model_data)
           if(model_data.is_a?(Hash))
-            load_data(model_data)
+            load_data(model_data) unless model_data.empty?
           else
             raise TypeError.new "Expecting `model_data` to be of type `Hash`. Received: `#{model_data.class}`"
           end
@@ -73,6 +75,7 @@ module Miasma
       #
       # @return [self]
       def reload
+        clear_memoizations!
         perform_reload
         self
       end

data/lib/miasma/utils/lazy.rb

@@ -182,8 +182,13 @@ module Miasma
             if(param.is_a?(Symbol))
               @missing_method = param
             else
-              if(@missing_method)
-                param.send(@missing_method)
+              if(@missing_method && !@calling_on_missing)
+                @calling_on_missing = true
+                begin
+                  param.send(@missing_method)
+                ensure
+                  @calling_on_missing = false
+                end
               end
               @missing_method
             end

data/lib/miasma/version.rb

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

data/miasma.gemspec

@@ -14,5 +14,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'http'
   s.add_dependency 'multi_json'
   s.add_dependency 'multi_xml'
-  s.files = Dir['lib/**/*'] + %w(miasma.gemspec README.md CHANGELOG.md)
+  s.add_dependency 'xml-simple'
+  s.files = Dir['lib/**/*'] + %w(miasma.gemspec README.md CHANGELOG.md LICENSE)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Smoggy API
 email: code@chrisroberts.org
 executables: []
@@ -73,6 +87,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- LICENSE
 - README.md
 - lib/miasma.rb
 - lib/miasma/contrib/aws.rb
@@ -80,6 +95,10 @@ files:
 - lib/miasma/contrib/aws/compute.rb
 - lib/miasma/contrib/aws/load_balancer.rb
 - lib/miasma/contrib/aws/orchestration.rb
+- lib/miasma/contrib/aws/storage.rb
+- lib/miasma/contrib/open_stack.rb
+- lib/miasma/contrib/open_stack/compute.rb
+- lib/miasma/contrib/open_stack/orchestration.rb
 - lib/miasma/contrib/rackspace.rb
 - lib/miasma/contrib/rackspace/auto_scale.rb
 - lib/miasma/contrib/rackspace/compute.rb