rain_forest 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 053009707b53ff1327d2eb81d8e825f5c8b04b8d
-  data.tar.gz: 486d02c47c770d0c26895c9e27caf2164a788673
+  metadata.gz: 5276b08a7b706b69e684e0539ed058298181b7a3
+  data.tar.gz: 52c8fde23cf2d9559e383c7ed3c612b2cb7071b7
 SHA512:
-  metadata.gz: a828ff2f6e9d5a879baf1043923f05c04ff059516ed1d15ac1d3af79846fce19676e349e0957faffa19cc737038fac7d6a377f58af96e20f33c96d21e7eec408
-  data.tar.gz: ffc603e6c91f4b237ba8669217ec8e4bc957c2ec3878ff0a0e568ad6d63b663bc804abd9270b8d086e68082f0aba20021d05064f14a75f0e57c4e3c72fa62bfc
+  metadata.gz: ccd1c72dc8cb90034fd48e883a5c874bf67965b82e4e0f93c6a248a9fd9bea9a5fda95092412401745ace292030dbbb4b7a19e35c3b93f6ace33ab6c42044995
+  data.tar.gz: d3d2dd20848cbeafec5c5e6a49a08f7908b25ccede58bb2aa0d9e346d11d5aa944392ed27d2cf1ff0c2304ba052fc48aa50ad4c224e3911c12894946096381d4

data/README.markdown

@@ -14,12 +14,12 @@ Use Ruby Gems to install rain_forest to get started:
 
 There are 4 ENVIRONMENT variables which are used to configure Rain Forest to your AWS account:
 
-    ENV["rain_forest_aws_akid"]    = "YOUR_ACCESS_KEY_ID"
-    ENV["rain_forest_aws_secret"]  = "YOUR_SECRET_ACCESS_KEY"
-    ENV["rain_forest_aws_region"]  = "YOUR_BUCKET_REGION"
-    ENV["rain_forest_aws_bucket"]  = "YOUR_BUCKET"
+    ENV["RAIN_FOREST_AWS_AKID"]    = "YOUR_ACCESS_KEY_ID"
+    ENV["RAIN_FOREST_AWS_SECRET"]  = "YOUR_SECRET_ACCESS_KEY"
+    ENV["RAIN_FOREST_AWS_REGION"]  = "YOUR_BUCKET_REGION"
+    ENV["RAIN_FOREST_AWS_BUCKET"]  = "YOUR_BUCKET"
 
-In a typical Rails environment you could use a YML file and an initializer to configure Rain Forest as follows:
+In a typical Rails application you could use a YML file and an initializer to configure Rain Forest as follows:
 
 config/rain_forest.yml
 
@@ -47,7 +47,7 @@ config/initializers/rain_forest.rb
 
     options = config['rain_forest'][environment]
     options.each do |k,v|
-      ENV["rain_forest_#{k}"] = v
+      ENV["RAIN_FOREST_#{k}".upcase] = v
     end
 
 ## Available Methods

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rain_forest/s3.rb

@@ -5,9 +5,20 @@ module RainForest
     attr_accessor :bucket, :client
 
     def initialize
-      region =  ENV['rain_forest_aws_region']
-      credentials = ::Aws::Credentials.new(ENV['rain_forest_aws_akid'], ENV['rain_forest_aws_secret'])
-      @bucket = ENV['rain_forest_aws_bucket']
+      region = ENV['RAIN_FOREST_AWS_REGION']
+      region = ENV['rain_forest_aws_region'] if region.nil?#fallback to older config
+
+      akid = ENV['RAIN_FOREST_AWS_AKID']
+      akid = ENV['rain_forest_aws_akid'] if akid.nil?#fallback to older config
+
+      secret = ENV['RAIN_FOREST_AWS_SECRET']
+      secret = ENV['rain_forest_aws_secret'] if secret.nil?#fallback to older config
+
+      bucket = ENV['RAIN_FOREST_AWS_BUCKET']
+      bucket = ENV['rain_forest_aws_bucket'] if bucket.nil?#fallback to older config
+
+      credentials = ::Aws::Credentials.new(akid, secret)
+      @bucket = ENV['RAIN_FOREST_AWS_BUCKET']
       @client = ::Aws::S3::Client.new(region: region,  credentials: credentials)
     end
 

data/rain_forest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rain_forest"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lukas Beaton"]
-  s.date = "2016-03-02"
+  s.date = "2016-06-13"
   s.description = "A simplified adaptor for Amazon Web Services. Only S3 is supported at the moment."
   s.email = "lukas.beaton@gmail.com"
   s.extra_rdoc_files = [

data/spec/rain_forest/s3_spec.rb

@@ -5,13 +5,13 @@ describe RainForest::S3 do
   let(:client){ double("AWS Client") }
 
   before do
-    expect(::Aws::Credentials).to receive(:new).with(ENV["rain_forest_aws_akid"], ENV["rain_forest_aws_secret"]).and_return(credentials).at_least(:once)
-    expect(::Aws::S3::Client).to receive(:new).with(region: ENV["rain_forest_aws_region"], credentials: credentials).and_return(client).at_least(:once)
+    expect(::Aws::Credentials).to receive(:new).with(ENV["RAIN_FOREST_AWS_AKID"], ENV["RAIN_FOREST_AWS_SECRET"]).and_return(credentials).at_least(:once)
+    expect(::Aws::S3::Client).to receive(:new).with(region: ENV["RAIN_FOREST_AWS_REGION"], credentials: credentials).and_return(client).at_least(:once)
   end
 
   describe "#write" do
     it "works with default public-read permissions" do
-      expect(client).to receive(:put_object).with(bucket: ENV["rain_forest_aws_bucket"], key: "STORAGE-KEY", body: "Some test data...", acl: "public-read").and_return(true)
+      expect(client).to receive(:put_object).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], key: "STORAGE-KEY", body: "Some test data...", acl: "public-read").and_return(true)
 
       success, message = RainForest::S3.write("STORAGE-KEY", "Some test data...")
 
@@ -20,7 +20,7 @@ describe RainForest::S3 do
     end
 
     it "accepts other options" do
-      expect(client).to receive(:put_object).with(bucket: ENV["rain_forest_aws_bucket"], key: "STORAGE-KEY", body: "Some test data...", acl: "public-read", content_encoding: 'utf8').and_return(true)
+      expect(client).to receive(:put_object).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], key: "STORAGE-KEY", body: "Some test data...", acl: "public-read", content_encoding: 'utf8').and_return(true)
 
       success, message = RainForest::S3.write("STORAGE-KEY", "Some test data...", content_encoding: 'utf8')
 
@@ -29,7 +29,7 @@ describe RainForest::S3 do
     end
 
     it "handles errors" do
-      expect(client).to receive(:put_object).with(bucket: ENV["rain_forest_aws_bucket"], key: "STORAGE-KEY", body: "Some test data...", acl: "public-read").and_raise(Exception.new("KABOOM!"))
+      expect(client).to receive(:put_object).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], key: "STORAGE-KEY", body: "Some test data...", acl: "public-read").and_raise(Exception.new("KABOOM!"))
 
       success, message = RainForest::S3.write("STORAGE-KEY", "Some test data...")
 
@@ -43,7 +43,7 @@ describe RainForest::S3 do
     let(:response_object){ double("Response Object", body: response_body) }
 
     it "works" do
-      expect(client).to receive(:get_object).with(bucket: ENV["rain_forest_aws_bucket"], key: "STORAGE-KEY").and_return(response_object)
+      expect(client).to receive(:get_object).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], key: "STORAGE-KEY").and_return(response_object)
 
       success, data = RainForest::S3.read("STORAGE-KEY")
 
@@ -52,7 +52,7 @@ describe RainForest::S3 do
     end
 
     it "handles errors" do
-      expect(client).to receive(:get_object).with(bucket: ENV["rain_forest_aws_bucket"], key: "STORAGE-KEY").and_raise(Exception.new("KABOOM!"))
+      expect(client).to receive(:get_object).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], key: "STORAGE-KEY").and_raise(Exception.new("KABOOM!"))
 
       success, data = RainForest::S3.read("STORAGE-KEY")
 
@@ -65,7 +65,7 @@ describe RainForest::S3 do
     let(:response_metadata){ double("Response Metadata", content_length: 12345) }
 
     it "works" do
-      expect(client).to receive(:head_object).with(bucket: ENV["rain_forest_aws_bucket"], key: "STORAGE-KEY").and_return(response_metadata)
+      expect(client).to receive(:head_object).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], key: "STORAGE-KEY").and_return(response_metadata)
 
       response = RainForest::S3.content_length("STORAGE-KEY")
 
@@ -73,7 +73,7 @@ describe RainForest::S3 do
     end
 
     it "returns -1 for errors" do
-      expect(client).to receive(:head_object).with(bucket: ENV["rain_forest_aws_bucket"], key: "STORAGE-KEY").and_raise(Exception.new("KABOOM!"))
+      expect(client).to receive(:head_object).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], key: "STORAGE-KEY").and_raise(Exception.new("KABOOM!"))
 
       response = RainForest::S3.content_length("STORAGE-KEY")
 
@@ -89,8 +89,8 @@ describe RainForest::S3 do
     let(:deleted_response){ double("Deleted Objects", deleted: contents) }
     
     it "works and returns the number of delete objects" do
-      expect(client).to receive(:list_objects).with(bucket: ENV["rain_forest_aws_bucket"], prefix: "SOME-PREFIX").and_return(objects_response)
-      expect(client).to receive(:delete_objects).with(bucket: ENV["rain_forest_aws_bucket"], delete: {objects: [{key: "abc"}, {key: "123"}]}).and_return(deleted_response)
+      expect(client).to receive(:list_objects).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], prefix: "SOME-PREFIX").and_return(objects_response)
+      expect(client).to receive(:delete_objects).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], delete: {objects: [{key: "abc"}, {key: "123"}]}).and_return(deleted_response)
 
       result = RainForest::S3.delete_objects("SOME-PREFIX")
 
@@ -98,7 +98,7 @@ describe RainForest::S3 do
     end
     
     it "returns -1 for errors" do
-      expect(client).to receive(:list_objects).with(bucket: ENV["rain_forest_aws_bucket"], prefix: "SOME-PREFIX").and_raise(Exception.new("KABOOM!"))
+      expect(client).to receive(:list_objects).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], prefix: "SOME-PREFIX").and_raise(Exception.new("KABOOM!"))
 
       result = RainForest::S3.delete_objects("SOME-PREFIX")
 
@@ -108,8 +108,8 @@ describe RainForest::S3 do
 
   describe "#move" do
     it "works" do
-      expect(client).to receive(:copy_object).with(bucket: ENV["rain_forest_aws_bucket"], copy_source: "#{ENV["rain_forest_aws_bucket"]}/SOURCE-KEY", key: "DEST-KEY")
-      expect(client).to receive(:delete_object).with(bucket: ENV["rain_forest_aws_bucket"], key: "SOURCE-KEY")
+      expect(client).to receive(:copy_object).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], copy_source: "#{ENV["RAIN_FOREST_AWS_BUCKET"]}/SOURCE-KEY", key: "DEST-KEY")
+      expect(client).to receive(:delete_object).with(bucket: ENV["RAIN_FOREST_AWS_BUCKET"], key: "SOURCE-KEY")
 
       success, message = RainForest::S3.move("SOURCE-KEY", "DEST-KEY")
 

data/spec/spec_helper.rb

@@ -29,10 +29,10 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-ENV["rain_forest_aws_akid"]    = "DUMMY_rain_forest_aws_akid"
-ENV["rain_forest_aws_secret"]  = "DUMMY_rain_forest_aws_secret"
-ENV["rain_forest_aws_region"]  = "DUMMY_rain_forest_aws_region"
-ENV["rain_forest_aws_bucket"]  = "DUMMY_rain_forest_aws_bucket"
+ENV["RAIN_FOREST_AWS_AKID"]    = "DUMMY_RAIN_FOREST_AWS_AKID"
+ENV["RAIN_FOREST_AWS_SECRET"]  = "DUMMY_RAIN_FOREST_AWS_SECRET"
+ENV["RAIN_FOREST_AWS_REGION"]  = "DUMMY_RAIN_FOREST_AWS_REGION"
+ENV["RAIN_FOREST_AWS_BUCKET"]  = "DUMMY_RAIN_FOREST_AWS_BUCKET"
 
 RSpec.configure do |config|
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rain_forest
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Lukas Beaton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk