concourse.rb 0.1.0.pre.6 → 0.3.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f33a83b32795d0987e86bc94bb32368124e417013600058f85c2d3f3b7a09cf4
-  data.tar.gz: 551913d95fff945a8e109d05c6d229e27620d8a648802ff105909acced55aec6
+  metadata.gz: ebf716759e328b59403cfd2b10d9c6a26c8b7c17ab373b226f6941e712076ddb
+  data.tar.gz: 7c8366afe14b256a551c8951e0687f3dcf3ec1487f915ef9f56129e99b68589d
 SHA512:
-  metadata.gz: 6c4114f96254ccea2211b9a5e440856794bcc32aa0998aa95e5de65a867d7fe72d329b28c4f9900a2e00152727dc4a015d4d9ad55bf03f89e30191eb9aad01ce
-  data.tar.gz: 4e23edbc9e0bf2d4f15eed4cdc9ec6797eaf9eeb1991ba244c69907b7d5c7a1628d825be889602dec131ecd7a619ddd182137c2e6a4556e1c2ea2e5787254a59
+  metadata.gz: 02d9982cbe438aabb453c4c7979babc5ddb0f958687bd5c0379ef8de6da30d4922c047a11594e79ce00ad047ab982b3b7d50e50a58b4685f7bb21deba4e11b81
+  data.tar.gz: 418c7575d2816685ee5eca5d70585f44e9a35493d002683d59b3c25798f1c4efde9221014b556dfdc2f52ba860a797400d82bebe8700175e902de44a78151f4b

data/Gemfile.lock

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

data/lib/concourse.rb

@@ -1,4 +1,5 @@
 require_relative 'concourse/version'
+require_relative 'concourse/models'
 require_relative 'concourse/client'
 require_relative 'concourse/urls'
 require_relative 'concourse/headers'

data/lib/concourse/client.rb

@@ -3,8 +3,6 @@ require 'json'
 
 require 'concourse/sub_clients'
 
-Excon.defaults[:middlewares] << Excon::Middleware::RedirectFollower
-
 module Concourse
   class Client
     def initialize(options)

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,5 +1,5 @@
 require 'semantic'
-require 'date'
+require 'time'
 require 'json'
 
 require 'concourse/urls'
@@ -70,31 +70,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/urls.rb

@@ -1,19 +1,25 @@
 module Concourse
   module Urls
     def self.api_url(concourse_url)
-      "#{concourse_url}/api/v1"
+      "#{base_url(concourse_url)}/api/v1"
     end
 
     def self.sky_token_url(concourse_url)
-      "#{concourse_url}/sky/token"
+      "#{base_url(concourse_url)}/sky/token"
     end
 
     def self.sky_issuer_token_url(concourse_url)
-      "#{concourse_url}/sky/issuer/token"
+      "#{base_url(concourse_url)}/sky/issuer/token"
     end
 
     def self.info_url(concourse_url)
       "#{api_url(concourse_url)}/info"
     end
+
+    private
+
+    def self.base_url(concourse_url)
+      concourse_url.chomp('/')
+    end
   end
 end

data/lib/concourse/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concourse.rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.6
+  version: 0.3.0.pre.1
 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
@@ -225,6 +225,8 @@ files:
 - lib/concourse.rb
 - lib/concourse/client.rb
 - lib/concourse/headers.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