echo_uploads 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d98d216e5f8935292fe62e093dec3a81bc9099b
-  data.tar.gz: 4ae8d8d9f0e74121a88b8e4b12a860902259adb2
+  metadata.gz: 75454542bb29646f3b17fd5d72d86a1d6e8802ab
+  data.tar.gz: 9fd264f1b0e217f776afd90820ad68d2db645306
 SHA512:
-  metadata.gz: fbc8a9e235934a44f4ff7cf68f1cabcf61871fd4ee604ff8a67a25f8176341d65d087d4abedbfa49625eaf5ad87b97ac405896cc6e94f862a7187fa5ed21c63c
-  data.tar.gz: cb0240f8cb5372d336b99fb235c43ea599e38f623404880b75f3d88d50acc601334c1d513de6c123ace6acd6b9d85f1608e7ca1817ce4f562543f3adfdf86587
+  metadata.gz: 8526cdc620a6311028ac8a54a509b38d78058e93f226d7c32a89470a620ef0edd38f419b54fa57a9611a7157171e90070fa3b04392d0f6254457d5017207278b
+  data.tar.gz: 0f44dea04658d84809108fb9edde1f45c2d6a4860f060b9f2f305de25b5962c5ab5b5511ea9706cb6ddd38949f1283866ccb8ee7acd1bc2401ae3c3ec1b4324a

data/lib/echo_uploads/file.rb

@@ -111,6 +111,10 @@ module EchoUploads
       end
     end
     
+    def read
+      storage.read key
+    end
+    
     def storage
       class_from_string(storage_type).new
     end

data/lib/echo_uploads/filesystem_store.rb

@@ -18,7 +18,7 @@ module EchoUploads
     end
     
     def read(key)
-      File.read path(key)
+      ::File.read path(key)
     end
     
     def write(key, file)

data/lib/echo_uploads/model.rb

@@ -178,6 +178,12 @@ module EchoUploads
           send("#{attr}_tmp_metadata").present?
         end
         
+        # Define the read_x method. Delegates to the #read method of the store (e.g.
+        # FilesystemStore).
+        define_method("read_#{attr}") do
+          echo_uploads_map_metadata(attr, options, &:read)
+        end
+        
         # Define the association with the metadata model.
         if options[:multiple]
           has_many("#{attr}_metadatas".to_sym,

data/lib/echo_uploads/s3_store.rb

@@ -3,26 +3,27 @@
 module EchoUploads
   class S3Store < ::EchoUploads::AbstractStore    
     def delete(key)
-      bucket.objects[key].delete
+      bucket.objects[path(key)].delete
     end
     
     def exists?(key)
-      bucket.objects[key].exists?
+      bucket.objects[path(key)].exists?
     end
     
     def read(key)
       data = ''
-      bucket.objects[key].read { |chunk| data << chunk }
+      bucket.objects[path(key)].read { |chunk| data << chunk }
       data
     end
     
     def url(key, options = {})
       options = {method: :read}.merge(options)
-      bucket.objects[key].url_for options.delete(:method), options
+      bucket.objects[path(key)].url_for options.delete(:method), options
     end
     
     def write(key, file)
-      bucket.objects[key].write file
+      file.rewind
+      bucket.objects[path(key)].write file
     end
     
     private
@@ -43,9 +44,15 @@ module EchoUploads
     end
     
     def folder
-      Rails.configuration.echo_uploads.s3.folder || raise(
-        'You must define config.echo_uploads.s3.folder in your application config.'
-      )
+      if Rails.configuration.respond_to?(:echo_uploads) and Rails.configuration.echo_uploads.s3.folder
+        Rails.configuration.echo_uploads.s3.folder
+      else
+        ::File.join 'echo_uploads', Rails.env
+      end
+    end
+    
+    def path(key)
+      ::File.join folder, key
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: echo_uploads
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jarrett Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types