blobby-s3 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 815ee79119fea852e7da5b17a52a0da336e0be7d
-  data.tar.gz: 8e1817e54d7ac8c92e7fe752e14cb1ffb11fdb88
+  metadata.gz: 98d9ddbd196d5fc309808c44ce1eacf5af1f94b6
+  data.tar.gz: 17d9a7c734176bc8fe5091c10952806f7361a367
 SHA512:
-  metadata.gz: 43ba0af1954d399a279969035cfc8480f998cd74e74cd71125cacdfe131e929113d16ff2516cb073abe39603a0d3fefc03f65549e7d676c64bb37ec0a7f216ad
-  data.tar.gz: 4504c6c2ba203320779a0374088c3dd00544a7ea73bdea31fa84d874b93ac548a7142112cd5423d3da4db1a3a547d08be72a6ef669f91d9238ecb7164bb49492
+  metadata.gz: b21edc01cccaf07db902b179a1f197864599565f8d21984cf68737166b3d8a8b237fb6ab8e419309a341c2477eea2f559d10d2069c10c13918519ae46f2b48b2
+  data.tar.gz: 28aac839a3753f4f1ea89633b8fbfd173f42e1ba1977ba3f935d9fa636e5bfdf370e08753569c2d8841623ce4f4a5765493ffd4da52ae52c0493e7564408d5c4

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
 - 2.2.2
 env:
   global:
+    - BLOBBY_S3_TEST_BUCKET=blobby-s3-test-ap-southeast-1
     - AWS_DEFAULT_REGION=us-east-1
-    - BLOBBY_S3_TEST_BUCKET=fake-aws-sdk-s3-test
-    - AWS_ACCESS_KEY_ID=AKIAJ6LW4DFV3RH4Z6OQ
-    - secure: RozEwNe8txMO8jqo/hFWnusfiUSpvz2yN6bDe1G/8bW3pOmjYT319qL5jAIHBxQFohHpUsJMxwsjS07yNq1rlBDuiDJsNnZW6RGzOuVTztaxgjeauo8X4vV3PkZU6Ln0qoYPQiCsIwQfczBpno2Eor0E1BuOXcZGtHsFoQQxWiBG9RkCelGx+ZeMuP/v8EuV4Fd5YOJgzTqWGuaFXEONqeeTVmUoObltJnPCcdpYMzI/+Wn2/dU2gnpRxTJHGrgmVKRWn/M0I7aIEQ9FeJuPVahcdkCPHfzoceTySdl/YVMcjsu6PsHPAQywo6qo4MShV/VI0cUw6hWOf9X9tzdZamyKnaeY1EaIw0C/sZ2dn7dsbRzIn9ls+mI2y32khMX/AG8hze2udKhq3Ai1gREYjo0vvU6q/i2DAoDETaP/Ig3qJshzz1XntBx9NAGkzad3xbkRB9p/e60pfB9E4ZxZG+OSkUi7AGu68ZlI2ceSus46QkG6ya9FNUnJTQEuaUvrg7EASiuKBjQia8Ce9GwzujAxZWVRwWDjvTg3Wo5oGxfVmHWEleVVTFtuuvkroChyetgr/1iLXOigvssHRYFPlDhWKH/bJ9gjyYequEJxoBREwW/Qe3u4kCGgR0vz0CWcVP9RRejTm4RDUpmcreun423WTmq5UWmb9Pj5Fd1f3wM=
+    - AWS_ACCESS_KEY_ID=AKIAI7QKS6WHW6T7JAPA
+    - secure: "uK7zdCn+zAQQALMD2RGJyif/+hKz6lKpBLL1hi9P7h1UzyUkArQ97zpjEOEpUWi26nU8bpyVtVNtuGh7nUKm2YdHlOw6E3uSfCXDUwgAMGgiFsQdrXx4lecIHlh8sfSa3lROmbjgYrbNarbKKSJeyY/guwf+NnssKutomXfDiLjHPAhRpUdXqfGA/k+ivehgvdSVDYDcoV2zpPYjYTtZEGkTlvENv9YZqjDY0NUad1XaKJOULcGKj8Wk9RmpUCl2Hrc39VOjmB2blTC/Il9edP+F24dJRmHR8a/tG9kPia5jIqU/UFE0PJco3XgS8rITtjREixUXScwyJDTgeguitbLiw5W8f3qI+12BC4OxQNCAxPDfZr+sxXPZdTZ8qDsC5a/4i58rp+YGSWcFMpL4DQ3MGTufh1Ny5xCFBIu8tUOjD1PuTXAM+De//jPjaYERNTbBldBZKCi0DHwo37agcg69kCYy4A5Q2H/8i52mBYLKsi47OasJTKlZ0caol3wQUsYNY5OGrfHWFz+t5nORwgbF+x9D6TtedphWtpNy62aZFYMmMxud0dX+LfZKm3xi+AlSdZZ5fw/Un5jFKAe1MqNsinkh7+OVyreoZD8MqTUvK3YDOZXHLb5S0FRcqtkN/Dj2PVWzDnhO1hTHK/dhF5EF+axCgcpYNjdgJfhjx28="

data/blobby-s3.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/realestate-com.au/blobby-s3"
 
   gem.name          = "blobby-s3"
-  gem.version       = "1.1.0"
+  gem.version       = "1.1.1"
 
   gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }

data/lib/blobby/s3_store.rb

@@ -22,6 +22,12 @@ module Blobby
       store
     end
 
+    def self.bucket_region(bucket_name, s3_options = {})
+      s3_client = Aws::S3::Client.new(s3_options)
+      result = s3_client.get_bucket_location(:bucket => bucket_name)
+      result ? result.location_constraint : "us-east-1"
+    end
+
     # Create a new instance.
     #
     # bucket_name  - name of the bucket to store things in
@@ -29,8 +35,7 @@ module Blobby
     #
     def initialize(bucket_name, s3_options = {})
       @bucket_name = bucket_name.to_str
-      @s3_options = s3_options.dup
-      @s3_options[:endpoint] = s3_endpoint_for_bucket
+      @s3_options = s3_options
     end
 
     attr_reader :bucket_name
@@ -96,26 +101,12 @@ module Blobby
 
     private
 
-    def s3_client
-      ::Aws::S3::Client.new(s3_options)
-    end
-
-    def s3_endpoint_for_bucket
-      location = s3_client.get_bucket_location(:bucket => bucket_name).location_constraint
-      case location
-      when ""
-        "https://s3.amazonaws.com"
-      when "EU"
-        "https://s3-eu-west-1.amazonaws.com"
-      else
-        "https://s3-#{location}.amazonaws.com"
-      end
-    rescue ::Aws::Errors::ServiceError
-      "https://s3.amazonaws.com"
+    def bucket_region
+      @bucket_region ||= S3Store.bucket_region(bucket_name, s3_options)
     end
 
     def s3_resource
-      ::Aws::S3::Resource.new(s3_options)
+      ::Aws::S3::Resource.new(s3_options.merge(:region => bucket_region))
     end
 
     def bucket

data/spec/blobby/s3_store_spec.rb

@@ -9,6 +9,10 @@ require "blobby/store_behaviour"
 
 describe Blobby::S3Store do
 
+  before do
+    allow(Blobby::S3Store).to receive(:bucket_region).and_return("us-east-1")
+  end
+
   describe ".from_uri" do
 
     context "with s3://bucket" do
@@ -73,9 +77,13 @@ describe Blobby::S3Store, :integration => true do
 
   context "with a writable bucket" do
 
-    EXISTING_BUCKET_NAME = ENV.fetch("BLOBBY_S3_TEST_BUCKET", "fake-aws-sdk-s3-test")
+    EXISTING_BUCKET_NAME = ENV.fetch("BLOBBY_S3_TEST_BUCKET", "blobby-s3-test-ap-southeast-1")
+
+    let(:bucket_region) do
+      Blobby::S3Store.bucket_region(EXISTING_BUCKET_NAME)
+    end
 
-    let(:s3_resource) { Aws::S3::Resource.new(:region => "us-east-1")}
+    let(:s3_resource) { Aws::S3::Resource.new(:region => bucket_region) }
     let(:bucket) { s3_resource.bucket(EXISTING_BUCKET_NAME) }
 
     before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobby-s3
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-resources
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Store BLOBs in S3