mingle-storage 0.0.13 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d0f5c1a6490805c1d46aa244bea09839689e5b17
-  data.tar.gz: ef239446fa00f2a0130667baba8e015d98c3bcd4
+SHA256:
+  metadata.gz: 3657d919376dec9d78341d9dc72d91319c9c6b3880a79ddc2b09eb4c2d8c20fa
+  data.tar.gz: 5804abb38219d867467fdafe4c379b4a3639ea3ee1921193d3d902ce0a07099e
 SHA512:
-  metadata.gz: be939eea8f100403f2fe3d287f620e37c33b598c62957e5341cd4c9011b95b79042aa1f451a53e7096f936d1c751343bf49202f929fbcc2bd9055d0ca615a2cb
-  data.tar.gz: bfb1b834b17b24cf7872ced73149cb14c04e7c137ec455d6e8021f8778daa46f30dba466d8fc837c760b8b73ee55acc0680cfa2a7bac70e55958f10fb2babaa2
+  metadata.gz: 79eda50792dbcf9e70fe5a5c18079b09ad9b6394389df3b56e35667869e1debf56ee1b8d4bf665eacfa2799581bc1519c01677346ced7e8e4ce2e551950637e8
+  data.tar.gz: 5ec411b3f14451e04ed1b25aab3c507b17e3e415be6e6fc8b959388e928d3049bf3cae9acdd67ad1e12e4d6afd0ae8d1feb243830be669c6a0810ea2b805f47f

data/lib/storage.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'aws-sdk-v1'
+require 'aws-sdk-s3'
 require 'storage/filesystem_store.rb'
 require 'storage/s3_store.rb'
 

data/lib/storage/s3_store.rb

@@ -125,52 +125,51 @@ module Storage
 
     def upload(path, local_file, options={})
       local_file_name = File.basename(local_file)
-      bucket.objects.create(
-                            s3_path(path, local_file_name),
-                            Pathname.new(local_file),
-                            { :content_type => derive_content_type(local_file_name) }.merge(options)
-                            )
+      object  = bucket.object(s3_path(path, local_file_name))
+      object.upload_file(Pathname.new(local_file), { :content_type => derive_content_type(local_file_name) }.merge(options))
     end
 
     def upload_dir(path, local_dir)
-      bucket.objects.with_prefix(s3_path(path)).delete_all
+      bucket.objects(prefix: s3_path(path)).batch_delete!
       Dir[File.join(local_dir, "*")].each do |f|
         upload(path, f)
       end
     end
 
     def content_type(path)
-      object(path).content_type
+      object(path).get.content_type
     end
 
     def copy(path, to_local_path)
-      obj = object(path)
-      raise "File(#{path}) does not exist in the bucket #{bucket.name}" unless obj.exists?
+      obj_content = read(path)
+      raise "File(#{path}) does not exist in the bucket #{bucket.name}" if obj_content.nil?
       File.open(to_local_path, 'w') do |f|
-        obj.read do |c|
-          f.write(c)
-        end
+        f.write(obj_content)
       end
     end
 
     def write_to_file(path, content, options={})
-      object(path).write(content, options)
+      object  = bucket.object(s3_path(path))
+      object.put({body: content}.merge(options))
     end
 
     def read(path)
-      object(path).read
+      object = object(path)
+      return object.get.body.read unless object.nil?
+      object
     end
 
     def exists?(path)
-      object(path).exists?
+      !object(path).nil?
     end
 
-    def url_for(path, opts={})
+    def url_for(path, opts = {})
       url_opts = {
-        :expires => opts.delete(:expires_in) || @url_expires,
-        :response_content_type => derive_content_type(path)
+          :expires_in => opts.delete(:expires_in) || @url_expires,
+          :response_content_type => derive_content_type(path)
       }.merge(opts)
-      object(path).url_for(:read, url_opts).to_s
+      _object = object(path)
+      _object.nil? ? '' :  _object.presigned_url(:get, url_opts)
     end
 
     def public_url(path, opts={})
@@ -183,19 +182,19 @@ module Storage
     end
 
     def delete(path)
-      bucket.objects.with_prefix(s3_path(path)).delete_all
+      bucket.objects(prefix: s3_path(path)).batch_delete!
     end
 
     def clear
       if s3_path.nil? || s3_path.empty?
         bucket.clear
       else
-        bucket.objects.with_prefix(s3_path).delete_all
+        bucket.objects(prefix: s3_path).batch_delete!
       end
     end
 
     def objects(path)
-      bucket.objects.with_prefix(s3_path(path))
+      bucket.objects(prefix: s3_path(path))
     end
 
     private
@@ -205,11 +204,11 @@ module Storage
     end
 
     def s3
-      AWS::S3.new
+      Aws::S3::Resource.new
     end
 
     def object(path)
-      bucket.objects[s3_path(path)]
+      bucket.objects.find { |object| object.key == s3_path(path) }
     end
 
     def namespace
@@ -221,7 +220,7 @@ module Storage
     end
 
     def bucket
-      @bucket ||= s3.buckets[bucket_name]
+      @bucket ||= s3.bucket(bucket_name)
     end
 
     def bucket_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mingle-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
 platform: ruby
 authors:
 - ThoughtWorks Studios
@@ -13,15 +13,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: aws-sdk-v1
+  name: aws-sdk-s3
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Mingle storage API to support filesystem and AWS S3 backed storage
@@ -43,17 +43,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: Mingle storage API to support filesystem and AWS S3 backed storage