nightcrawler_swift 0.4.0 → 0.5.0

data/spec/lib/nightcrawler_swift/commands/download_spec.rb

@@ -25,15 +25,15 @@ describe NightcrawlerSwift::Download do
       subject.execute "file_path"
     end
 
-    before do
-      allow(subject).to receive(:get).and_return(response)
-    end
-
     context "success" do
       let :response do
         double(:response, code: 200, body: "content")
       end
 
+      before do
+        allow(subject).to receive(:get).and_return(response)
+      end
+
       it "gets using public url" do
         execute
         expect(subject).to have_received(:get).with("server-url/#{bucket}/file_path")
@@ -44,31 +44,10 @@ describe NightcrawlerSwift::Download do
       end
     end
 
-    context "when the file does not exist" do
-      let :response do
-        double(:response, code: 404)
-      end
-
-      before do
-        allow(subject).to receive(:get).and_raise(RestClient::ResourceNotFound.new(response))
-      end
-
-      it "raises NightcrawlerSwift::Exceptions::NotFoundError" do
-        expect { execute }.to raise_error NightcrawlerSwift::Exceptions::NotFoundError
-      end
-    end
-
-    context "when another error happens" do
-      let :response do
-        double(:response, code: 500)
-      end
-
-      before do
-        allow(subject).to receive(:get).and_raise(RuntimeError.new(response))
-      end
-
-      it "raises NightcrawlerSwift::Exceptions::ConnectionError" do
-        expect { execute }.to raise_error NightcrawlerSwift::Exceptions::ConnectionError
+    context "when the path was not informed" do
+      it "raises NightcrawlerSwift::Exceptions::ValidationError" do
+        expect { subject.execute nil }.to raise_error NightcrawlerSwift::Exceptions::ValidationError
+        expect { subject.execute "" }.to raise_error NightcrawlerSwift::Exceptions::ValidationError
       end
     end
   end

data/spec/lib/nightcrawler_swift/commands/list_spec.rb

@@ -19,56 +19,26 @@ describe NightcrawlerSwift::List do
   end
 
   describe "#execute" do
-    context "success" do
-      let :json_response do
-        [{"name" => "file"}]
-      end
-
-      let :response do
-        double(:response, code: 200, body: json_response.to_json)
-      end
-
-      before do
-        allow(subject).to receive(:get).and_return(response)
-      end
-
-      it "gets upload url" do
-        subject.execute
-        expect(subject).to have_received(:get).with(connection.upload_url, headers: {accept: :json})
-      end
-
-      it "returns the parsed json" do
-        result = subject.execute
-        expect(result).to eql json_response
-      end
+    let :json_response do
+      [{"name" => "file"}]
     end
 
-    context "when the bucket does not exist" do
-      let :response do
-        double(:response, code: 400)
-      end
-
-      before do
-        allow(subject).to receive(:get).and_raise(RestClient::ResourceNotFound.new(response))
-      end
-
-      it "raises NightcrawlerSwift::Exceptions::NotFoundError" do
-        expect { subject.execute }.to raise_error NightcrawlerSwift::Exceptions::NotFoundError
-      end
+    let :response do
+      double(:response, code: 200, body: json_response.to_json)
     end
 
-    context "when another error happens" do
-      let :response do
-        double(:response, code: 500)
-      end
+    before do
+      allow(subject).to receive(:get).and_return(response)
+    end
 
-      before do
-        allow(subject).to receive(:get).and_raise(RuntimeError.new(response))
-      end
+    it "gets upload url" do
+      subject.execute
+      expect(subject).to have_received(:get).with(connection.upload_url, headers: {accept: :json})
+    end
 
-      it "raises NightcrawlerSwift::Exceptions::ConnectionError" do
-        expect { subject.execute }.to raise_error NightcrawlerSwift::Exceptions::ConnectionError
-      end
+    it "returns the parsed json" do
+      result = subject.execute
+      expect(result).to eql json_response
     end
   end
 

data/spec/lib/nightcrawler_swift/commands/upload_spec.rb

@@ -71,7 +71,7 @@ describe NightcrawlerSwift::Upload do
     it "sends max_age into headers" do
       NightcrawlerSwift.configure max_age: max_age
       execute
-      expect(subject).to have_received(:put).with(anything, hash_including(headers: { content_type: "text/css", etag: etag, cache_control: "max-age=#{max_age}" }))
+      expect(subject).to have_received(:put).with(anything, hash_including(headers: { content_type: "text/css", etag: etag, cache_control: "public, max-age=#{max_age}" }))
     end
 
     context "when response code is 200" do
@@ -87,13 +87,6 @@ describe NightcrawlerSwift::Upload do
       let(:response) { double(:response, code: 500) }
       it { expect(execute).to be false }
     end
-
-    context "when rescue RestClient::UnprocessableEntity" do
-      it "wraps into NightcrawlerSwift::Exceptions::ValidationError" do
-        expect(subject).to receive(:put).and_raise(RestClient::UnprocessableEntity.new)
-        expect { execute }.to raise_error NightcrawlerSwift::Exceptions::ValidationError
-      end
-    end
   end
 
 end

data/spec/lib/nightcrawler_swift/connection_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe NightcrawlerSwift::Connection do
 
-  let :opts do
+  let :options do
     {
       bucket: "my-bucket-name",
       tenant_name: "tenant_username1",
@@ -13,9 +13,8 @@ describe NightcrawlerSwift::Connection do
     }
   end
 
-  let :unauthorized_error do
-    response = OpenStruct.new(body: "error", code: 401)
-    RestClient::Unauthorized.new response, response.code
+  let :opts do
+    options
   end
 
   subject do
@@ -112,17 +111,35 @@ describe NightcrawlerSwift::Connection do
           expect { subject.connect! }.to raise_error(NightcrawlerSwift::Exceptions::ConfigurationError)
         end
       end
+
+      context "with a configured admin_url" do
+        let(:new_admin_url){ "http://some-new-admin-url" }
+        let(:opts) { options.merge(admin_url: new_admin_url) }
+
+        it "uses the given url" do
+          subject.connect!
+          expect(subject.admin_url).to eql new_admin_url
+        end
+      end
+
+      context "with a configured public_url" do
+        let(:new_public_url) { "http://some-new-public-url" }
+        let(:opts) { options.merge(public_url: new_public_url) }
+
+        it "uses the given url" do
+          subject.connect!
+          expect(subject.public_url).to eql new_public_url
+        end
+      end
     end
 
-    describe "when some error happens with the connection" do
+    describe "when some error happens" do
       before do
-        allow(RestClient).to receive(:post).
-          with(opts[:auth_url], auth_json, content_type: :json, accept: :json).
-          and_raise(unauthorized_error)
+        allow(RestClient::Resource).to receive(:new).and_raise(StandardError.new("error!"))
       end
 
       it "raises NightcrawlerSwift::Exceptions::ConnectionError" do
-        expect { subject.connect! }.to raise_error(NightcrawlerSwift::Exceptions::ConnectionError)
+        expect { subject.connect! }.to raise_error NightcrawlerSwift::Exceptions::ConnectionError
       end
     end
   end

data/spec/lib/nightcrawler_swift/gateway_spec.rb

@@ -0,0 +1,139 @@
+require 'spec_helper'
+
+describe NightcrawlerSwift::Gateway do
+
+  let :url do
+    "http://some-url"
+  end
+
+  let :request_get do
+    subject.request {|r| r.get}
+  end
+
+  subject do
+    NightcrawlerSwift::Gateway.new url
+  end
+
+  before do
+    NightcrawlerSwift.configure
+  end
+
+  describe "initialization" do
+    it "creates the resource with the url and the options: verify_ssl and timeout" do
+      expect(RestClient::Resource).to receive(:new).with(
+        url,
+        verify_ssl: NightcrawlerSwift.options.verify_ssl,
+        timeout: NightcrawlerSwift.options.timeout
+      )
+      subject
+    end
+  end
+
+  describe "#request" do
+    context "with a successful request" do
+      it "calls the received block" do
+        expect(subject).to receive(:request).and_yield(subject.resource)
+        subject.request {|resource| }
+      end
+    end
+
+    context "when it is not authorized" do
+      let(:response) { double(:response, code: 401) }
+
+      before do
+        allow(subject.resource).to receive(:get).and_raise(RestClient::Unauthorized.new(response))
+      end
+
+      it "raises NightcrawlerSwift::Exceptions::UnauthorizedError" do
+        expect { request_get }.to raise_error NightcrawlerSwift::Exceptions::UnauthorizedError
+      end
+    end
+
+    context "when the resource does not exist" do
+      let(:response) { double(:response, code: 404) }
+
+      before do
+        allow(subject.resource).to receive(:get).and_raise(RestClient::ResourceNotFound.new(response))
+      end
+
+      it "raises NightcrawlerSwift::Exceptions::NotFoundError" do
+        expect { request_get }.to raise_error NightcrawlerSwift::Exceptions::NotFoundError
+      end
+    end
+
+    context "when rescue RestClient::UnprocessableEntity" do
+      let(:response) { double(:response, code: 422) }
+
+      before do
+        allow(subject.resource).to receive(:get).and_raise(RestClient::UnprocessableEntity.new(response))
+      end
+
+      it "wraps into NightcrawlerSwift::Exceptions::ValidationError" do
+        expect { request_get }.to raise_error NightcrawlerSwift::Exceptions::ValidationError
+      end
+    end
+
+    context "when another error happens" do
+      let :response do
+        double(:response, code: 500)
+      end
+
+      let :retries do
+        3
+      end
+
+      context "with enough retries" do
+        it "recovers from the failure" do
+          expect(subject.resource).to receive(:get).once.and_raise(RuntimeError.new(response))
+          expect(subject.resource).to receive(:get).once.and_return(true)
+          expect(subject).to receive(:sleep).once.with(1)
+          expect(subject).to_not receive(:sleep).with(2)
+          expect { request_get }.to_not raise_error
+          expect(subject.attempts).to eql(2) # original + one retry
+        end
+      end
+
+      context "with all retries used" do
+        before do
+          NightcrawlerSwift.options.retries = retries
+        end
+
+        it "waits a time based on the attempt number and if no one results in a good request it raises the exception" do
+          expect(subject.instance_variable_get(:@retries)).to eql retries
+          expect(subject.resource).to receive(:get).exactly(4).times.and_raise(RuntimeError.new(response))
+          expect(subject).to receive(:sleep).once.with(1)
+          expect(subject).to receive(:sleep).once.with(2)
+          expect(subject).to receive(:sleep).once.with(4)
+          expect { request_get }.to raise_error NightcrawlerSwift::Exceptions::ConnectionError
+          expect(subject.attempts).to eql(retries + 1)
+        end
+
+        context "and the time achieves max_retry_time" do
+          it "waits the max_retry_time for every retry" do
+            current_retry_time = NightcrawlerSwift.options.max_retry_time - 1
+            subject.instance_variable_set(:@current_retry_time, current_retry_time)
+            expect(subject.resource).to receive(:get).exactly(4).times.and_raise(RuntimeError.new(response))
+            expect(subject).to receive(:sleep).once.with(current_retry_time)
+            expect(subject).to receive(:sleep).twice.with(NightcrawlerSwift.options.max_retry_time)
+            expect { request_get }.to raise_error NightcrawlerSwift::Exceptions::ConnectionError
+            expect(subject.attempts).to eql(retries + 1)
+          end
+        end
+      end
+
+      context "with retries set to false" do
+        before do
+          NightcrawlerSwift.options.retries = false
+          expect(subject).to_not receive(:sleep)
+        end
+
+        it "raises NightcrawlerSwift::Exceptions::ConnectionError" do
+          expect(subject.resource).to receive(:get).once.and_raise(RuntimeError.new(response))
+          expect { request_get }.to raise_error NightcrawlerSwift::Exceptions::ConnectionError
+          expect(subject.attempts).to eql(1)
+        end
+      end
+    end
+  end
+
+end

data/spec/lib/nightcrawler_swift_spec.rb

@@ -3,7 +3,6 @@ require "spec_helper"
 describe NightcrawlerSwift do
 
   let(:opts) { {bucket: "rogue"} }
-  let(:options) { OpenStruct.new(opts) }
 
   subject do
     NightcrawlerSwift
@@ -50,6 +49,18 @@ describe NightcrawlerSwift do
       end
     end
 
+    context "retries" do
+      it "defauts to 5" do
+        expect(subject.options.retries).to eql 5
+      end
+    end
+
+    context "max_retry_time" do
+      it "defauts to 30" do
+        expect(subject.options.max_retry_time).to eql 30
+      end
+    end
+
     context "and max_age isn't an integer" do
       let(:opts) { {max_age: "a string"} }
 
@@ -75,7 +86,9 @@ describe NightcrawlerSwift do
 
     it "returns the given options" do
       NightcrawlerSwift.configure(opts)
-      expect(NightcrawlerSwift.options).to eql(OpenStruct.new(opts.merge(verify_ssl: false)))
+      opts.keys.each do |key|
+        expect(NightcrawlerSwift.options).to respond_to key
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require "rake"
 require "byebug"
 require "nightcrawler_swift"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nightcrawler_swift
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - tulios
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +133,10 @@ files:
 - bin/nswift
 - lib/nightcrawler_swift.rb
 - lib/nightcrawler_swift/cli.rb
+- lib/nightcrawler_swift/cli/commands/url_for.rb
+- lib/nightcrawler_swift/cli/formatters/basic.rb
+- lib/nightcrawler_swift/cli/opt_parser.rb
+- lib/nightcrawler_swift/cli/runner.rb
 - lib/nightcrawler_swift/command.rb
 - lib/nightcrawler_swift/commands/delete.rb
 - lib/nightcrawler_swift/commands/download.rb
@@ -127,6 +145,7 @@ files:
 - lib/nightcrawler_swift/commands/upload.rb
 - lib/nightcrawler_swift/connection.rb
 - lib/nightcrawler_swift/exceptions.rb
+- lib/nightcrawler_swift/gateway.rb
 - lib/nightcrawler_swift/railtie.rb
 - lib/nightcrawler_swift/tasks/asset_sync.rake
 - lib/nightcrawler_swift/version.rb
@@ -137,7 +156,10 @@ files:
 - spec/fixtures/assets/ex3/ex4.txt
 - spec/fixtures/assets/js1.js
 - spec/fixtures/auth_success.json
-- spec/lib/nightcrawler_swift/cli_spec.rb
+- spec/lib/nightcrawler_swift/cli/commands/url_for_spec.rb
+- spec/lib/nightcrawler_swift/cli/formatters/basic_spec.rb
+- spec/lib/nightcrawler_swift/cli/opt_parser_spec.rb
+- spec/lib/nightcrawler_swift/cli/runner_spec.rb
 - spec/lib/nightcrawler_swift/command_spec.rb
 - spec/lib/nightcrawler_swift/commands/delete_spec.rb
 - spec/lib/nightcrawler_swift/commands/download_spec.rb
@@ -145,6 +167,7 @@ files:
 - spec/lib/nightcrawler_swift/commands/sync_spec.rb
 - spec/lib/nightcrawler_swift/commands/upload_spec.rb
 - spec/lib/nightcrawler_swift/connection_spec.rb
+- spec/lib/nightcrawler_swift/gateway_spec.rb
 - spec/lib/nightcrawler_swift/tasks/asset_sync_spec.rb
 - spec/lib/nightcrawler_swift_spec.rb
 - spec/spec_helper.rb
@@ -180,7 +203,10 @@ test_files:
 - spec/fixtures/assets/ex3/ex4.txt
 - spec/fixtures/assets/js1.js
 - spec/fixtures/auth_success.json
-- spec/lib/nightcrawler_swift/cli_spec.rb
+- spec/lib/nightcrawler_swift/cli/commands/url_for_spec.rb
+- spec/lib/nightcrawler_swift/cli/formatters/basic_spec.rb
+- spec/lib/nightcrawler_swift/cli/opt_parser_spec.rb
+- spec/lib/nightcrawler_swift/cli/runner_spec.rb
 - spec/lib/nightcrawler_swift/command_spec.rb
 - spec/lib/nightcrawler_swift/commands/delete_spec.rb
 - spec/lib/nightcrawler_swift/commands/download_spec.rb
@@ -188,6 +214,7 @@ test_files:
 - spec/lib/nightcrawler_swift/commands/sync_spec.rb
 - spec/lib/nightcrawler_swift/commands/upload_spec.rb
 - spec/lib/nightcrawler_swift/connection_spec.rb
+- spec/lib/nightcrawler_swift/gateway_spec.rb
 - spec/lib/nightcrawler_swift/tasks/asset_sync_spec.rb
 - spec/lib/nightcrawler_swift_spec.rb
 - spec/spec_helper.rb