swift-storage 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3246e84c36a57fc2892b66434fda76d6a0985c5
-  data.tar.gz: 76f1ad2fa5f6b47e0d704ca2ec2095d3ac1ee7fc
+  metadata.gz: 72038776fffb8b39bab4365ba7a14e178d1f981a
+  data.tar.gz: 802bae9e36c40a8dc206a9da3501cf8b0318c9d9
 SHA512:
-  metadata.gz: 9d0bee3254a69d404e1ef30e9ee454cc81d894dcb59a69dd7c2e5d4e8269ce5a38b402a5cfaf54527bbbada5f80190ddd16094eaf2703094fb28ff069c5f6a79
-  data.tar.gz: 5035e8d1b0ac40516926bf47aab4e6d3a8597c23bc3acff638cce78018b1da0b18000281b9cb67b4f19878c6fe2ce8fc18bd74d37cc42343061f3eab28d17705
+  metadata.gz: c869406cf504fcea9315042c2dcff3735a273c3d96b87d55f53f066f65bba19e798ac9e82c6eb02001f213c500ac79217b5d45e84f7faebf72304dab1248e4b6
+  data.tar.gz: 74195392053ff11250f159069e69db38302e8e41a13347c3395aecd5a688fc969419c0b787cc0e130fd903ff2e96f2a68f82342251f04608f23888903fd380df

data/lib/swift_storage/container_collection.rb

@@ -26,7 +26,7 @@ class SwiftStorage::ContainerCollection < SwiftStorage::Node
   #  Container with given name
   #
   def [](name)
-    SwiftStorage::Container.new(service, name)
+    SwiftStorage::Container.new(service, name) if name
   end
 
 end

data/lib/swift_storage/node.rb

@@ -30,9 +30,9 @@ class SwiftStorage::Node
     @service
   end
 
-  def get_lines(path)
+  def get_lines(path, prefix: nil)
     headers = {'Accept' => 'text/plain'}
-    response = request(path, :headers => headers)
+    response = request(path, :headers => headers, :params => {:prefix => prefix})
     body = response.body
     if body.nil? || body.empty?
       []
@@ -92,6 +92,10 @@ class SwiftStorage::Node
     request(relative_path, :method => :delete)
   end
 
+  def delete_if_exists
+    delete rescue SwiftStorage::NotFoundError
+  end
+
 
   private
 

data/lib/swift_storage/object.rb

@@ -44,6 +44,23 @@ class SwiftStorage::Object < SwiftStorage::Node
     end
   end
 
+  # Stream the object data to a file
+  #
+  # This will always make a request to the API server and will not use cache
+  #
+  # @param output_path [String]
+  #  The path to the output file.
+  #
+  # @return [output_path]
+  #  The passed path.
+  #
+  def stream_to_file(output_path)
+    open(output_path, 'wb') do |io|
+      read(io)
+    end
+    output_path
+  end
+
 
   # Write the object
   #
@@ -78,8 +95,10 @@ class SwiftStorage::Object < SwiftStorage::Node
   #  always be served with the same max-age value. To have the resource expire
   #  at point of time, use the expires header.
   #
-  # @param expires [Time]
+  # @param expires [Symbol, Time]
   #  Set the Expires header.
+  #  Expires may also have the special value `:never` which override
+  #  `cache_control` and set the expiration time in a long time.
   #
   # @param object_manifest [String]
   #  When set, this object acts as a large object manifest. The value should be
@@ -105,6 +124,11 @@ class SwiftStorage::Object < SwiftStorage::Node
 
     object_manifest.nil? or input_stream.nil? or raise ArgumentError, 'Input must be nil on object manigest'
 
+    if expires == :never
+      expires = Time.at(4_000_000_000)
+      cache_control = "public, max_age=4000000000"
+    end
+
     h[H::CONTENT_DISPOSITION] = attachment ? 'attachment' : 'inline'
     h[H::OBJECT_MANIFEST] = object_manifest if object_manifest
     h[H::CONTENT_TYPE] = content_type if content_type

data/lib/swift_storage/object_collection.rb

@@ -11,7 +11,7 @@ class SwiftStorage::ObjectCollection < SwiftStorage::Node
   #  Objects in this collection
   #
   def all
-    get_lines(container.name).map { |name| SwiftStorage::Object.new(container, name)}
+    get_objects
   end
 
   # Return a particular object
@@ -26,7 +26,16 @@ class SwiftStorage::ObjectCollection < SwiftStorage::Node
   #  Object with given name
   #
   def [](name)
-    SwiftStorage::Object.new(container, name)
+    SwiftStorage::Object.new(container, name) if name
+  end
+
+  def with_prefix(prefix)
+    get_objects(prefix)
+  end
+
+  private
+  def get_objects(prefix=nil)
+    get_lines(container.name, :prefix => prefix).map { |name| SwiftStorage::Object.new(container, name)}
   end
 
 end

data/lib/swift_storage/service.rb

@@ -112,6 +112,7 @@ class SwiftStorage::Service
   def request(path_or_url,
               method: :get,
               headers: nil,
+              params: nil,
               input_stream: nil,
               output_stream: nil)
     headers ||= {}
@@ -139,6 +140,11 @@ class SwiftStorage::Service
 
     case method
     when :get
+      if params.respond_to?(:to_hash)
+        params.reject!{|k,v| v.nil?}
+        path << '?'
+        path << URI.encode_www_form(params)
+      end
       req = Net::HTTP::Get.new(path, headers)
     when :delete
       req = Net::HTTP::Delete.new(path, headers)
@@ -188,13 +194,13 @@ class SwiftStorage::Service
     when /^2/
       return true
     when '401'
-      raise AuthError
+      raise AuthError, response.body
     when '403'
-      raise ForbiddenError
+      raise ForbiddenError, response.body
     when '404'
-      raise NotFoundError
+      raise NotFoundError, response.body
     else
-      raise ServerError
+      raise ServerError, response.body
     end
   end
 

data/lib/swift_storage/version.rb

@@ -1,3 +1,3 @@
 module SwiftStorage
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/spec_helper.rb

@@ -56,7 +56,10 @@ module TestServerMixin
 
 end
 
-RSpec::Matchers.define :send_request do |method, path, headers, body|
+RSpec::Matchers.define :send_request do |method, path, options={}|
+  headers = options[:headers]
+  body = options[:body]
+  params = options[:params]
   match do |actual|
     actual.call()
     env = server.app.last_env
@@ -82,7 +85,14 @@ RSpec::Matchers.define :send_request do |method, path, headers, body|
     @body_match = true
     @body_match = @actual_body == body if body
 
-    @method_match && @path_match && @headers_match && @body_match
+    @params_match = true
+    if params
+      @actual_params = env['QUERY_STRING']
+      @params_string = URI.encode_www_form(params)
+      @params_match = @params_string == @actual_params
+    end
+
+    @method_match && @path_match && @headers_match && @body_match && @params_match
   end
 
   failure_message do
@@ -91,6 +101,7 @@ RSpec::Matchers.define :send_request do |method, path, headers, body|
     r << "Path should be #{path}, got #{@actual_path}" if !@path_match
     r << "Unmatched headers #{@unatched_header}" if !@headers_match
     r << "Body doesn't match, for #{@actual_body} expected #{body}" if !@body_match
+    r << "Params should be #{@params_string}, got #{@actual_params}" if !@params_match
     r.join("\n")
   end
 

data/spec/swift/auth_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe 'Auth' do
       h::STORAGE_TOKEN => 'storage_token'
     )
 
-    expect{ subject.authenticate! }.to send_request(:get, '/auth/v1.0', {
+    expect{ subject.authenticate! }.to send_request(:get, '/auth/v1.0', :headers => {
       h::AUTH_USER => 'test:testuser',
       h::AUTH_KEY => 'testpassword'
     })

data/spec/swift/container_spec.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+
+RSpec.describe SwiftStorage::Container do
+  subject { swift_service.containers['test'] }
+  it "list with prefix" do
+    expect{ subject.objects.with_prefix('foo/bar') }.to(
+      send_request(:get, '/v1/AUTH_test/test',
+                   :params => {:prefix => 'foo/bar'})
+    )
+  end
+end
+

data/spec/swift/object_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe 'Object' do
+RSpec.describe SwiftStorage::Object do
   subject { swift_service.containers['somecontainer'].objects['someobject'] }
   it "read" do
     headers(
@@ -32,14 +32,15 @@ RSpec.describe 'Object' do
                     :attachment => true,
                     :delete_at => Time.at(4000),
                     :metadata => {:foo => :bar, :jon => :doe, 'WeiRd ^^!+Format With!! Spaces $$$' => 'weird'})
-      }.to send_request(:put, '/v1/AUTH_test/somecontainer/someobject', {
+    }.to send_request(:put, '/v1/AUTH_test/somecontainer/someobject',
+                      :headers => {
       'Content-Length' => b.length,
       'Content-Disposition' => 'attachment',
       'X-Delete-At' => 4000,
       'X-Object-Meta-Foo' => 'bar',
       'X-Object-Meta-Jon' => 'doe',
       'X-Object-Meta-Weird-Format-With-Spaces' => 'weird',
-    }, b)
+    }, :body => b)
     expect(subject.metadata.jon_doe).to eq('a meta')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swift-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nicolas Goy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,6 +152,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/local_server.rb
 - spec/swift/auth_spec.rb
+- spec/swift/container_spec.rb
 - spec/swift/object_spec.rb
 - spec/swift/temp_url_spec.rb
 - swift-ruby.gemspec
@@ -183,6 +184,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/local_server.rb
 - spec/swift/auth_spec.rb
+- spec/swift/container_spec.rb
 - spec/swift/object_spec.rb
 - spec/swift/temp_url_spec.rb
 has_rdoc: