storage 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184a2c065d267a1a8c69ea2b28cb10029ed87386
-  data.tar.gz: 92487bed7cda01963ec791f9a97be0c7aabf0cf4
+  metadata.gz: debdbb389e3c318ff68a502dc87ac52fbd047894
+  data.tar.gz: 1857d2fa6a260d0862400d519d2ac0c34c4f1a51
 SHA512:
-  metadata.gz: 690d4ab3a737bd1d4d4cdbdefc6837604af4f7776ce9fb76cbd8243e3cec6d3c88fa4b81e621337af72d6fb930eab0cbc783c1385af58f4149e18c2e4935c461
-  data.tar.gz: b0b17efdf1edfa68fb8ed89daf2ddfdcf0d2478d9194c8a5ffe654f9569e95a990d676577fdaa8e265a5f753f801c5f773f97a8a57c6b4b2f5eb4da51c264ea5
+  metadata.gz: 8a1e73f719687b06f538a307b7caaa06ee3f598d44f0b2baa2e6f4c4233281e91235d6d426f2e90bf45479af58ee047f815e5eba82e30e7b5c314e904c240cce
+  data.tar.gz: 8338bc57f95931f7e6db01c5ae8ba0c8ee9d7339b38e0bb57fde7051afb2a4f68e8cc5554228d2b4b72f800fde66f0025e20cfc4b36846cfe3e9f74cf084267e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    storage (0.3.1)
+    storage (0.3.2)
       fog
       mime-types
 

data/README.md

@@ -34,11 +34,15 @@ Storage.store "some/file.rb", name: "file.rb", bucket: "sample"
 Storage.store File.open("some/file.rb"), name: "file.rb", bucket: "sample", public: true
 
 # Retrieve the public url for that file
-Storage.get "file.rb"
+Storage.get "file.rb", bucket: "sample"
 #=> http://s3.amazon.com/sample-files/file.rb
 
+# Retrieve the public url for a private file,
+# setting expiration to 5 minutes (300 seconds).
+Storage.get "private.rb", bucket: "sample", expires: Time.now.to_i + 300
+
 # Remove a file.
