oktakit 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f170e78d25077fef771c650e74c87aa605035bfb
-  data.tar.gz: 317fa2e67e77874f9048d89d5033d296b448844c
+  metadata.gz: 982d7dce841599fdd74241461d280ba4bde4c9c1
+  data.tar.gz: 8d3b175bbcd444ab08ebe7b01ac55df0b202f77b
 SHA512:
-  metadata.gz: 0b9a2c0e8d991a7e8fa96a03de0333326fc92c8b69c65689ade91e00d8f9ad46fad37ecf301840170b9041dfa0a7aed94d5d93208ae9a4c6a0c62ede039ab370
-  data.tar.gz: e8fc8528855d6230dd8951cf446fe8ec69cdf1692b252060037e99e6471eab540c855394d87086966dfa13eaada868f2c434bc21eb4069112b9e236ad6cf7250
+  metadata.gz: 3a4e2fe3a9e3014faf9dac52377c01ac2843dacc0e1de98ec00832f569d98e49f022a47621944d25426967aa12441932d84508078c27b9c3c7732fdf4bffb6f6
+  data.tar.gz: d8b4642f81be10b8169331fea76c7e5996770087842f1dfd03ddea1e41a8c32dcc23b9be1483bf29ffabb27008719458ed9cd0aba16f57f7368b23db7d096013

data/.rubocop.yml

@@ -32,7 +32,7 @@ Style/NumericLiterals:
   Enabled: false
 
 Style/CaseIndentation:
-  IndentWhenRelativeTo: end
+  EnforcedStyle: end
 
 Style/IndentHash:
   EnforcedStyle: consistent
@@ -58,6 +58,10 @@ Metrics/ClassLength:
 Metrics/MethodLength:
   Enabled: false
 
+Metrics/BlockLength:
+  Exclude:
+    - "**/*_spec.rb"
+
 Metrics/ParameterLists:
   Max: 5
   CountKeywordArgs: false
@@ -66,7 +70,7 @@ Metrics/PerceivedComplexity:
   Enabled: false
 
 Lint/EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
 
 Style/FrozenStringLiteralComment:
   Enabled: false

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'rake'
 gem 'byebug'
+gem 'rake'
 gem 'rubocop'
 gem 'yard'
 

data/README.md

@@ -26,6 +26,14 @@ client = Oktakit.new(token: 't0k3n', organization: 'my-great-org')
 response, http_status = client.list_users
 ```
 
+#### Pagination
+Pass the `paginate` flag as options for any `get` action for Oktakit to autopaginate the response for you.
+
+```ruby
+client = Oktakit.new(token: 't0k3n', organization: 'my-great-org')
+response, http_status = client.list_users(paginate: true)
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.

data/dev.yml

@@ -9,3 +9,7 @@ up:
 commands:
   test: bundle exec rspec
   console: bin/console
+
+packages:
+  - git@github.com:Shopify/dev-shopify.git
+

data/lib/oktakit/client.rb

@@ -48,18 +48,25 @@ module Oktakit
     # @return [Sawyer::Resource]
     def get(url, options = {})
       should_paginate = options.delete(:paginate)
-      resp, status, next_page = request :get, url, query: options.delete(:query),
-                                                   headers: options.delete(:headers),
-                                                   accept: options.delete(:accept),
-                                                   content_type: options.delete(:content_type),
-                                                   paginate: should_paginate, data: options
-
-      # If we should paginate, then automatically traverse all next_pages
-      if should_paginate
+      request_options = {
+        query: options.delete(:query),
+        headers: options.delete(:headers),
+        accept: options.delete(:accept),
+        content_type: options.delete(:content_type),
+        paginate: should_paginate,
+        data: options
+      }
+
+      resp, status, next_page = request :get, url, **request_options
+
+      # If request succeeded and we should paginate, then automatically traverse all next_pages
+      if status == 200 && should_paginate
         all_objs = [resp]
-        while next_page && resp = next_page.get
-          next_page = resp.rels[:next]
-          all_objs << resp.data
+        while next_page
+          resp, status, next_page = request :get, next_page, **request_options
+          break unless status == 200 # Return early if page request fails
+
+          all_objs << resp
         end
         resp = all_objs.flatten
       end
@@ -153,11 +160,11 @@ module Oktakit
       options[:headers][:accept] = accept if accept
       options[:headers][:content_type] = content_type if content_type
 
-      uri = URI::Parser.new.escape("/api/v1/" + path.to_s)
+      uri = URI::Parser.new.escape("/api/v1" + path.to_s)
       @last_response = resp = sawyer_agent.call(method, uri, data, options)
 
       response = [resp.data, resp.status]
-      response << resp.rels[:next] if paginate
+      response << absolute_to_relative_url(resp.rels[:next]) if paginate
       response
     end
 
@@ -178,7 +185,12 @@ module Oktakit
     end
 
     def api_endpoint
-      "https://#{@organization}.okta.com/api/v1/"
+      "https://#{@organization}.okta.com/api/v1"
+    end
+
+    def absolute_to_relative_url(next_ref)
+      return unless next_ref
+      next_ref.href.sub(api_endpoint, '')
     end
   end
 end

data/lib/oktakit/version.rb

@@ -1,3 +1,3 @@
 module Oktakit
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oktakit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Graeme Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sawyer