breadbox 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 864b92924c79c0de55813778e21139799b6a535c
-  data.tar.gz: 737a51e54067aa9f171f4db91a936696cf830782
+  metadata.gz: b634f857a942ff27b4e9d5910efec955dca6bfe8
+  data.tar.gz: 133007d2560f3e7929587aecc519d9bbd5236b4c
 SHA512:
-  metadata.gz: ef2deb7707fc28b3b6deca9467acf318ab55a49f50a1b465a5f7fa066adf69671064e6fa58cdfc01455675626f85a34c1fc3377fab640122a3d1233cf39cd597
-  data.tar.gz: b88fc9242b7ee9a250ce5283dbaa17519b556939933db998965693773c3ffa8914d1e1b094f4f0caa20a67fd7d469d5e2e30aa9b981217f98f21eb7485311355
+  metadata.gz: 3eec8a130d1e0889d29fb5f35e038553124c35fc8b7f96eebb3c8d5e43c299271517e64276efee3a759a3b499647fd1e680cf97ccfcb32daf631ebfff13454fb
+  data.tar.gz: 241255df8c6631f51f028e549ff6b45bb9de2a5919412539d27f247dcad081bf587ad05435c0d1f8c5fcf150fe6a4321a35d0dab4b4f9d931d8164a70e16aeb3

data/README.md

@@ -82,6 +82,7 @@ end
 - `path`: defaults to `nil`, but this is where you put a custom folder if you so wish (in relation
   to your `root_path`, which if you didn't configure in your initializer, will be your root Dropbox
   folder `/`.
+- `filename`: defaults to the name of the file you are uploading, but you can specify a custom name here.
 - `file`: The file object that you are uploading, ex: `file = File.open('./path-to-local-file').
 - `cleanup`: defaults to `false`, but if you pass `true` - it will remove the local file after uploading.
 - `public`: defaults to `false`. Pass `true` if you'd like to set the file permission level to world readable.

data/breadbox.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "dropbox-sdk", "~> 1.6"
+  spec.add_dependency "dropbox-sdk", "~> 1.6.4"
   spec.add_dependency "aws-sdk", "~> 2.1.7"
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/breadbox/client.rb

@@ -23,8 +23,7 @@ module Breadbox
 
     protected
 
-    def filepath_from_paths_and_file(root_path, path, file)
-      filename = File.basename(file)
+    def filepath_from_paths_and_filename(root_path, path, filename)
       [root_path, path, filename].join("/").gsub(/\/{2,}/, "/")
     end
 

data/lib/breadbox/dropbox_client.rb

@@ -10,9 +10,11 @@ module Breadbox
     def upload(options = {})
       path      = options[:path]
       file      = options[:file]
+      filename  = options[:filename]  || File.basename(file)
       overwrite = options[:overwrite] || false
       share     = options[:share]
-      filepath  = filepath_from_paths_and_file(root_path, path, file)
+
+      filepath  = filepath_from_paths_and_filename(root_path, path, filename)
       result    = client.put_file(filepath, file, overwrite)
 
       if share && result

data/lib/breadbox/s3_client.rb

@@ -14,9 +14,10 @@ module Breadbox
     def upload(options = {})
       path          = options[:path]
       file          = options[:file]
+      filename      = options[:filename] || File.basename(file)
       acl           = options[:public] ? :public_read : :private
       content_type  = options[:content_type]
-      filepath      = filepath_from_paths_and_file(root_path, path, file)[1..-1]
+      filepath      = filepath_from_paths_and_filename(root_path, path, filename)[1..-1]
       s3_object     = s3_bucket_object.object(filepath)
 
       result = s3_object.put(body: file, acl: acl, content_type: content_type)

data/lib/breadbox/version.rb

@@ -1,3 +1,3 @@
 module Breadbox
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/spec/breadbox/dropbox_client_spec.rb

@@ -63,6 +63,17 @@ module Breadbox
 
         client.upload(path: "/", file: file)
       end
+
+      it "allows for a filename to be passed as an option" do
+        file           = File.open("./tmp/new-file.jpg")
+        client         = DropboxClient.new(configuration)
+        dropbox_client = instance_double(::DropboxClient)
+        allow(client).to receive(:client).and_return(dropbox_client)
+        expect(dropbox_client).to receive(:put_file)
+                                  .with("/my-cool-file.jpg", file, false)
+
+        client.upload(path: "/", file: file, filename: "my-cool-file.jpg")
+      end
     end
   end
 end

data/spec/breadbox/s3_client_spec.rb

@@ -112,6 +112,33 @@ module Breadbox
 
         client.upload(path: "/", file: file, public: nil, content_type: "image/jpeg")
       end
+
+      it "passes path parameter" do
+        file    = File.open("./tmp/new-file.jpg")
+        bucket_object = client.s3_bucket_object.object("new-file.jpg")
+
+        expect_any_instance_of(Aws::S3::Bucket).to receive(:object)
+          .with("my-path/new-file.jpg").and_return(bucket_object)
+        expect(bucket_object).to receive(:put)
+
+        client.upload(path: "my-path", file: file, content_type: "image/jpeg")
+      end
+
+      it "passes filename parameter" do
+        file    = File.open("./tmp/new-file.jpg")
+        bucket_object = client.s3_bucket_object.object("my-cool-filename.jpg")
+
+        expect_any_instance_of(Aws::S3::Bucket).to receive(:object)
+          .with("my-cool-filename.jpg").and_return(bucket_object)
+        expect(bucket_object).to receive(:put)
+
+        client.upload(
+          path: "/",
+          file: file,
+          filename: "my-cool-filename.jpg",
+          content_type: "image/jpeg"
+        )
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: breadbox
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Nathaniel Watts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-19 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement