scalingo 3.0.0.beta.2 → 3.0.0.beta.3

data/spec/scalingo/api/endpoint_spec.rb

@@ -22,9 +22,10 @@ RSpec.describe Scalingo::API::Endpoint do
 
   describe "unpack" do
     it "forwards unpack to Response" do
-      expect(Scalingo::API::Response).to receive(:unpack).with(client, :a, :b, :c).and_return(:d).once
+      mock = proc { 1 }
 
-      expect(subject.send(:unpack, :a, :b, :c)).to eq :d
+      expect(Scalingo::API::Response).to receive(:unpack).with(client, key: :a, &mock).and_return(:d).once
+      expect(subject.send(:unpack, :a, &mock)).to eq :d
     end
   end
 end

data/spec/scalingo/api/response_spec.rb

@@ -33,19 +33,19 @@ RSpec.describe Scalingo::API::Response do
     }
 
     it "passes the client supplied" do
-      object = described_class.unpack(:some_client, response)
+      object = described_class.unpack(:some_client) { response }
 
       expect(object.client).to eq :some_client
     end
 
     it "passes the response status" do
-      object = described_class.unpack(:client, response)
+      object = described_class.unpack(:client) { response }
 
       expect(object.status).to eq status
     end
 
     it "passes the response headers" do
-      object = described_class.unpack(:client, response)
+      object = described_class.unpack(:client) { response }
 
       expect(object.headers).to eq headers
     end
@@ -54,7 +54,7 @@ RSpec.describe Scalingo::API::Response do
       let(:body) { "" }
 
       it "without key" do
-        object = described_class.unpack(client, response)
+        object = described_class.unpack(client) { response }
 
         expect(object.data).to eq ""
         expect(object.full_body).to eq ""
@@ -62,7 +62,7 @@ RSpec.describe Scalingo::API::Response do
       end
 
       it "ignores key if supplied" do
-        object = described_class.unpack(client, response, key: :key)
+        object = described_class.unpack(client, key: :key) { response }
 
         expect(object.data).to eq ""
         expect(object.full_body).to eq ""
@@ -74,7 +74,7 @@ RSpec.describe Scalingo::API::Response do
       let(:body) { nil }
 
       it "without key" do
-        object = described_class.unpack(client, response)
+        object = described_class.unpack(client) { response }
 
         expect(object.data).to eq nil
         expect(object.full_body).to eq nil
@@ -82,7 +82,7 @@ RSpec.describe Scalingo::API::Response do
       end
 
       it "ignores key if supplied" do
-        object = described_class.unpack(client, response, key: :key)
+        object = described_class.unpack(client, key: :key) { response }
 
         expect(object.data).to eq nil
         expect(object.full_body).to eq nil
@@ -94,7 +94,7 @@ RSpec.describe Scalingo::API::Response do
       let(:body) { "this is a string body, probably due to an error" }
 
       it "without key" do
-        object = described_class.unpack(client, response)
+        object = described_class.unpack(client) { response }
 
         expect(object.data).to eq body
         expect(object.full_body).to eq body
@@ -102,7 +102,7 @@ RSpec.describe Scalingo::API::Response do
       end
 
       it "ignores key if supplied" do
-        object = described_class.unpack(client, response, key: :key)
+        object = described_class.unpack(client, key: :key) { response }
 
         expect(object.data).to eq body
         expect(object.full_body).to eq body
@@ -116,7 +116,7 @@ RSpec.describe Scalingo::API::Response do
       }
 
       it "without key" do
-        object = described_class.unpack(client, response)
+        object = described_class.unpack(client) { response }
 
         expect(object.data).to eq body
         expect(object.full_body).to eq body
@@ -124,7 +124,7 @@ RSpec.describe Scalingo::API::Response do
       end
 
       it "ignores key if supplied" do
-        object = described_class.unpack(client, response, key: :root)
+        object = described_class.unpack(client, key: :root) { response }
 
         expect(object.data).to eq body
         expect(object.full_body).to eq body
@@ -138,7 +138,7 @@ RSpec.describe Scalingo::API::Response do
       }
 
       it "without key" do
-        object = described_class.unpack(client, response)
+        object = described_class.unpack(client) { response }
 
         expect(object.data).to eq body
         expect(object.full_body).to eq body
@@ -146,7 +146,7 @@ RSpec.describe Scalingo::API::Response do
       end
 
       it "with valid key" do
-        object = described_class.unpack(client, response, key: :root)
+        object = described_class.unpack(client, key: :root) { response }
 
         expect(object.data).to eq({key: :value})
         expect(object.full_body).to eq body
@@ -154,7 +154,7 @@ RSpec.describe Scalingo::API::Response do
       end
 
       it "with invalid key" do
-        object = described_class.unpack(client, response, key: :other)
+        object = described_class.unpack(client, key: :other) { response }
 
         expect(object.data).to eq nil
         expect(object.full_body).to eq body
@@ -167,7 +167,7 @@ RSpec.describe Scalingo::API::Response do
         }
 
         it "extracts the meta object" do
-          object = described_class.unpack(client, response)
+          object = described_class.unpack(client) { response }
 
           expect(object.meta).to eq({meta1: :value})
         end
@@ -179,7 +179,7 @@ RSpec.describe Scalingo::API::Response do
       let(:body) { {root: {key: :value}} }
 
       it "does not dig in the response hash, even with a valid key" do
-        object = described_class.unpack(client, response, key: :root)
+        object = described_class.unpack(client, key: :root) { response }
 
         expect(object.data).to eq body
         expect(object.full_body).to eq body

data/spec/scalingo/auth_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 RSpec.describe Scalingo::Auth do
-  subject { described_class.new(:client, :url) }
+  subject { described_class.new("url") }
 
   %w[keys scm_integrations tokens two_factor_auth user].each do |section|
     it "handles requests for #{section}" do

data/spec/scalingo/billing_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+RSpec.describe Scalingo::Billing do
+  subject { described_class.new("url") }
+
+  %w[profile].each do |section|
+    it "handles requests for #{section}" do
+      expect(subject.respond_to?(section)).to be true
+    end
+  end
+end

data/spec/scalingo/configuration_spec.rb

@@ -3,36 +3,6 @@ require "spec_helper"
 RSpec.describe Scalingo::Configuration do
   subject { described_class.default }
 
-  describe "default_region" do
-    it "must be an existing region" do
-      expect {
-        subject.default_region = "another-region"
-      }.to raise_error(ArgumentError)
-    end
-  end
-
-  describe "regions" do
-    it "can be assigned from a hash" do
-      subject.regions = {
-        local_name: "some-url"
-      }
-
-      expect(subject.regions.local_name).to eq "some-url"
-    end
-
-    it "can be assigned from a openstruct" do
-      subject.regions = OpenStruct.new(local_name: "some-url")
-
-      expect(subject.regions.local_name).to eq "some-url"
-    end
-
-    it "raises with an argument from the wrong type" do
-      expect {
-        subject.regions = "1"
-      }.to raise_error(ArgumentError)
-    end
-  end
-
   describe "inheritance" do
     it "can inherit configuration from a parent" do
       object = described_class.new({}, subject)
@@ -52,4 +22,36 @@ RSpec.describe Scalingo::Configuration do
       expect(object.user_agent).to eq "Agent"
     end
   end
+
+  describe "faraday adapter" do
+    let(:scalingo) { Scalingo::Client.new(config).tap { |s| s.authenticate_with(bearer_token: "some-token") } }
+    let(:client) { Scalingo::API::Client.new("http://example.test", scalingo: scalingo) }
+
+    context "when unspecified" do
+      let(:config) { {} }
+
+      it "uses the default one when unspecificied" do
+        expect(client.authenticated_connection.adapter).to eq Faraday::Adapter::NetHttp
+        expect(client.unauthenticated_connection.adapter).to eq Faraday::Adapter::NetHttp
+      end
+    end
+
+    context "when set to an unkown adapter" do
+      let(:config) { {faraday_adapter: :yo} }
+
+      it "uses the default one when unspecificied" do
+        expect { client.authenticated_connection.adapter }.to raise_error(Faraday::Error)
+        expect { client.unauthenticated_connection.adapter }.to raise_error(Faraday::Error)
+      end
+    end
+
+    context "when set to a valid adapter" do
+      let(:config) { {faraday_adapter: :test} }
+
+      it "uses the default one when unspecificied" do
+        expect(client.authenticated_connection.adapter).to eq Faraday::Adapter::Test
+        expect(client.unauthenticated_connection.adapter).to eq Faraday::Adapter::Test
+      end
+    end
+  end
 end

data/spec/scalingo/regional/addons_spec.rb

@@ -99,6 +99,22 @@ RSpec.describe Scalingo::Regional::Addons do
     end
   end
 
+  describe_method "token" do
+    context "success" do
+      let(:arguments) { [meta[:app_id], meta[:id]] }
+      let(:stub_pattern) { "token-200" }
+
+      it_behaves_like "a singular object response"
+    end
+
+    context "not found" do
+      let(:arguments) { [meta[:app_id], meta[:not_found_id]] }
+      let(:stub_pattern) { "token-404" }
+
+      it_behaves_like "a not found response"
+    end
+  end
+
   describe_method "update" do
     context "success" do
       let(:arguments) { [meta[:app_id], meta[:id], meta[:update][:valid]] }

data/spec/scalingo/regional_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 RSpec.describe Scalingo::Regional do
-  subject { described_class.new(:client, :url) }
+  subject { described_class.new("url") }
 
   %w[
     addons apps collaborators containers deployments domains environment events

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scalingo
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.2
+  version: 3.0.0.beta.3
 platform: ruby
 authors:
 - Leo Unbekandt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -210,6 +210,7 @@ files:
 - lib/scalingo/billing/profile.rb
 - lib/scalingo/client.rb
 - lib/scalingo/configuration.rb
+- lib/scalingo/core_client.rb
 - lib/scalingo/error/expired_token.rb
 - lib/scalingo/error/unauthenticated.rb
 - lib/scalingo/errors.rb
@@ -227,6 +228,7 @@ files:
 - lib/scalingo/regional/notifiers.rb
 - lib/scalingo/regional/operations.rb
 - lib/scalingo/regional/scm_repo_links.rb
+- lib/scalingo/token_holder.rb
 - lib/scalingo/version.rb
 - samples/auth/keys/_meta.json
 - samples/auth/keys/all-200.json
@@ -289,6 +291,8 @@ files:
 - samples/regional/addons/provision-400.json
 - samples/regional/addons/sso-200.json
 - samples/regional/addons/sso-404.json
+- samples/regional/addons/token-200.json
+- samples/regional/addons/token-404.json
 - samples/regional/addons/update-200.json
 - samples/regional/addons/update-404.json
 - samples/regional/apps/_meta.json
@@ -407,6 +411,7 @@ files:
 - spec/scalingo/auth_spec.rb
 - spec/scalingo/bearer_token_spec.rb
 - spec/scalingo/billing/profile_spec.rb
+- spec/scalingo/billing_spec.rb
 - spec/scalingo/client_spec.rb
 - spec/scalingo/configuration_spec.rb
 - spec/scalingo/regional/addons_spec.rb
@@ -479,3 +484,4 @@ test_files:
 - spec/scalingo/auth_spec.rb
 - spec/scalingo/billing/profile_spec.rb
 - spec/scalingo/regional_spec.rb
+- spec/scalingo/billing_spec.rb