easy-s3 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.0 (06/11/2013)
+
+### Enhancements
+* Add region in initialize method. Thanks [@Phazz](https://github.com/Phazz).
+
 ## 0.2.0 (03/10/2013)
 
 ### Enhancements
@@ -6,5 +11,3 @@
 ## 0.1.0 (29/09/2013)
 
 * Initial release
- 
-

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+ruby '1.9.3'
+
 # Specify your gem's dependencies in easy-s3.gemspec
 gemspec
 

data/README.md

@@ -22,22 +22,22 @@ Or install it yourself as:
 
 ## Usage
 
-Create instance of EasyS3:
+Create an instance of EasyS3:
 
-    s3 = EasyS3.new('my-bucket', access_key_id: 'XXX', secret_access_key: 'XXXX')
+    s3 = EasyS3.new('my-bucket', access_key_id: 'XXX', secret_access_key: 'XXXX', region: 'eu-west-1')
     
-Create private or public file:
+Create a private or a public file:
 
     file_url = s3.create_file(path_to_file) # private
     file_url = s3.create_file(path_to_file, public: true) # public
     file_url = s3.create_file(path_to_file, digest: true) # with digest
     
-Delete file by url:
+Delete a file by url:
 
     file_url = s3.create_file(path_to_file)
     s3.delete_file(file_url)
     
-Get all files in bucket:
+Get all files in the bucket:
 
     s3.files
 

data/lib/easy-s3/version.rb

@@ -1,3 +1,3 @@
 class EasyS3
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/easy-s3.rb

@@ -11,10 +11,12 @@ class EasyS3
   def initialize(dir_name, options={})
     options[:access_key_id]     ||= Fog.credentials[:aws_access_key_id]
     options[:secret_access_key] ||= Fog.credentials[:aws_secret_access_key]
+    options[:region]            ||= Fog.credentials[:region]
 
     Fog.credentials = {
         aws_access_key_id:      options[:access_key_id],
-        aws_secret_access_key:  options[:secret_access_key]
+        aws_secret_access_key:  options[:secret_access_key],
+        region:                 options[:region]
     }
 
     begin

data/spec/easy-s3_spec.rb

@@ -2,29 +2,29 @@ require 'spec_helper'
 require 'easy-s3'
 require 'fog'
 
-
 describe EasyS3 do
   let(:bucket_name)             { 'my-bucket' }
   let(:bucket_not_exist_name)   { 'test' }
+  let(:region)                  { 'eu-west-1' }
   let(:s3)                      { EasyS3.new(bucket_name) }
   let(:file_path)               { File.join('spec', 'support', 'file.txt') }
   let(:file_not_exist_path)     { File.join('spec', 'support', 'file_not_exist.txt') }
 
   before :all do
     Fog.mock!
-    Fog.credentials = { aws_access_key_id: 'XXX', aws_secret_access_key: 'XXXX' }
+    Fog.credentials = { aws_access_key_id: 'XXX', aws_secret_access_key: 'XXXX' , region: 'eu-west-1' }
     connection = Fog::Storage.new(provider: 'AWS')
     connection.directories.create(key: 'my-bucket')
   end
 
   context '.initialize' do
     it 'should raise exception if call method without argument directory name' do
-      expect{ EasyS3.new }.to raise_error(ArgumentError, 'wrong number of arguments (0 for 1)')
+      expect{ EasyS3.new }.to raise_error ArgumentError
     end
 
     it 'should accept options hash as the second argument' do
       Fog.credentials = {}
-      EasyS3.new(bucket_name, access_key_id: 'XXX', secret_access_key: 'XXXX').should be_an_instance_of EasyS3
+      EasyS3.new(bucket_name, access_key_id: 'XXX', secret_access_key: 'XXXX', region: 'eu-west-1').should be_an_instance_of EasyS3
     end
 
     it 'should raise exception if missing options access_key_id or secret_access_key' do
@@ -50,7 +50,7 @@ describe EasyS3 do
 
     it 'should create file with digest' do
       url = s3.create_file(file_path, digest: true, public: true)
-      url.should == "https://#{bucket_name}.s3.amazonaws.com/#{File.basename(file_path)}_#{Digest::SHA1.hexdigest(File.basename(file_path))}"
+      url.should == "https://#{bucket_name}.s3-#{region}.amazonaws.com/#{File.basename(file_path)}_#{Digest::SHA1.hexdigest(File.basename(file_path))}"
     end
 
     it 'should create a public file' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-s3
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2331300128522359285
+      hash: 3515566908045062486
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2331300128522359285
+      hash: 3515566908045062486
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23