procore 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a122d8e74f07636c87c3db3bfedb0836f813e31c1e8a3b6df25f84da131f06a
-  data.tar.gz: 58b335464bf7b9c1bc7284e1651fc05d08796d348da464d6d327d8c0b8243a2a
+  metadata.gz: ba26de8f801db077402e6119b3d45bc04c097a6ac5f25c2a686c2ece6f1660f2
+  data.tar.gz: 65020be1331a41550388c1ad39bee27b91d1a09bcc1ae346273d5b1a8f1034ca
 SHA512:
-  metadata.gz: 825662dbe28de8510a825cfd7e512050b7bf09da321a952587d8c243e05d71ba7b61af0fbc668334696ea0a61ddf065174055b6df38875e51c2b7735ac498110
-  data.tar.gz: f329ffd5f5cb34aa5571fc1f79b4a24b13a1c5ec25f981bef7d4be7e2e45fecf789792d971c00c287f534dea30cdcfadbe7d4689fe49d277752aa8a22b3bd692
+  metadata.gz: 17c3671f731c30b852a8daa6fe4fde8af9ccf19bdf52962485a06ac1182dc937d1a8737f23bb7254ab8244135efecc0432f9157311ff47b0d6d95a6da6252ca5
+  data.tar.gz: 62a695f1b3f1f53c40182eb637ca59839b1f8045c260ab937abc2cae4d6d431b1ddda685d349fb3091f804ef851b88a65f33e8aaa313562f3dc5ecef67763d6a

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Unreleased
 
+## 0.7.0 (February 21, 2018)
+
+* Add multipart request support
+* Move to `RestClient` from `HTTParty`
+
+  *Matt Brinza*
+
 ## 0.6.9 (February 09, 2018)
 
 *  Add HTTP PUT support

data/lib/procore/requestable.rb

@@ -1,4 +1,4 @@
-require "httparty"
+require "rest-client"
 
 module Procore
   # Module which defines HTTP verbs GET, POST, PUT, PATCH and DELETE. Is
@@ -26,10 +26,10 @@ module Procore
       )
 
       with_response_handling do
-        HTTParty.get(
-          "#{base_api_path}/#{path}",
-          query: query,
-          headers: headers,
+        RestClient::Request.execute(
+          method: :get,
+          url: "#{base_api_path}/#{path}",
+          headers: headers.merge(params: query),
           timeout: Procore.configuration.timeout,
         )
       end
@@ -54,9 +54,10 @@ module Procore
       )
 
       with_response_handling do
-        HTTParty.post(
-          "#{base_api_path}/#{path}",
-          body: body.to_json,
+        RestClient::Request.execute(
+          method: :post,
+          url: "#{base_api_path}/#{path}",
+          payload: payload(body),
           headers: headers(options),
           timeout: Procore.configuration.timeout,
         )
@@ -81,9 +82,10 @@ module Procore
       )
 
       with_response_handling do
-        HTTParty.put(
-          "#{base_api_path}/#{path}",
-          body: body.to_json,
+        RestClient::Request.execute(
+          method: :put,
+          url: "#{base_api_path}/#{path}",
+          payload: payload(body),
           headers: headers(options),
           timeout: Procore.configuration.timeout,
         )
@@ -109,9 +111,10 @@ module Procore
       )
 
       with_response_handling do
-        HTTParty.patch(
-          "#{base_api_path}/#{path}",
-          body: body.to_json,
+        RestClient::Request.execute(
+          method: :patch,
+          url: "#{base_api_path}/#{path}",
+          payload: payload(body),
           headers: headers(options),
           timeout: Procore.configuration.timeout,
         )
@@ -134,10 +137,10 @@ module Procore
       )
 
       with_response_handling do
-        HTTParty.delete(
-          "#{base_api_path}/#{path}",
-          query: query,
-          headers: headers,
+        RestClient::Request.execute(
+          method: :delete,
+          url: "#{base_api_path}/#{path}",
+          headers: headers.merge(params: query),
           timeout: Procore.configuration.timeout,
         )
       end
@@ -151,7 +154,7 @@ module Procore
 
       begin
         result = yield
-      rescue Timeout::Error, Errno::ECONNREFUSED => e
+      rescue RestClient::Exceptions::Timeout, Errno::ECONNREFUSED => e
         if retries <= Procore.configuration.max_retries
           retries += 1
           sleep 1.5**retries
@@ -164,6 +167,8 @@ module Procore
             "values.",
           ), e
         end
+      rescue RestClient::ExceptionWithResponse => e
+        result = e.response
       end
 
       response = Procore::Response.new(
@@ -177,7 +182,7 @@ module Procore
       when 200..299
         Util.log_info(
           "API Request Finished ",
-          path: result.request.path,
+          path: result.request.url,
           status: result.code.to_s,
           duration: "#{((Time.now - request_start_time) * 1000).round(0)}ms",
           request_id: result.headers["x-request-id"],
@@ -185,7 +190,7 @@ module Procore
       else
         Util.log_error(
           "API Request Failed",
-          path: result.request.path,
+          path: result.request.url,
           status: result.code.to_s,
           duration: "#{((Time.now - request_start_time) * 1000).round(0)}ms",
           request_id: result.headers["x-request-id"],
@@ -241,5 +246,13 @@ module Procore
         end
       end
     end
+
+    def payload(body)
+      multipart?(body) ? body : body.to_json
+    end
+
+    def multipart?(body)
+      RestClient::Payload::has_file?(body)
+    end
   end
 end

data/lib/procore/version.rb

@@ -1,3 +1,3 @@
 module Procore
-  VERSION = "0.6.9".freeze
+  VERSION = "0.7.0".freeze
 end

data/procore.gemspec

@@ -34,6 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "httparty", "~> 0.16"
   spec.add_dependency "oauth2", "~> 1.4"
+  spec.add_dependency "rest-client", "~> 2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procore
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Procore Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -165,33 +165,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: oauth2
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.0.0
 description: Procore Ruby Gem
 email:
 - opensource@procore.comm
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Procore Ruby Gem