concourse.rb 0.1.0.pre.7 → 0.3.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a613f6d91ebf0e32a8e7c0ba3121c465847c26a7b9fbde9cd0fbbc0e81fc18a
-  data.tar.gz: cae743d038cd312780f48abace40462c07159135a166f27f947bb3f0acf14fe3
+  metadata.gz: bc7f6970b4f036df4bd4f7024da302b54e1b9b883e8a364d52c10ecaa6812db9
+  data.tar.gz: 7a7b6c2ba4fa72c6a76eeb96bc6cea7437e7a11178c3062da6b89afa61e5aa81
 SHA512:
-  metadata.gz: 9c8c6c1a0408cdd6178c5d1e19fc80b6fb3be39dabe3225aa9fe9727b002071842ce3ce74e33d35075e72a06e9f4148b14dc3ac176ee7f10a13ab4f19565db1d
-  data.tar.gz: 974244c86feb1db9a98fb56b1b4c4b603bcbac5c6dda26db541e65290359f7fa1aad6aca21387ed687a7b3ab1b1d3e3d4451c2215f46f071d98714eb44b8b883
+  metadata.gz: d671bb039c40842413f7601b4216d9bd88d9758885a607d0b1f366f616ac0b9daaf054c862434187d2c7832bba85bdb8a78b15b171f20c06ff08dad9a9d959bb
+  data.tar.gz: a6b9d0a6d02c7b0e1d26de960181818b18aa5f39746aa52215bf8bee8d29c0b04f42e14d0e261383ba1fc15b8e46eee3ea4be13e464d0993a33bb076afdb6fb3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    concourse.rb (0.1.0.pre.7)
+    concourse.rb (0.3.0.pre.2)
       dry-schema (~> 0.5)
       excon (~> 0.72)
       semantic (~> 1.5)

data/lib/concourse.rb

@@ -1,4 +1,7 @@
 require_relative 'concourse/version'
+require_relative 'concourse/models'
+require_relative 'concourse/errors'
+require_relative 'concourse/http'
 require_relative 'concourse/client'
 require_relative 'concourse/urls'
 require_relative 'concourse/headers'

data/lib/concourse/errors.rb

@@ -0,0 +1,14 @@
+module Concourse
+  module Errors
+    class ApiError < StandardError
+      def initialize(parameters)
+        @request = parameters[:request]
+        @response = parameters[:response]
+
+        super("Request to #{@request.url} failed " +
+            "with status #{@response.status} " +
+            "and body #{@response.body}")
+      end
+    end
+  end
+end

data/lib/concourse/http.rb

@@ -0,0 +1,40 @@
+module Concourse
+  module Http
+    class Request
+      attr_reader :url, :headers, :body
+
+      def initialize(url, headers = {}, body = nil)
+        @url = url
+        @headers = headers
+        @body = body
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      def eql?(other)
+        self == other
+      end
+
+      def hash
+        state.hash
+      end
+
+      protected
+
+      def state
+        [@url, @headers, @body]
+      end
+
+    end
+
+    def assert_successful(request, response)
+      unless response.status < 400
+        raise Errors::ApiError.new(
+            request: request,
+            response: response)
+      end
+    end
+  end
+end

data/lib/concourse/models.rb

@@ -0,0 +1,6 @@
+require 'concourse/models/token'
+
+module Concourse
+  module Models
+  end
+end

data/lib/concourse/models/token.rb

@@ -0,0 +1,32 @@
+module Concourse
+  module Models
+    class Token
+      attr_reader :access_token, :token_type, :expires_at, :id_token
+
+      def initialize(parameters)
+        @access_token = parameters[:access_token]
+        @token_type = parameters[:token_type]
+        @expires_at = parameters[:expires_at]
+        @id_token = parameters[:id_token]
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      def eql?(other)
+        self == other
+      end
+
+      def hash
+        state.hash
+      end
+
+      protected
+
+      def state
+        [@access_token, @token_type, @expires_at, @id_token]
+      end
+    end
+  end
+end

data/lib/concourse/sub_clients/skymarshal_client.rb

@@ -1,15 +1,18 @@
 require 'semantic'
-require 'date'
+require 'time'
 require 'json'
 
 require 'concourse/urls'
 require 'concourse/headers'
+require 'concourse/http'
 
 module Concourse
   module SubClients
     class SkymarshalClient
       VERSION_6_1 = Semantic::Version.new('6.1.0')
 
+      include Concourse::Http
+
       def initialize(options)
         @url = options[:url]
         @version = Semantic::Version.new(options[:version])
@@ -20,8 +23,10 @@ module Concourse
         headers = create_token_headers
         body = create_token_body(parameters)
 
+        token_request = Http::Request.new(url, headers, body)
         token_response = Excon.post(url, headers: headers, body: body)
 
+        assert_successful(token_request, token_response)
         token(token_response)
       end
 
@@ -70,31 +75,27 @@ module Concourse
 
       def token(token_response)
         token_response_date = @version >= VERSION_6_1 ?
-            DateTime.parse(
+            Time.parse(
                 token_response.headers[Concourse::HeaderNames.date]) :
             nil
         token_response_body =
             JSON.parse(token_response.body, symbolize_names: true)
 
-        seconds_in_a_day = 60 * 60 * 24
-
         @version >= VERSION_6_1 ?
-            {
+            Models::Token.new(
                 access_token: token_response_body[:access_token],
                 token_type: token_response_body[:token_type].downcase,
                 expires_at:
-                    (token_response_date +
-                        (token_response_body[:expires_in] /
-                            seconds_in_a_day))
+                    (token_response_date + token_response_body[:expires_in])
                         .iso8601,
                 id_token: token_response_body[:id_token]
-            } :
-            {
+            ) :
+            Models::Token.new(
                 access_token: token_response_body[:access_token],
                 token_type: token_response_body[:token_type].downcase,
                 expires_at: token_response_body[:expiry],
                 id_token: token_response_body[:access_token]
-            }
+            )
       end
     end
   end

data/lib/concourse/version.rb

@@ -1,3 +1,3 @@
 module Concourse
-  VERSION = '0.1.0.pre.7'
+  VERSION = '0.3.0.pre.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concourse.rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.7
+  version: 0.3.0.pre.2
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -224,7 +224,11 @@ files:
 - concourse.rb.gemspec
 - lib/concourse.rb
 - lib/concourse/client.rb
+- lib/concourse/errors.rb
 - lib/concourse/headers.rb
+- lib/concourse/http.rb
+- lib/concourse/models.rb
+- lib/concourse/models/token.rb
 - lib/concourse/sub_clients.rb
 - lib/concourse/sub_clients/skymarshal_client.rb
 - lib/concourse/urls.rb