breadbox 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af6366ca6d82477de1f12bd73a9f73a5c365eedb
-  data.tar.gz: bfaa27461d1e9a566add2fba9620a1e5508d57e5
+  metadata.gz: 864b92924c79c0de55813778e21139799b6a535c
+  data.tar.gz: 737a51e54067aa9f171f4db91a936696cf830782
 SHA512:
-  metadata.gz: 423bd1ae34de4bd77727b7b730d9c6c1e7eaca6ce7fdeec42669d617abf7c6f7a086e91e6c9207fdf8870816357b90b5b0839a6fccdb71d0f084c751d73c1ce9
-  data.tar.gz: ed241327293a87d34209cdf6c1a1eb4102e8ae136f73c88f939df4d87649ba181380c2189b8b6464c9254ef6c82df03a448aae55284fff49588963e96bc814fa
+  metadata.gz: ef2deb7707fc28b3b6deca9467acf318ab55a49f50a1b465a5f7fa066adf69671064e6fa58cdfc01455675626f85a34c1fc3377fab640122a3d1233cf39cd597
+  data.tar.gz: b88fc9242b7ee9a250ce5283dbaa17519b556939933db998965693773c3ffa8914d1e1b094f4f0caa20a67fd7d469d5e2e30aa9b981217f98f21eb7485311355

data/README.md

@@ -50,6 +50,7 @@ end
 # config/initializers/breadbox.rb
 
 Breadbox.configure do |config|
+  config.s3_region = xxxxxxxx             # OPTIONAL - defaults to "us-east-1"
   config.s3_bucket = "name of the bucket" # THIS IS REQUIRED
   config.s3_secret_access_key = xxxxxx    # THIS IS REQUIRED
   config.s3_access_key_id = xxxxxxx       # THIS IS REQUIRED

data/breadbox.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dropbox-sdk", "~> 1.6"
-  spec.add_dependency "aws-sdk", "~> 1.54"
+  spec.add_dependency "aws-sdk", "~> 2.1.7"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/breadbox/configuration.rb

@@ -7,6 +7,8 @@ module Breadbox
                   :provider,
                   :root_path
 
+    attr_writer :s3_region
+
     def initialize
       @root_path = default_root_path
     end
@@ -19,8 +21,16 @@ module Breadbox
       end
     end
 
+    def s3_region
+      @s3_region || default_s3_region
+    end
+
     protected
 
+    def default_s3_region
+      "us-east-1"
+    end
+
     def default_root_path
       "/"
     end

data/lib/breadbox/s3_client.rb

@@ -1,4 +1,4 @@
-require "aws"
+require "aws-sdk"
 require "breadbox/client"
 
 module Breadbox
@@ -8,35 +8,39 @@ module Breadbox
     end
 
     def s3_bucket_object
-      @bucket ||= AWS::S3.new.buckets[bucket]
+      @bucket ||= Aws::S3::Resource.new(client: s3_client_object).bucket(bucket)
     end
 
     def upload(options = {})
-      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, content_type: content_type)
+      path          = options[:path]
+      file          = options[:file]
+      acl           = options[:public] ? :public_read : :private
+      content_type  = options[:content_type]
+      filepath      = filepath_from_paths_and_file(root_path, path, file)[1..-1]
+      s3_object     = s3_bucket_object.object(filepath)
 
-      if result
-        result.public_url.to_s
+      result = s3_object.put(body: file, acl: acl, content_type: content_type)
+
+      if result && result.successful?
+        s3_object.public_url.to_s
       end
     end
 
+    def s3_client_object
+      @client ||= Aws::S3::Client.new(
+        region: configuration.s3_region,
+        credentials: Aws::Credentials.new(
+          configuration.s3_access_key_id,
+          configuration.s3_secret_access_key,
+        )
+      )
+    end
+
     protected
 
     def post_initialize
       validate_bucket
       validate_tokens
-      setup_s3
-    end
-
-    def setup_s3
-      AWS.config(
-        access_key_id: configuration.s3_access_key_id,
-        secret_access_key: configuration.s3_secret_access_key
-      )
     end
 
     def validate_bucket

data/lib/breadbox/version.rb

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

data/spec/breadbox/s3_client_spec.rb

@@ -51,22 +51,32 @@ module Breadbox
       end
     end
 
-    describe "with valid configuration settings" do
-      it "assigns the AccessKeyId and SecretAccessKey to AWS::S3" do
-        options = {
-          access_key_id: configuration.s3_access_key_id,
-          secret_access_key: configuration.s3_secret_access_key,
-        }
-        expect(AWS).to receive(:config).with(options)
-        S3Client.new(configuration)
+    describe "#s3_bucket_object" do
+      it "returns a new bucket object from Aws::S3" do
+        client = S3Client.new(configuration)
+        bucket_object = client.s3_bucket_object
+        expect(bucket_object).to be_kind_of Aws::S3::Bucket
       end
     end
 
-    describe "#s3_bucket_object" do
-      it "returns a new bucket object from AWS::S3" do
+    describe "#s3_client_object" do
+      let(:credentials) { double(:credentials) }
+
+      before do
+        allow(Aws::Credentials).to receive(:new).with(
+          configuration.s3_access_key_id,
+          configuration.s3_secret_access_key,
+        ).and_return(credentials)
+      end
+
+      it "initializes with the correct data" do
+        expect(Aws::S3::Client).to receive(:new).with(
+          region: configuration.s3_region,
+          credentials: credentials
+        )
+
         client = S3Client.new(configuration)
-        bucket_object = client.s3_bucket_object
-        expect(bucket_object).to be_kind_of AWS::S3::Bucket
+        client.s3_client_object
       end
     end
 
@@ -78,19 +88,30 @@ module Breadbox
 
       it "writes a file to an S3 Bucket Object" do
         file    = File.open("./tmp/new-file.jpg")
-        options = { acl: :public_read, content_type: nil }
-        expect_any_instance_of(AWS::S3::S3Object).to receive(:write)
-                                                     .with(file, options)
+        options = { body: file, acl: :public_read, content_type: nil }
+        expect_any_instance_of(Aws::S3::Object)
+          .to receive(:put).with(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)
+        options = { body: file, acl: :private, content_type: "image/jpeg" }
+        expect_any_instance_of(Aws::S3::Object)
+          .to receive(:put).with(options)
+
         client.upload(path: "/", file: file, content_type: "image/jpeg")
       end
+
+      it "defaults to private :acl" do
+        file    = File.open("./tmp/new-file.jpg")
+        options = { body: file, acl: :private, content_type: "image/jpeg" }
+        expect_any_instance_of(Aws::S3::Object)
+          .to receive(:put).with(options)
+
+        client.upload(path: "/", file: file, public: nil, 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.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Nathaniel Watts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dropbox-sdk
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.54'
+        version: 2.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.54'
+        version: 2.1.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement