breadbox 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6435d5e69be8cc0c607ee02870ca0ac0047c0af6
-  data.tar.gz: af4357cdb609b50286839edf6456c3c3076fe6cb
+  metadata.gz: af6366ca6d82477de1f12bd73a9f73a5c365eedb
+  data.tar.gz: bfaa27461d1e9a566add2fba9620a1e5508d57e5
 SHA512:
-  metadata.gz: 8f6bdd73f1a41c82203f7b89455e877adcb831ff1542058849ee4de387bd032fa18f5e379085cd7e33619b0ebc19b222bc55e624b0d03af48d3e6d9166c51d2d
-  data.tar.gz: 11995b4e8b75155051980abbc89972407140a1821d66a7fdf52772c4998c5009034d8c13d8d6fa480c2631a7396460e80ee6b799b7aed78a782e24937ad77d33
+  metadata.gz: 423bd1ae34de4bd77727b7b730d9c6c1e7eaca6ce7fdeec42669d617abf7c6f7a086e91e6c9207fdf8870816357b90b5b0839a6fccdb71d0f084c751d73c1ce9
+  data.tar.gz: ed241327293a87d34209cdf6c1a1eb4102e8ae136f73c88f939df4d87649ba181380c2189b8b6464c9254ef6c82df03a448aae55284fff49588963e96bc814fa

data/README.md

@@ -83,6 +83,8 @@ end
   folder `/`.
 - `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.
+- `content_type`: S3 knows how to handle most file types, but occasionally, you may need to specify your own
 
 ```ruby
 # to upload a file to [Dropbox Folder or S3 Bucket]/uploads/my-cool-file.jpg

data/lib/breadbox/s3_client.rb

@@ -12,11 +12,12 @@ module Breadbox
     end
 
     def upload(options = {})
-      path     = options[:path]
-      file     = options[:file]
-      acl      = options[:public] ? :public_read : nil
+      path         = options[:path]
+      file         = options[:file]
+      acl          = options[:public] ? :public_read : nil
+      content_type = options[:content_type]
       filepath = filepath_from_paths_and_file(root_path, path, file)[1..-1]
-      result   = s3_bucket_object.objects[filepath].write(file, acl: acl)
+      result   = s3_bucket_object.objects[filepath].write(file, acl: acl, content_type: content_type)
 
       if result
         result.public_url.to_s

data/lib/breadbox/version.rb

@@ -1,3 +1,3 @@
 module Breadbox
-  VERSION = "1.1.1"
+  VERSION = "1.2.1"
 end

data/spec/breadbox/s3_client_spec.rb

@@ -78,11 +78,19 @@ module Breadbox
 
       it "writes a file to an S3 Bucket Object" do
         file    = File.open("./tmp/new-file.jpg")
-        options = { acl: :public_read }
+        options = { acl: :public_read, content_type: nil }
         expect_any_instance_of(AWS::S3::S3Object).to receive(:write)
                                                      .with(file, options)
         client.upload(path: "/", file: file, public: true)
       end
+
+      it "passes content-type parameter" do
+        file    = File.open("./tmp/new-file.jpg")
+        options = { content_type: "image/jpeg", acl: nil }
+        expect_any_instance_of(AWS::S3::S3Object).to receive(:write)
+                                                     .with(file, options)
+        client.upload(path: "/", file: file, 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.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Nathaniel Watts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An interface for uploading to Dropbox or Amazon S3.
@@ -156,4 +156,3 @@ test_files:
 - spec/breadbox/s3_client_spec.rb
 - spec/breadbox_spec.rb
 - spec/spec_helper.rb
-has_rdoc: