nightcrawler_swift 0.3.0 → 0.4.0

data/spec/lib/nightcrawler_swift/command_spec.rb

@@ -7,20 +7,62 @@ describe NightcrawlerSwift::Command do
   end
 
   before do
+    NightcrawlerSwift.configure
     allow(NightcrawlerSwift).to receive(:connection).and_return(connection)
+    allow(connection).to receive(:token_id).and_return(token)
+    allow(connection).to receive(:expires_at).and_return(expires_at)
     allow(RestClient::Resource).to receive(:new).and_return(restclient)
   end
 
-  let(:connection) { double(:connection, token_id: token) }
+  let(:connection) { NightcrawlerSwift::Connection.new }
   let(:restclient) { double(:restclient, put: response, get: response, delete: response) }
   let(:response) { double(:response) }
+  let(:url) { "http://url.com" }
+  let(:token) { "token" }
+  let(:expires_at) { (DateTime.now + 60).to_time }
+
+  shared_examples "resource configured with NightcrawlerSwift.options" do
+    it "uses the configured verify_ssl" do
+      NightcrawlerSwift.configure verify_ssl: true
+      execute_http
+      expect(RestClient::Resource).to have_received(:new).with(url, hash_including(verify_ssl: true))
+    end
 
-  let :url do
-    "http://url.com"
+    it "uses the configured timeout" do
+      NightcrawlerSwift.configure timeout: 10
+      execute_http
+      expect(RestClient::Resource).to have_received(:new).with(url, hash_including(timeout: 10))
+    end
   end
 
-  let :token do
-    "token"
+  describe "#connection" do
+    context "when disconnected" do
+      before do
+        allow(NightcrawlerSwift.connection).to receive(:connected?).and_return(false)
+      end
+
+      it "connects and then return the connection" do
+        expect(NightcrawlerSwift.connection).to receive(:connect!)
+        expect(subject.connection).to eql(connection)
+      end
+    end
+
+    context "when connected" do
+      before do
+        allow(NightcrawlerSwift.connection).to receive(:connected?).and_return(true)
+      end
+
+      it "returns the connection" do
+        expect(NightcrawlerSwift.connection).to_not receive(:connect!)
+        expect(subject.connection).to eql(connection)
+      end
+    end
+  end
+
+  describe "#options" do
+    it "returns NightcrawlerSwift.options" do
+      expect(subject.options).to eql(NightcrawlerSwift.options)
+    end
   end
 
   describe "#get" do
@@ -28,10 +70,8 @@ describe NightcrawlerSwift::Command do
       subject.send :get, url, headers: {content_type: :json}
     end
 
-    it "uses url to initialize RestClient" do
-      get
-      expect(RestClient::Resource).to have_received(:new).with(url, verify_ssl: false)
-    end
+    let(:execute_http) { get }
+    it_behaves_like "resource configured with NightcrawlerSwift.options"
 
     it "sends headers with token" do
       get
@@ -48,10 +88,8 @@ describe NightcrawlerSwift::Command do
       subject.send :delete, url, headers: {content_type: :json}
     end
 
-    it "uses url to initialize RestClient" do
-      delete
-      expect(RestClient::Resource).to have_received(:new).with(url, verify_ssl: false)
-    end
+    let(:execute_http) { delete }
+    it_behaves_like "resource configured with NightcrawlerSwift.options"
 
     it "sends headers with token" do
       delete
@@ -68,6 +106,9 @@ describe NightcrawlerSwift::Command do
       subject.send(:put, url, body: 'content', headers: {a: 1})
     end
 
+    let(:execute_http) { put }
+    it_behaves_like "resource configured with NightcrawlerSwift.options"
+
     it "returns RestClient response" do
       expect(put).to eql(response)
     end
@@ -84,7 +125,7 @@ describe NightcrawlerSwift::Command do
 
     it "uses url to initialize RestClient" do
       put
-      expect(RestClient::Resource).to have_received(:new).with(url, verify_ssl: false)
+      expect(RestClient::Resource).to have_received(:new).with(url, verify_ssl: false, timeout: nil)
     end
   end
 

data/spec/lib/nightcrawler_swift/{delete_spec.rb → commands/delete_spec.rb}

@@ -2,27 +2,34 @@ require 'spec_helper'
 
 describe NightcrawlerSwift::Delete do
 
+  let(:connection) { NightcrawlerSwift::Connection.new }
+  let(:token) { "token" }
+  let(:expires_at) { (DateTime.now + 60).to_time }
+  let(:upload_url) { "server-url" }
+
   subject do
     NightcrawlerSwift::Delete.new
   end
 
-  describe "#execute" do
-    let :connection do
-      double :connection, upload_url: "server-url"
-    end
+  before do
+    allow(NightcrawlerSwift).to receive(:connection).and_return(connection)
+    allow(connection).to receive(:token_id).and_return(token)
+    allow(connection).to receive(:expires_at).and_return(expires_at)
+    allow(connection).to receive(:upload_url).and_return(upload_url)
+  end
 
+  describe "#execute" do
     let :execute do
       subject.execute "file_path"
     end
 
     before do
-      allow(NightcrawlerSwift).to receive(:connection).and_return(connection)
       allow(subject).to receive(:delete).and_return(response)
     end
 
     context "success" do
       let :response do
-        double(:response, code: 200, body: {a: 1}.to_json)
+        double(:response, code: 200)
       end
 
       it "deletes using upload url" do
@@ -30,8 +37,8 @@ describe NightcrawlerSwift::Delete do
         expect(subject).to have_received(:delete).with("server-url/file_path", headers: {accept: :json})
       end
 
-      it "returns the parsed json" do
-        expect(execute).to eql "a" => 1
+      it "returns true" do
+        expect(execute).to eql true
       end
     end
 

data/spec/lib/nightcrawler_swift/{download_spec.rb → commands/download_spec.rb}

@@ -2,21 +2,30 @@ require 'spec_helper'
 
 describe NightcrawlerSwift::Download do
 
+  let(:connection) { NightcrawlerSwift::Connection.new }
+  let(:token) { "token" }
+  let(:expires_at) { (DateTime.now + 60).to_time }
+  let(:public_url) { "server-url" }
+  let(:bucket) { "rogue" }
+
   subject do
     NightcrawlerSwift::Download.new
   end
 
-  describe "#execute" do
-    let :connection do
-      double :connection, public_url: "server-url"
-    end
+  before do
+    allow(NightcrawlerSwift).to receive(:connection).and_return(connection)
+    allow(connection).to receive(:token_id).and_return(token)
+    allow(connection).to receive(:expires_at).and_return(expires_at)
+    allow(connection).to receive(:public_url).and_return(public_url)
+    NightcrawlerSwift.configure bucket: bucket
+  end
 
+  describe "#execute" do
     let :execute do
       subject.execute "file_path"
     end
 
     before do
-      allow(NightcrawlerSwift).to receive(:connection).and_return(connection)
       allow(subject).to receive(:get).and_return(response)
     end
 
@@ -25,9 +34,9 @@ describe NightcrawlerSwift::Download do
         double(:response, code: 200, body: "content")
       end
 
-      it "gets using upload url" do
+      it "gets using public url" do
         execute
-        expect(subject).to have_received(:get).with("server-url/file_path")
+        expect(subject).to have_received(:get).with("server-url/#{bucket}/file_path")
       end
 
       it "returns body" do

data/spec/lib/nightcrawler_swift/{list_spec.rb → commands/list_spec.rb}

@@ -2,19 +2,23 @@ require "spec_helper"
 
 describe NightcrawlerSwift::List do
 
+  let(:connection) { NightcrawlerSwift::Connection.new }
+  let(:token) { "token" }
+  let(:expires_at) { (DateTime.now + 60).to_time }
+  let(:upload_url) { "server-url" }
+
   subject do
     NightcrawlerSwift::List.new
   end
 
-  describe "#execute" do
-    let :connection do
-      double :connection, upload_url: "server-url"
-    end
-
-    before do
-      allow(NightcrawlerSwift).to receive(:connection).and_return(connection)
-    end
+  before do
+    allow(NightcrawlerSwift).to receive(:connection).and_return(connection)
+    allow(connection).to receive(:token_id).and_return(token)
+    allow(connection).to receive(:expires_at).and_return(expires_at)
+    allow(connection).to receive(:upload_url).and_return(upload_url)
+  end
 
+  describe "#execute" do
     context "success" do
       let :json_response do
         [{"name" => "file"}]

data/spec/lib/nightcrawler_swift/{sync_spec.rb → commands/sync_spec.rb}

@@ -2,12 +2,21 @@ require "spec_helper"
 
 describe NightcrawlerSwift::Sync do
 
+  let(:connection) { NightcrawlerSwift::Connection.new }
+  let(:token) { "token" }
+  let(:expires_at) { (DateTime.now + 60).to_time }
+  let(:upload_url) { "server-url" }
+
   subject do
     NightcrawlerSwift::Sync.new
   end
 
   before do
     NightcrawlerSwift.logger = Logger.new(StringIO.new)
+    allow(NightcrawlerSwift).to receive(:connection).and_return(connection)
+    allow(connection).to receive(:token_id).and_return(token)
+    allow(connection).to receive(:expires_at).and_return(expires_at)
+    allow(connection).to receive(:upload_url).and_return(upload_url)
   end
 
   describe "#execute" do
@@ -17,7 +26,7 @@ describe NightcrawlerSwift::Sync do
     end
 
     it "executes upload command for each file of a directory" do
-      dir = File.expand_path(File.join(File.dirname(__FILE__), "../../fixtures/assets"))
+      dir = File.expand_path(File.join(File.dirname(__FILE__), "../../../fixtures/assets"))
 
       subject.instance_variable_set(:@upload, upload)
       expect(File).to receive(:open).with(File.join(dir, "css1.css"), "r").and_call_original

data/spec/lib/nightcrawler_swift/{upload_spec.rb → commands/upload_spec.rb}

@@ -3,27 +3,36 @@ require 'spec_helper'
 
 describe NightcrawlerSwift::Upload do
 
+  let(:connection) { NightcrawlerSwift::Connection.new }
+  let(:token) { "token" }
+  let(:expires_at) { (DateTime.now + 60).to_time }
+  let(:upload_url) { "server-url" }
+
   subject do
     NightcrawlerSwift::Upload.new
   end
 
+  before do
+    NightcrawlerSwift.configure
+    allow(NightcrawlerSwift).to receive(:connection).and_return(connection)
+    allow(connection).to receive(:token_id).and_return(token)
+    allow(connection).to receive(:expires_at).and_return(expires_at)
+    allow(connection).to receive(:upload_url).and_return(upload_url)
+  end
+
   describe "#execute" do
     let(:path) { "file_name" }
     let(:file) do
-      dir = File.expand_path(File.join(File.dirname(__FILE__), "../../fixtures/assets"))
+      dir = File.expand_path(File.join(File.dirname(__FILE__), "../../../fixtures/assets"))
       File.open(File.join(dir, "css1.css"))
     end
 
-    let :connection do
-      double :connection, upload_url: "server-url", opts: OpenStruct.new {}
-    end
-
     let :response do
       double(:response, code: 201)
     end
 
     let :etag do
-      '"%s"' % Digest::MD5.new.update(file.read).hexdigest
+      Digest::MD5.hexdigest(file.read)
     end
 
     let :max_age do
@@ -31,7 +40,6 @@ describe NightcrawlerSwift::Upload do
     end
 
     before do
-      allow(NightcrawlerSwift).to receive(:connection).and_return(connection)
       allow(subject).to receive(:put).and_return(response)
       allow(file).to receive(:read).and_return("content")
     end
@@ -61,7 +69,7 @@ describe NightcrawlerSwift::Upload do
     end
 
     it "sends max_age into headers" do
-      connection.opts.max_age = max_age
+      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}" }))
     end
@@ -79,6 +87,13 @@ 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

@@ -8,8 +8,8 @@ describe NightcrawlerSwift::Connection do
       tenant_name: "tenant_username1",
       username: "username1",
       password: "some-pass",
-      auth_url: "https://auth.url.com:123/v2.0/tokens",
-      max_age: 31536000 #1 year
+      auth_url: "https://auth-url-com:123/v2.0/tokens",
+      max_age: 31536000 # 1 year
     }
   end
 
@@ -19,22 +19,14 @@ describe NightcrawlerSwift::Connection do
   end
 
   subject do
-    NightcrawlerSwift::Connection.new opts
+    NightcrawlerSwift::Connection.new
   end
 
   before do
+    NightcrawlerSwift.configure opts
     NightcrawlerSwift.logger = Logger.new(StringIO.new)
   end
 
-  describe "initialization" do
-    it "creates the opts struct with the given values" do
-      expect(subject.opts).to_not be_nil
-      opts.keys.each do |key|
-        expect(subject.opts.send(key)).to eql(opts[key])
-      end
-    end
-  end
-
   describe "#connect!" do
     let :auth_json do
       {
@@ -55,12 +47,26 @@ describe NightcrawlerSwift::Connection do
     end
 
     describe "when it connects" do
+      let :resource do
+        RestClient::Resource.new(
+          opts[:auth_url],
+          verify_ssl: NightcrawlerSwift.options.verify_ssl,
+          timeout: NightcrawlerSwift.options.timeout
+        )
+      end
+
       before do
-        allow(RestClient).to receive(:post).
-          with(opts[:auth_url], auth_json, content_type: :json, accept: :json).
+        allow(RestClient::Resource).to receive(:new).and_return(resource)
+        allow(resource).to receive(:post).
+          with(auth_json, content_type: :json, accept: :json).
           and_return(auth_success_response)
       end
 
+      it "stores the auth_response" do
+        subject.connect!
+        expect(subject.auth_response).to eql(OpenStruct.new(auth_success_json))
+      end
+
       it "stores the token id" do
         subject.connect!
         expect(subject.token_id).to eql(auth_success_json["access"]["token"]["id"])
@@ -72,6 +78,11 @@ describe NightcrawlerSwift::Connection do
         expect(subject.expires_at).to eql(expires_at)
       end
 
+      it "stores the catalog" do
+        subject.connect!
+        expect(subject.catalog).to eql(auth_success_json["access"]["serviceCatalog"][0])
+      end
+
       it "stores the admin_url" do
         subject.connect!
         expect(subject.admin_url).to eql(auth_success_json["access"]["serviceCatalog"].first["endpoints"].first["adminURL"])
@@ -91,18 +102,19 @@ describe NightcrawlerSwift::Connection do
         expect(subject.connect!).to eql(subject)
       end
 
-      context "max_age" do
-        it "stores it" do
-          expect(subject.opts.max_age).to eql(opts[:max_age])
+      context "and there isn't any catalog configured" do
+        before do
+          auth_success_json["access"]["serviceCatalog"] = []
+          allow(subject).to receive(:auth_response).and_return(OpenStruct.new(auth_success_json))
         end
 
-        it "should be an integer" do
-          expect { NightcrawlerSwift::Connection.new({max_age: "a string"}) }.to raise_error(NightcrawlerSwift::Exceptions::ConfigurationError)
+        it "raises NightcrawlerSwift::Exceptions::ConfigurationError" do
+          expect { subject.connect! }.to raise_error(NightcrawlerSwift::Exceptions::ConfigurationError)
         end
       end
     end
 
-    describe "when some error happens" do
+    describe "when some error happens with the connection" do
       before do
         allow(RestClient).to receive(:post).
           with(opts[:auth_url], auth_json, content_type: :json, accept: :json).