miasma 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d32bced5ab7a65f5cec7aae1a717904e71dc8a94
-  data.tar.gz: 53581473453536b82a3afd67a9bd754f1ee43446
+  metadata.gz: aebc0393d265e3f5dfa814404af11e3668e2bb82
+  data.tar.gz: d72c1b1bd1d3727a0693c9e81c50d14ac502bd0d
 SHA512:
-  metadata.gz: 4b02c183a44ba32b24e20f72260f6a89ed84c88efab319955326fc0fef4a0543fea459262ceec9ac32da60a05a52dbd7f508270bb557dda8e59ebb0e33f77651
-  data.tar.gz: 6b72a033e7ef5293dd764c92da47abe2faaaf1024359d88b1781d2682e541de304015d7c62948f621195c82c90f24f8f6e265b6db6295cc152920520bfc5d288
+  metadata.gz: b09ca540d448dfbb34d93abfc431bf96165dc44e237dd96e7eb3f6a2899c54ca5c537edba9be292e9f34c5e05dc725d024055de4e5bcff172dea33cffb0f8afd
+  data.tar.gz: 00b056a517c7dfb837c2c68874ed343ca3c9c25604d7a75d7a03101105a4dbfbd665891c84dfa46162a389ce18dafc3c5b72c78c167cff15d43dae3fbb41f122

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.2.6
+* Add default filter implementation on collection
+* Allow disable of automatic body extraction
+* Always return streamish object store file body
+
 # v0.2.4
 * Make `Storage::File#body` setup provider responsibility
 * Fix module usage within RS to properly squash existing methods

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

@@ -128,6 +128,33 @@ module Miasma
           end
         end
 
+        # Return filtered files
+        #
+        # @param args [Hash] filter options
+        # @return [Array<Models::Storage::File>]
+        def file_filter(bucket, args)
+          if(args[:prefix])
+            result = request(
+              :path => '/',
+              :endpoint => bucket_endpoint(bucket),
+              :params => Smash.new(
+                :prefix => args[:prefix]
+              )
+            )
+            [result.get(:body, 'ListBucketResult', 'Contents')].flatten.compact.map do |file|
+              File.new(
+                bucket,
+                :id => ::File.join(bucket.name, file['Key']),
+                :name => file['Key'],
+                :updated => file['LastModified'],
+                :size => file['Size'].to_i
+              ).valid_state
+            end
+          else
+            bucket_all
+          end
+        end
+
         # Return all files within bucket
         #
         # @param bucket [Bucket]
@@ -323,14 +350,17 @@ module Miasma
           if(file.persisted?)
             result = request(
               :path => file_path(file),
-              :endpoint => bucket_endpoint(file.bucket)
+              :endpoint => bucket_endpoint(file.bucket),
+              :disable_body_extraction => true
             )
             content = result[:body]
             begin
               if(content.is_a?(String))
                 StringIO.new(content)
               else
-                content.stream!
+                if(content.respond_to?(:stream!))
+                  content.stream!
+                end
                 content
               end
             rescue HTTP::StateError

data/lib/miasma/error.rb

@@ -46,12 +46,11 @@ module Miasma
         begin
           begin
             content = MultiJson.load(response.body.to_s).to_smash
-            msgs = content.values.map do |arg|
-              arg[:message]
-            end.compact
-            unless(msgs.empty?)
-              @response_error_msg = msgs.join(' - ')
-            end
+            @response_error_msg = [[:error, :message]].map do |path|
+              if(result = content.get(*path))
+                "#{content[:code]}: #{result}"
+              end
+            end.flatten.compact.first
           rescue MultiJson::ParseError
             begin
               content = MultiXml.parse(response.body.to_s).to_smash

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

@@ -8,15 +8,6 @@ module Miasma
       # Abstract bucket collection
       class Buckets < Types::Collection
 
-        # Return buckets matching given filter
-        #
-        # @param options [Hash] filter options
-        # @return [Array<Bucket>]
-        # @option options [String] :prefix key prefix
-        def filter(options={})
-          raise NotImplementedError
-        end
-
         # @return [Bucket] new unsaved instance
         def build(args={})
           Bucket.new(api, args.to_smash)

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

@@ -25,7 +25,7 @@ module Miasma
         # @return [Array<File>]
         # @option options [String] :prefix key prefix
         def filter(options={})
-          raise NotImplementedError
+          super
         end
 
         # @return [File] new unsaved instance
@@ -50,6 +50,11 @@ module Miasma
           api.file_all(bucket)
         end
 
+        # @return [Array<File>]
+        def perform_filter(args)
+          api.file_filter(bucket, args)
+        end
+
       end
 
     end

data/lib/miasma/types/api.rb

@@ -66,6 +66,7 @@ module Miasma
       # @option args [String, Symbol] :method HTTP request method
       # @option args [String] :path request path
       # @option args [Integer] :expects expected response status code
+      # @option args [TrueClass, FalseClass] :disable_body_extraction do not auto-parse response body
       # @return [Smash] {:result => HTTP::Response, :headers => Smash, :body => Object}
       # @raises [Error::ApiError::RequestError]
       def request(args)
@@ -96,7 +97,7 @@ module Miasma
         unless(result.code == args.fetch(:expects, 200).to_i)
           raise Error::ApiError::RequestError.new(result.reason, :response => result)
         end
-        format_response(result)
+        format_response(result, !args[:disable_body_extraction])
       end
 
       # Perform request
@@ -115,22 +116,26 @@ module Miasma
       # Makes best attempt at formatting response
       #
       # @param result [HTTP::Response]
+      # @param extract_body [TrueClass, FalseClass] automatically extract body
       # @return [Smash]
-      def format_response(result)
+      def format_response(result, extract_body=true)
         extracted_headers = Smash[result.headers.map{|k,v| [Utils.snake(k), v]}]
-        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.include?('xml'))
-          begin
-            extracted_body = MultiXml.parse(result.body.to_s).to_smash
-          rescue MultiXml::ParseError
-            extracted_body = result.body.to_s
+        if(extract_body)
+          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.include?('xml'))
+            begin
+              extracted_body = MultiXml.parse(result.body.to_s).to_smash
+            rescue MultiXml::ParseError
+              extracted_body = result.body.to_s
+            end
           end
-        else
+        end
+        unless(extracted_body)
           # @note if body is over 100KB, do not extract
           if(extracted_headers[:content_length].to_i < 102400)
             extracted_body = result.body.to_s

data/lib/miasma/types/collection.rb

@@ -48,8 +48,10 @@ module Miasma
       # @todo need to add helper to deep sort args, convert to string
       #   and hash to use as memoization key
       def filter(args={})
-        memoize(args.to_s)
-        raise NotImplementedError
+        key = "filter_#{args.to_smash.checksum}"
+        memoize(key) do
+          perform_filter(args)
+        end
       end
 
       # Build a new model
@@ -111,6 +113,17 @@ module Miasma
         raise NotImplementedError
       end
 
+      # @return [Array<Model>]
+      def perform_filter(args)
+        if(args[:prefix])
+          all.find_all do |item|
+            item.name.start_with?(args[:prefix])
+          end
+        else
+          all
+        end
+      end
+
     end
   end
 end

data/lib/miasma/version.rb

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

metadata

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