-Storage.remove "file.rb"
+Storage.remove "file.rb", bucket: "sample"
 ```
 
 ### FileSystem

data/lib/storage/strategies/s3.rb

@@ -32,9 +32,6 @@ module Storage
       end
 
       def store(file, options = {})
-        object = find_object(file, options) rescue nil
-        fail FileAlreadyExistsError if object
-
         bucket = find_bucket_or_create(options.fetch(:bucket))
         file = File.open(file, "rb") unless file.respond_to?(:read) && !file.kind_of?(Pathname)
 

data/lib/storage/version.rb

@@ -2,7 +2,7 @@ module Storage
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/storage/strategies/s3_spec.rb

@@ -41,31 +41,27 @@ describe Storage::Strategies::S3 do
 
     it "should save a file using file handler" do
       handler = File.open(source)
-
-      setup_expectations
+      setup_create_object
 
       Storage.store(handler, name: "lorem.txt", bucket: "files")
     end
 
     it "should save a file using a path" do
-      setup_expectations
-
+      setup_create_object
       Storage.store(source, name: "lorem.txt", bucket: "files")
     end
 
     it "should remove an existing file" do
       object = double("object")
 
-      setup_bucket(bucket)
-      setup_object(object)
+      setup_get_object object: object
       expect(object).to receive(:destroy).and_return(true)
 
       expect(Storage.remove("lorem.txt", bucket: "files")).to be_truthy
     end
 
     it "should raise when trying to removing an nonexisting file" do
-      setup_bucket(bucket)
-      setup_get(nil)
+      setup_get_object object: nil
 
       expect {
         Storage.remove("lorem.txt", bucket: "files")
@@ -75,8 +71,7 @@ describe Storage::Strategies::S3 do
     it "should retrieve an existing file (public url)" do
       object = double("object", public_url: "PUBLIC_URL")
 
-      setup_bucket(bucket)
-      setup_object(object)
+      setup_get_object object: object
 
       expect(Storage.get("lorem.txt", bucket: "files")).to eq("PUBLIC_URL")
     end
@@ -85,15 +80,13 @@ describe Storage::Strategies::S3 do
       object = double("object", public_url: nil)
 
       expect(object).to receive_message_chain("url").with(Time.now.to_i + 3600).and_return("PRIVATE_URL")
-      setup_bucket(bucket)
-      setup_object(object)
+      setup_get_object object: object
 
-      expect(Storage.get("lorem.txt", :bucket => "files")).to eq("PRIVATE_URL")
+      expect(Storage.get("lorem.txt", bucket: "files")).to eq("PRIVATE_URL")
     end
 
     it "should raise when trying to retrieve an missing file" do
-      setup_bucket(bucket)
-      setup_get(nil)
+      setup_get_object object: nil
 
       expect {
         Storage.get("lorem.txt", bucket: "files")
@@ -101,80 +94,62 @@ describe Storage::Strategies::S3 do
     end
 
     it "should raise when trying to retrieve an missing bucket" do
-      setup_bucket(nil)
+      setup_get_bucket bucket: nil
 
       expect {
         Storage.get("lorem.txt", bucket: "files")
       }.to raise_error(Storage::MissingFileError)
     end
 
-    it "should create a bucket and trying to store a file on a missing bucket" do
-      setup_object
-      setup_bucket(nil)
-
-      expect(connection).to receive_message_chain("directories.create").with(key: "files", public: false).and_return(bucket)
-
+    it "should create a bucket when trying to store a file on a missing bucket" do
       bucket.as_null_object
+      setup_create_bucket
 
       Storage.store(source, name: "lorem.txt", bucket: "files")
     end
 
-    it "should raise when saving a file that already exists" do
-      object = double("object")
-
-      setup_bucket(bucket)
-      setup_get(object)
-
-      expect {
-        Storage.store(source, name: "lorem.txt", bucket: "files")
-      }.to raise_error(Storage::FileAlreadyExistsError)
-    end
-
     it "should set file permission to public" do
-      setup_expectations public_access: true
+      setup_create_object public: true
       Storage.store(source, name: "lorem.txt", bucket: "files", public: true)
     end
 
     it "should set file permission to private (default)" do
-      setup_expectations public_access: false
+      setup_create_object public: false
       Storage.store(source, name: "lorem.txt", bucket: "files")
     end
 
     it "should set file permission to private" do
-      setup_expectations public_access: false
+      setup_create_object public: false
       Storage.store(source, name: "lorem.txt", bucket: "files", public: false)
     end
 
     it "should set file permission to private (access option)" do
-      setup_expectations public_access: false
+      setup_create_object public: false
       Storage.store(source, name: "lorem.txt", bucket: "files", access: :private)
     end
 
     it "should set file permission to public (access option)" do
-      setup_expectations public_access: true
+      setup_create_object public: true
       Storage.store(source, name: "lorem.txt", bucket: "files", access: :public_read)
     end
 
-    def setup_bucket(bucket)
+    def setup_create_object(bucket: self.bucket, object: nil, public: false, file_name: "lorem.txt")
       allow(connection).to receive_message_chain("directories.get").with("files").and_return(bucket)
+      expect(bucket).to receive_message_chain("files.create").with(key: file_name, body: kind_of(File), public: public)
     end
 
-    def setup_object(object = nil)
-      expect(adapter).to receive_message_chain("find_object").and_return(object)
+    def setup_get_object(bucket: self.bucket, file_name: "lorem.txt", object: nil)
+      expect(connection).to receive_message_chain("directories.get").with("files").and_return(bucket)
+      expect(bucket).to receive_message_chain("files.get").with(file_name).and_return(object)
     end
 
-    def setup_create(public_access)
-      expect(bucket).to receive_message_chain("files.create").with(key: "lorem.txt", body: kind_of(File), public: public_access)
-    end
-
-    def setup_get(object)
-      expect(bucket).to receive_message_chain("files.get").with("lorem.txt").and_return(object)
+    def setup_create_bucket(bucket: nil)
+      allow(connection).to receive_message_chain("directories.get").with("files").and_return(bucket)
+      expect(connection).to receive_message_chain("directories.create").with(key: "files", public: false).and_return(self.bucket)
     end
 
-    def setup_expectations(the_bucket: bucket, object: nil, public_access: false)
-      setup_bucket(the_bucket)
-      setup_object(object)
-      setup_create(public_access)
+    def setup_get_bucket(bucket: self.bucket)
+      allow(connection).to receive_message_chain("directories.get").with("files").and_return(bucket)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storage
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Nando Vieira