bearcat 1.3.47 → 1.3.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80686ce28c0fbf0d96f638ff05e1f82ab76638d782d963a8f544b0c0fab17a8f
-  data.tar.gz: cd9784f0d0e63527c13fe5f34703915e61a05030ab618fe60889ae1ec449e3f5
+  metadata.gz: b57723897b87e3fa4b7f13dd36b248e8057291bbdc34d2fda4c36239c105f986
+  data.tar.gz: 55d51657b04977a727e98d256362af2dcb9557c233deee69f64db8bd7f7419e1
 SHA512:
-  metadata.gz: 980dc61ffa0dd83c74ac5307c4a9f6ac5b2e0f31af634a6f90257f8053079e512c5bb6c08ea7e77a50ebff62f39469a7aced145bc1bed59adf76ee74c3020700
-  data.tar.gz: e8147a8d1e751c533dacd061b5f7ab0094c8c6aa17c5fb0d4720b52900d84418a58679aaafb2f2500223f41e4942de978befcb5ccbe3d7850733e7165340b168
+  metadata.gz: ae314ea98375c5685ec644724b07b7fc90e040cd4efd92219e3545c94ca2003c14970a8f9a4dd5496ebd05bd286f62da1b11d6121a0ba5dc143bc2103de11dcf
+  data.tar.gz: c98e3a06fe914bb0f06d9c42d3cf1472d874255456d021462162ce19be5eecd272d83cdda14b426e24166e25a7e71bf58f8e32799335ea7788acc6e196e26881

data/lib/bearcat/spec_helpers.rb

@@ -13,6 +13,56 @@ module Bearcat::SpecHelpers
   # 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)
+    url = case endpoint
+    when Symbol
+      ruby_method = Bearcat::Client.instance_method(endpoint)
+      match = SOURCE_REGEX.match(ruby_method.source)
+      bits = []
+      url = match[:url].gsub(/\/$/, '')
+      lend = 0
+      url.scan(/#\{(?<key>.*?)\}/) do |key|
+        m = Regexp.last_match
+        between = url[lend..m.begin(0)-1]
+        bits << between if between.present? && (m.begin(0) > lend)
+        lend = m.end(0)
+        bits << (kwargs[m[:key].to_sym] || /\w+/)
+      end
+      between = url[lend..-1]
+      bits << between if between.present?
+
+      bits.map do |bit|
+        case bit
+        when Regexp
+          bit.source
+        when String
+          Regexp.escape(bit)
+        end
+      end.join
+    when String
+      Regexp.escape(endpoint)
+    when Regexp
+      endpoint.source
+    end
+
+    url = Regexp.escape(resolve_prefix(prefix)) + url
+    stub = stub_request(match[:method].to_sym, Regexp.new(url))
+
+    # Override the to_return method to accept a Hash as body:
+    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
+
+  private
+
+  def resolve_prefix(prefix)
     if prefix == true
       prefix = canvas_api_client if defined? canvas_api_client
       prefix = canvas_sync_client if defined? canvas_sync_client
@@ -29,33 +79,5 @@ module Bearcat::SpecHelpers
     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.47' unless defined?(Bearcat::VERSION)
+  VERSION = '1.3.48' unless defined?(Bearcat::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bearcat
 version: !ruby/object:Gem::Version
-  version: 1.3.47
+  version: 1.3.48
 platform: ruby
 authors:
 - Nathan Mills, Jake Sorce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake