bearcat 1.3.44 → 1.3.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b91690f9dddf5832886431880e39b72b4a25d973
-  data.tar.gz: f5a216c9a3260770c07ea61fa7ffe26dafd95c25
+  metadata.gz: 4df1420a15e970e9935719b7a6a7366023ad524d
+  data.tar.gz: c24ace0db440224f5c56835da55f1218fece1505
 SHA512:
-  metadata.gz: 2728a893d0a01330e9976742155c10c3b002ed713c9219188d590569d082e05b782802c02d57e888c049c81d79843002a284e136d4069005cb4d7433994296bd
-  data.tar.gz: 9c6c6abe1e6c2891b3af32c90d99c687e096a6861f855f017222e0b9dc79219cc2247dbf90d462874bf8ac8b2f56e9ae850bad05888c73ef747bd4042eec4337
+  metadata.gz: a44471bb065353b6ff0bb3e3456a657cad85c977168f22b065c4d5b39c0ded885502de9c49209f47e25b6248e9b454a14a06be4de34ba607e95b2f2c2180cb55
+  data.tar.gz: 806e9ba0991a8e0bf62182211e8cb69fc365f27c2b0994ce95429f8f7566c42b03930465d40ec44bba9aa683ba469fdd5efa06ddb6282b7d1f047de93f22496c

data/lib/bearcat/api_array.rb

@@ -62,23 +62,27 @@ module Bearcat
 
     def each_page(page_count = 50, &block)
       @page_count = page_count
-      response = get_page(@link_hash['first'])
-      @headers = response.headers
-      @status = response.status
-      @method = response.env[:method]
-      init_pages(@headers[:link])
-      @members = process_body(response)
-      block.call(@members)
-      while @link_hash['next']
-        response = get_page(@link_hash['next'])
+      if pages?
+        response = get_page(@link_hash['first'])
         @headers = response.headers
         @status = response.status
         @method = response.env[:method]
-        @members = process_body(response)
         init_pages(@headers[:link])
+        @members = process_body(response)
+        block.call(@members)
+        while @link_hash['next']
+          response = get_page(@link_hash['next'])
+          @headers = response.headers
+          @status = response.status
+          @method = response.env[:method]
+          @members = process_body(response)
+          init_pages(@headers[:link])
+          block.call(@members)
+        end
+        @link_hash = {}
+      else
         block.call(@members)
       end
-      @link_hash = {}
     end
 
     def all_pages_each(page_count = 50, &block)

data/lib/bearcat/spec_helpers.rb

@@ -0,0 +1,59 @@
+# Bearcat RSpec Helpers
+# Can be included in your spec_helper.rb file by using:
+# - `require 'bearcat/spec_helpers'`
+# And
+# - `config.include Bearcat::SpecHelpers`
+module Bearcat::SpecHelpers
+  SOURCE_REGEX = /(?<method>get|post|delete|put)\((?<quote>\\?('|"))(?<url>.*)\k<quote>/
+
+  # Helper method to Stub Bearcat requests.
+  # Automagically parses the Bearcat method source to determine the correct URL to stub.
+  # Accepts optional keyword parameters to interpolate specific values into the URL.
+  # Returns a mostly-normal Webmock stub (:to_return has been overridden to allow :body to be set to a Hash)
+  def stub_bearcat(endpoint, prefix: nil, **kwargs)
+    if prefix == true
+      prefix = canvas_api_client if defined? canvas_api_client
+      prefix = canvas_sync_client if defined? canvas_sync_client
+    end
+    prefix = case prefix
+    when nil
+      ''
+    when false
+      ''
+    when true
+      raise "stub_bearcat() prefix: set to true, but neither canvas_(sync|api)_client are defined"
+    when Bearcat::Client
+      prefix.prefix
+    when String
+      prefix
+    end
+
+    ruby_method = Bearcat::Client.instance_method(endpoint)
+    match = SOURCE_REGEX.match(ruby_method.source)
+    url = match[:url]
+    url = url.gsub(/#\{(?<key>.*?)\}/) do |match|
+      match = Regexp.last_match
+      v = kwargs[match[:key].to_sym]
+      case v
+      when nil
+        '\\w+'
+      when Regexp
+        v.source
+      when String
+        Regexp.escape(v)
+      end
+    end
+    url = prefix + url if prefix.present?
+    url_pattern = Regexp.new(url)
+    stub = stub_request(match[:method].to_sym, url_pattern)
+    stub.define_singleton_method(:to_return, ->(*resps) {
+      resps.map do |resp|
+        resp[:headers] ||= {}
+        resp[:headers]["Content-Type"] ||= "application/json"
+        resp[:body] = resp[:body].to_json
+      end
+      super(*resps)
+    })
+    stub
+  end
+end

data/lib/bearcat/version.rb

@@ -1,3 +1,3 @@
 module Bearcat
-  VERSION = '1.3.44' unless defined?(Bearcat::VERSION)
+  VERSION = '1.3.45' unless defined?(Bearcat::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.3.44
+  version: 1.3.45
 platform: ruby
 authors:
 - Nathan Mills, Jake Sorce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -172,6 +172,7 @@ files:
 - lib/bearcat/client/sections.rb
 - lib/bearcat/client/submissions.rb
 - lib/bearcat/client/users.rb
+- lib/bearcat/spec_helpers.rb
 - lib/bearcat/version.rb
 - spec/bearcat/api_array_spec.rb
 - spec/bearcat/client/accounts_spec.rb
@@ -370,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Canvas API