rally_up 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d974f1c002a3da939765394bec66b17a5789caa7095eaf654ee3c2faa583fcae
-  data.tar.gz: 7685bddc6c797e99d2c31d1ee623c1234dda1face7bd09a71072fbe34b3431bb
+  metadata.gz: 66c3780b4fe79816f85ce27656dc8afd84ab81bf4737a378d7dc8937e9f26c84
+  data.tar.gz: 922850bada38ac2b5d336e7e019b3b6305cab593666821ea43bb5884aa20de07
 SHA512:
-  metadata.gz: 66f5a4feb0846fb8b5787ad9cb265ac15c0126412dc4fa8be00b1dba6ceb0e1b21bb303f9e60de1d0c9b5474852761a370f837b7a51f87f02c310f1c55c60b1b
-  data.tar.gz: cd7742fddb03fffc8f02a824ff778ed74915a64e55bfa04446b3608a4de590bac2f06934852ff07290fcb84df4cc960e881978df8f32d95a422a070bef797dae
+  metadata.gz: ab51745ce2e660233b48e5c43e93aa89bb04b48337e64092943e8d7b37fbb7f99a59d71bf6f71c16e9a47cedc54cd13eeb530d064c3e9531090315f3dc4b6146
+  data.tar.gz: 9ee18563c6c9d33df8ddd4061bad40e68017f739e723cae38187abbcebb018c915b1d5282d3e8b203c317e6357f2ef0b63d4b60c6ccde3a89efe37bb53dbc28f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rally_up (1.0.1)
+    rally_up (1.0.2)
       http (~> 4.0)
 
 GEM
@@ -49,7 +49,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8)
@@ -70,4 +70,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.2.26
+   2.2.30

data/lib/rally_up/partner/token.rb

@@ -15,17 +15,27 @@ module RallyUp
         @expires = json[:'.expires']
       end
 
+      def expired?
+        expires.nil? || Time.parse(expires).utc < Time.now.utc
+      end
+
       class << self
         def retrieve(set: true)
-          json = RallyUp::Partner.json(:post, '/v1/partnertoken', params: {
-                                         grant_type: 'password',
-                                         username: RallyUp::Partner.login,
-                                         password: RallyUp::Partner.secret
-                                       })
+          json = JSON.parse(access_token_response, symbolize_names: true)
           token = new(json)
-          RallyUp::Partner.token = token.access_token if set
+          RallyUp::Partner.token = token if set
           token
         end
+
+        def access_token_response
+          params = {
+            grant_type: 'password',
+            username: RallyUp::Partner.login,
+            password: RallyUp::Partner.secret
+          }
+          HTTP.post("https://#{RallyUp::Partner.domain}/v1/partnertoken", body: URI.encode_www_form(params))
+              .body.to_s
+        end
       end
     end
   end

data/lib/rally_up/partner.rb

@@ -8,7 +8,7 @@ module RallyUp
       attr_accessor :login, :secret, :domain, :token
 
       def request(method, path, domain: RallyUp::Partner.domain, params: {}, headers: {})
-        raise 'Missing RallyUp Partner Token' if RallyUp::Partner.nil?
+        set_token if RallyUp::Partner.token.nil? || RallyUp::Partner.token.expired?
 
         super(
           method,
@@ -16,11 +16,15 @@ module RallyUp
           domain: domain,
           params: params,
           headers: headers.merge(
-            'Authorization' => "Bearer #{RallyUp::Partner.token}",
+            'Authorization' => "Bearer #{RallyUp::Partner.token.access_token}",
             'Content-Type' => 'application/x-www-form-urlencoded'
           )
         )
       end
+
+      def set_token
+        RallyUp::Partner::Token.retrieve(set: true)
+      end
     end
   end
 end

data/lib/rally_up/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RallyUp
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/rally_up.rb

@@ -44,7 +44,7 @@ module RallyUp
     protected
 
     def verify!(response)
-      return if response.code.to_i == 200
+      return if [200, 201].include?(response.code.to_i)
 
       raise Error, response
     end
@@ -56,11 +56,20 @@ module RallyUp
     def initialize(response)
       @body = response.body
       @code = response.code
+      super
     end
 
     def message
       "#{code} #{body}"
     end
+
+    def as_json
+      { error: to_s }
+    end
+
+    def to_s
+      "#{self.class}: #{message}"
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rally_up
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - David Richey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2021-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: RallyUp API & Partner API ruby gem