scalingo 3.0.0.beta.1 → 3.0.0.beta.2

data/spec/scalingo/auth_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+RSpec.describe Scalingo::Auth do
+  subject { described_class.new(:client, :url) }
+
+  %w[keys scm_integrations tokens two_factor_auth user].each do |section|
+    it "handles requests for #{section}" do
+      expect(subject.respond_to?(section)).to be true
+    end
+  end
+
+  it "aliases tfa" do
+    expect(subject.tfa).to eq(subject.two_factor_auth)
+  end
+end

data/spec/scalingo/bearer_token_spec.rb

@@ -0,0 +1,72 @@
+require "spec_helper"
+
+RSpec.describe Scalingo::BearerToken do
+  let(:value) { "my-token" }
+  let(:expires_at) { nil }
+  let(:raise_on_expired) { false }
+
+  subject { described_class.new(value, expires_at: expires_at, raise_on_expired: raise_on_expired) }
+
+  describe "initialize" do
+    it "stores the value" do
+      instance = described_class.new(:value)
+
+      expect(instance.value).to eq(:value)
+      expect(instance.expires_at).to eq nil
+    end
+
+    it "stores the expiration" do
+      expiration = Time.now + 1.hour
+      instance = described_class.new(:value, expires_at: expiration)
+
+      expect(instance.value).to eq(:value)
+      expect(instance.expires_at).to eq expiration
+    end
+  end
+
+  describe "expired?" do
+    context "without expiration" do
+      it { expect(subject).not_to be_expired }
+    end
+
+    context "with the expiration in the future" do
+      let(:expires_at) { Time.current + 1.hour }
+      it { expect(subject).not_to be_expired }
+    end
+
+    context "with the expiration in the past" do
+      let(:expires_at) { Time.current - 1.minute }
+      it { expect(subject).to be_expired }
+    end
+  end
+
+  describe "value" do
+    context "when raising on expired token" do
+      let(:raise_on_expired) { true }
+
+      it "raises when expired" do
+        expect(subject).to receive(:expired?).and_return(true)
+        expect { subject.value }.to raise_error(Scalingo::Error::ExpiredToken)
+      end
+
+      it "returns the value when not expired" do
+        expect(subject).to receive(:expired?).and_return(false)
+        expect(subject.value).to eq(value)
+      end
+    end
+
+    context "when not raising on expired token" do
+      let(:raise_on_expired) { false }
+
+      it "returns the value when expired" do
+        expect(subject).to receive(:expired?).and_return(true)
+        expect(subject.value).to eq(value)
+      end
+
+      it "returns the value when not expired" do
+        expect(subject).to receive(:expired?).and_return(false)
+        expect(subject.value).to eq(value)
+      end
+    end
+  end
+end

data/spec/scalingo/billing/profile_spec.rb

@@ -0,0 +1,55 @@
+require "spec_helper"
+
+RSpec.describe Scalingo::Billing::Profile do
+  describe_method "show" do
+    context "existing" do
+      let(:stub_pattern) { "show-200" }
+
+      it_behaves_like "a singular object response"
+    end
+
+    context "not yet created" do
+      let(:stub_pattern) { "show-404" }
+
+      it_behaves_like "a not found response"
+    end
+  end
+
+  describe_method "create" do
+    context "success" do
+      let(:arguments) { meta[:create][:valid] }
+      let(:stub_pattern) { "create-201" }
+
+      it_behaves_like "a singular object response", 201
+    end
+
+    context "already existing" do
+      let(:stub_pattern) { "create-400" }
+
+      it_behaves_like "a client error"
+    end
+
+    context "unprocessable" do
+      let(:arguments) { meta[:create][:invalid] }
+      let(:stub_pattern) { "create-422" }
+
+      it_behaves_like "an unprocessable request"
+    end
+  end
+
+  describe_method "update" do
+    context "success" do
+      let(:arguments) { [meta[:id], meta[:update][:valid]] }
+      let(:stub_pattern) { "update-200" }
+
+      it_behaves_like "a singular object response"
+    end
+
+    context "unprocessable" do
+      let(:arguments) { [meta[:id], meta[:update][:invalid]] }
+      let(:stub_pattern) { "update-422" }
+
+      it_behaves_like "an unprocessable request"
+    end
+  end
+end

data/spec/scalingo/client_spec.rb

@@ -0,0 +1,93 @@
+require "spec_helper"
+
+RSpec.describe Scalingo::Client do
+  subject { described_class.new }
+
+  describe "token" do
+    it "wraps the token in a BearerToken" do
+      expect(subject.token).to eq nil
+
+      subject.token = "my-token"
+      expect(subject.token).to be_a(Scalingo::BearerToken)
+      expect(subject.token.value).to eq "my-token"
+
+      subject.token = Scalingo::BearerToken.new("other-token")
+      expect(subject.token).to be_a(Scalingo::BearerToken)
+      expect(subject.token.value).to eq "other-token"
+    end
+
+    it "can query the authentication status" do
+      expect(subject).not_to be_authenticated
+
+      subject.token = "my-token"
+      expect(subject).to be_authenticated
+
+      subject.token = Scalingo::BearerToken.new("other-token")
+      allow(subject.token).to receive(:expired?).and_return(false)
+      expect(subject).to be_authenticated
+
+      allow(subject.token).to receive(:expired?).and_return(true)
+      expect(subject).not_to be_authenticated
+    end
+  end
+
+  describe "authenticate_with" do
+    it "raises without arguments" do
+      expect { subject.authenticate_with }.to raise_error(ArgumentError)
+    end
+
+    it "raises with both more than one authentication type" do
+      expect {
+        subject.authenticate_with(access_token: :a, bearer_token: :b)
+      }.to raise_error(ArgumentError)
+    end
+
+    it "raises if expires_at is supplied for an access_token" do
+      expect {
+        subject.authenticate_with(access_token: :a, expires_at: :b)
+      }.to raise_error(ArgumentError)
+    end
+
+    context "with access token" do
+      it "is successful with valid token" do
+        fake_response = OpenStruct.new(
+          "successful?": true,
+          data: {token: "response token"},
+        )
+
+        expect(subject.auth.tokens).to receive(:exchange).and_return(fake_response)
+
+        expect(subject.authenticate_with(access_token: "access token")).to be true
+        expect(subject.token.value).to eq "response token"
+        expect(subject.token.expires_at).to be_within(1.second).of(Time.current + Scalingo.config.exchanged_token_validity)
+      end
+
+      it "fails with invalid token" do
+        fake_response = OpenStruct.new(
+          "successful?": false,
+        )
+
+        expect(subject.auth.tokens).to receive(:exchange).and_return(fake_response)
+
+        expect(subject.authenticate_with(access_token: "access token")).to be false
+        expect(subject.token).to be nil
+      end
+    end
+
+    context "with bearer token" do
+      it "only sets the bearer token according to the arguments" do
+        expect(subject.authenticate_with(bearer_token: "my token")).to be true
+        expect(subject.token.value).to eq "my token"
+        expect(subject.token.expires_at).to eq nil
+
+        expect(subject.authenticate_with(bearer_token: Scalingo::BearerToken.new("my token"))).to be true
+        expect(subject.token.value).to eq "my token"
+        expect(subject.token.expires_at).to eq nil
+
+        expect(subject.authenticate_with(bearer_token: "my token", expires_at: Time.now + 1.hour)).to be true
+        expect(subject.token.value).to eq "my token"
+        expect(subject.token.expires_at).not_to eq nil
+      end
+    end
+  end
+end

data/spec/scalingo/configuration_spec.rb

@@ -0,0 +1,55 @@
+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)
+
+      described_class::ATTRIBUTES.each do |attr|
+        expect(object.public_send(attr)).to eq subject.public_send(attr)
+      end
+    end
+
+    it "can uses local configuration when supplied, the parent other wise" do
+      object = described_class.new({user_agent: "Agent"}, subject)
+
+      (described_class::ATTRIBUTES - [:user_agent]).each do |attr|
+        expect(object.public_send(attr)).to eq subject.public_send(attr)
+      end
+
+      expect(object.user_agent).to eq "Agent"
+    end
+  end
+end

data/spec/scalingo/regional/operations_spec.rb

@@ -1,19 +1,27 @@
 require "spec_helper"
 
 RSpec.describe Scalingo::Regional::Operations do
-  describe_method "find" do
+  describe_method "get" do
     context "success" do
-      let(:arguments) { [meta[:app_id], meta[:id]] }
+      let(:arguments) { "apps/#{meta[:app_id]}/operations/#{meta[:id]}" }
       let(:stub_pattern) { "find-200" }
 
       it_behaves_like "a singular object response"
     end
 
     context "failure" do
-      let(:arguments) { [meta[:app_id], meta[:not_found_id]] }
+      let(:arguments) { "apps/#{meta[:app_id]}/operations/#{meta[:not_found_id]}" }
       let(:stub_pattern) { "find-404" }
 
       it_behaves_like "a not found response"
     end
   end
+
+  describe_method "find" do
+    it "delegates to get" do
+      expect(subject).to receive(:get).with("apps/a/operations/b", :headers).once
+
+      subject.find(:a, :b, :headers)
+    end
+  end
 end

data/spec/scalingo/regional_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+RSpec.describe Scalingo::Regional do
+  subject { described_class.new(:client, :url) }
+
+  %w[
+    addons apps collaborators containers deployments domains environment events
+    logs metrics notifiers operations scm_repo_links
+  ].each do |section|
+    it "handles requests for #{section}" do
+      expect(subject.respond_to?(section)).to be true
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scalingo
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.1
+  version: 3.0.0.beta.2
 platform: ruby
 authors:
 - Leo Unbekandt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-12 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,40 +31,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: dry-configurable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -133,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -224,7 +190,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -241,8 +206,10 @@ files:
 - lib/scalingo/auth/two_factor_auth.rb
 - lib/scalingo/auth/user.rb
 - lib/scalingo/bearer_token.rb
+- lib/scalingo/billing.rb
+- lib/scalingo/billing/profile.rb
 - lib/scalingo/client.rb
-- lib/scalingo/config.rb
+- lib/scalingo/configuration.rb
 - lib/scalingo/error/expired_token.rb
 - lib/scalingo/error/unauthenticated.rb
 - lib/scalingo/errors.rb
@@ -300,6 +267,14 @@ files:
 - samples/auth/user/self.json
 - samples/auth/user/update-200.json
 - samples/auth/user/update-422.json
+- samples/billing/profile/_meta.json
+- samples/billing/profile/create-201.json
+- samples/billing/profile/create-400.json
+- samples/billing/profile/create-422.json
+- samples/billing/profile/show-200.json
+- samples/billing/profile/show-404.json
+- samples/billing/profile/update-200.json
+- samples/billing/profile/update-422.json
 - samples/regional/addons/_meta.json
 - samples/regional/addons/categories-guest.json
 - samples/regional/addons/categories-logged.json
@@ -421,11 +396,19 @@ files:
 - samples/regional/scm_repo_links/show-200.json
 - samples/regional/scm_repo_links/update-200.json
 - scalingo.gemspec
+- spec/scalingo/api/client_spec.rb
+- spec/scalingo/api/endpoint_spec.rb
+- spec/scalingo/api/response_spec.rb
 - spec/scalingo/auth/keys_spec.rb
 - spec/scalingo/auth/scm_integrations_spec.rb
 - spec/scalingo/auth/tokens_spec.rb
 - spec/scalingo/auth/two_factor_auth_spec.rb
 - spec/scalingo/auth/user_spec.rb
+- spec/scalingo/auth_spec.rb
+- spec/scalingo/bearer_token_spec.rb
+- spec/scalingo/billing/profile_spec.rb
+- spec/scalingo/client_spec.rb
+- spec/scalingo/configuration_spec.rb
 - spec/scalingo/regional/addons_spec.rb
 - spec/scalingo/regional/apps_spec.rb
 - spec/scalingo/regional/collaborators_spec.rb
@@ -439,6 +422,7 @@ files:
 - spec/scalingo/regional/notifiers_spec.rb
 - spec/scalingo/regional/operations_spec.rb
 - spec/scalingo/regional/scm_repo_links_spec.rb
+- spec/scalingo/regional_spec.rb
 homepage: https://www.scalingo.com
 licenses:
 - MIT
@@ -468,11 +452,16 @@ signing_key:
 specification_version: 4
 summary: Ruby client for Scalingo APIs
 test_files:
+- spec/scalingo/client_spec.rb
 - spec/scalingo/auth/scm_integrations_spec.rb
 - spec/scalingo/auth/tokens_spec.rb
 - spec/scalingo/auth/keys_spec.rb
 - spec/scalingo/auth/two_factor_auth_spec.rb
 - spec/scalingo/auth/user_spec.rb
+- spec/scalingo/configuration_spec.rb
+- spec/scalingo/api/client_spec.rb
+- spec/scalingo/api/endpoint_spec.rb
+- spec/scalingo/api/response_spec.rb
 - spec/scalingo/regional/collaborators_spec.rb
 - spec/scalingo/regional/operations_spec.rb
 - spec/scalingo/regional/notifiers_spec.rb
@@ -486,3 +475,7 @@ test_files:
 - spec/scalingo/regional/logs_spec.rb
 - spec/scalingo/regional/containers_spec.rb
 - spec/scalingo/regional/events_spec.rb
+- spec/scalingo/bearer_token_spec.rb
+- spec/scalingo/auth_spec.rb
+- spec/scalingo/billing/profile_spec.rb
+- spec/scalingo/regional_spec.rb