echo_uploads 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 363da8049a3d95db7e590c2680081788edcc1405
-  data.tar.gz: da7c0bdef6ea0899b0087848437f4554d1361ee6
+  metadata.gz: a19cdd2aff5a28b347afebdf8935726149ef8843
+  data.tar.gz: c4889c53066a7d7864f88b1a0bf2753a24438c03
 SHA512:
-  metadata.gz: 2fd7a6828ce9252148d1b4c9bf4020963aea88ebb6656832c1d54e6bf3a46f1eeddd8b9a59b7762fc5b35d6c5ab829e744295f845eb42fd75e186cc5251ce7d3
-  data.tar.gz: a567d2d9ffb9e6e3da3ebe3225e4ce23faa56eebde9b0c67d8660592db8effd0f5d01afc1317f5b71f87ad6c2923b44aee4961bb8565fdc6ab86ff6fccab7061
+  metadata.gz: 9ab54bb35760568dc29cd84e6827c004b093adcdf2e9de2c6a180d4dfdf337b16ea9b432cd08cb01362596a8f2c248a9f64f1900b54dc7473c441a0412755de4
+  data.tar.gz: c3c9ea0f24c22092e1b5566c6b78d234caa9b469f65e44188a830fca18be19625f8f9d5b7073679239648048784ffc4756fbfb21193ef7250854e3511c15a339

data/lib/echo_uploads.rb

@@ -1,5 +1,6 @@
 module EchoUploads; end
 
+require 'echo_uploads/version'
 require 'echo_uploads/railtie'
 require 'echo_uploads/validation'
 require 'echo_uploads/perm_file_saving'

data/lib/echo_uploads/file.rb

@@ -85,9 +85,9 @@ module EchoUploads
       # EchoUploads::MappedFile, which is a subclass of
       # ActionDispatch::Http::UploadedFile.
       if file.is_a?(ActionDispatch::Http::UploadedFile)
-        storage.write key, file.tempfile
+        storage.write key, file.tempfile, self
       else
-        storage.write key, file
+        storage.write key, file, self
       end
       
       # If we mapped the files, they were temporarily written to tmp/echo_uploads.

data/lib/echo_uploads/filesystem_store.rb

@@ -21,7 +21,7 @@ module EchoUploads
       ::File.read path(key)
     end
     
-    def write(key, file)
+    def write(key, file, metadata)
       _path = path key
       unless ::File.exists?(_path)
         unless ::File.exists?(folder)

data/lib/echo_uploads/s3_store.rb

@@ -1,46 +1,48 @@
 # Uses the official Amazon Web Services SDK gem:
 #   gem install aws-sdk
+# Incompatible with 1.x.x versions of the aws-sdk gem.
 module EchoUploads
   class S3Store < ::EchoUploads::AbstractStore    
     def delete(key)
-      bucket.objects[path(key)].delete
+      bucket.object(path(key)).delete
     end
     
     def exists?(key)
-      bucket.objects[path(key)].exists?
+      bucket.object(path(key)).exists?
     end
     
     def read(key)
-      data = ''
-      bucket.objects[path(key)].read { |chunk| data << chunk }
-      data
+      bucket.object(path(key)).get.body.read
     end
     
     def url(key, options = {})
-      options = {method: :read}.merge(options)
-      bucket.objects[path(key)].url_for options.delete(:method), options
+      options = {method: :get}.merge(options)
+      url_str = bucket.object(path(key)).presigned_url options.delete(:method), options
+      URI.parse url_str
     end
     
-    def write(key, file)
+    def write(key, file, metadata)
       file.rewind
-      bucket.objects[path(key)].write file
+      bucket.object(path(key)).put body: file, content_type: metadata.mime_type
     end
     
     private
     
+    def aws_config
+      Rails.configuration.echo_uploads.aws || {}
+    end
+    
     def bucket
-      if Rails.configuration.echo_uploads.aws
-        s3 = AWS::S3.new Rails.configuration.echo_uploads.aws
-      else
-        s3 = AWS::S3.new
-      end
-      bucket_name = Rails.configuration.echo_uploads.s3.bucket || raise(
-        'You must define config.echo_uploads.s3.bucket in your application config.'
-      )
-      if s3.buckets[bucket_name].nil?
-        s3.buckets.create bucket_name
+      if @bucket.nil?
+        bucket_name = Rails.configuration.echo_uploads.s3.bucket || raise(
+          'You must define config.echo_uploads.s3.bucket in your application config.'
+        )
+        @bucket = Aws::S3::Bucket.new bucket_name, aws_config
+        unless @bucket.exists?
+          raise "S3 bucket does not exist: #{bucket_name.inspect}"
+        end
       end
-      s3.buckets[bucket_name]
+      @bucket
     end
     
     def folder

data/lib/echo_uploads/version.rb

@@ -0,0 +1,3 @@
+module EchoUploads
+  VERSION = '0.0.13'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: echo_uploads
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Jarrett Colby
@@ -14,16 +14,16 @@ dependencies:
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,7 @@ files:
 - lib/echo_uploads/s3_store.rb
 - lib/echo_uploads/temp_file_saving.rb
 - lib/echo_uploads/validation.rb
+- lib/echo_uploads/version.rb
 homepage: https://github.com/jarrett/echo_uploads
 licenses:
 - MIT