procore 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fff662a5f654e6726d9ce407f3110faef18d837bf00e1a5705ac761c568ffeb
-  data.tar.gz: a0618cce9e35ea519ffc819077d413a5c4f0e3a3b8d6035d6aaf57a678f6d3a6
+  metadata.gz: 6545e8ea432e0c10b0a3cd0e1257e96b57bf18f44c6d3ecfd3fa5805212290db
+  data.tar.gz: c93910a023d455bcc2731f8f74a1ebe3631851c0b711cf4effff9f1fe84b4503
 SHA512:
-  metadata.gz: cc8d4a97f3b5bafade47075b1225069cf0bee01b4296e957984ea8d1e2991b4eecbc3eedcb01a24450d9e62019a182377dc1173598501df63d8729ad664b3802
-  data.tar.gz: e16fd89928908356c5dc902dc8ed558b33dff38229f578e13b9a8ecef68fe1e1f7c8970fb633cf62fb27780195233f01ab17a64d105e4140b367deafaed8fa46
+  metadata.gz: 6376d8a7cc0a0a494594ce185e77630b885da38bbd14614219f069e3eaccd7f0f7cc202f007ef58129db49910bd518523e285830fbd3d6c379d920fdeceef6f9
+  data.tar.gz: e258551108c844d80137919ce861233db506ba97d72598f93da3c2e7818425188857a42be0ef2b3d28dde99e95eb304f5d11b179b2f470c45dfde37574e7b742

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Unreleased
 
+## 0.8.6 (May 10, 2018)
+
+* Dalli Store
+
+  *Patrick Koperwas*
+
+* Fix Requestable paths to prevent double slash in URI
+  
+    *Megan O'Neill*
+
 ## 0.8.5 (May 9, 2018)
 * Rescue Errno::ECONNREFUSED errors and RestClient::ServerBrokeConnection
 

data/README.md

@@ -14,6 +14,7 @@
 - [Stores](#stores)
   - [Session Store](#session-store)
   - [Redis Store](#redis-store)
+  - [Dalli Store](#dalli-store)
   - [ActiveRecord Store](#activerecord-store)
   - [File Store](#file-store)
   - [Memory Store](#memory-store)
@@ -331,6 +332,20 @@ The key will usually be the id of the current user.
 store = Procore::Auth::Stores::Redis.new(redis: Redis.new, key: current_user.id)
 ```
 
+### Dalli Store
+
+Options: `dalli`: Instance of Dalli
+Options: `key`: Unique identifier to an access token
+
+For applications which want to store access tokens in memcached using Dalli.
+There's two required options, `dalli` which is an instance of a Dalli client,
+and `key` which is a unique key which will be used to save / retrieve an access
+token.  The key will usually be the id of the current user.
+
+```ruby
+store = Procore::Auth::Stores::Dalli.new(dalli: Dalli.new, key: current_user.id)
+```
+
 ### ActiveRecord Store
 
 Options: `object`: Instance of an ActiveRecord model.

data/lib/procore.rb

@@ -7,6 +7,7 @@ require "json"
 require "procore/auth/access_token_credentials"
 require "procore/auth/client_credentials"
 require "procore/auth/stores/active_record"
+require "procore/auth/stores/dalli"
 require "procore/auth/stores/file"
 require "procore/auth/stores/memory"
 require "procore/auth/stores/redis"

data/lib/procore/auth/stores/dalli.rb

@@ -0,0 +1,38 @@
+module Procore
+  module Auth
+    module Stores
+      class Dalli
+        attr_reader :key, :dalli
+        def initialize(key:, dalli:)
+          @key = key
+          @dalli = dalli
+        end
+
+        def save(token)
+          dalli.set(dalli_key, token.to_json)
+        end
+
+        def fetch
+          return unless dalli.get(dalli_key)
+
+          token = JSON.parse(dalli.get(dalli_key))
+          Procore::Auth::Token.new(
+            access_token: token["access_token"],
+            refresh_token: token["refresh_token"],
+            expires_at: token["expires_at"],
+          )
+        end
+
+        def delete
+          dalli.delete(dalli_key)
+        end
+
+        private
+
+        def dalli_key
+          "procore-dalli-#{key}"
+        end
+      end
+    end
+  end
+end

data/lib/procore/requestable.rb

@@ -27,9 +27,11 @@ module Procore
     #
     # @return [Response]
     def get(path, query: {}, options: {})
+      full_path = full_path(path)
+
       Util.log_info(
         "API Request Initiated",
-        path: "#{base_api_path}/#{path}",
+        path: full_path,
         method: "GET",
         query: query.to_s,
       )
@@ -37,7 +39,7 @@ module Procore
       with_response_handling do
         RestClient::Request.execute(
           method: :get,
-          url: "#{base_api_path}/#{path}",
+          url: full_path,
           headers: headers(options).merge(params: query),
           timeout: Procore.configuration.timeout,
         )
@@ -58,9 +60,11 @@ module Procore
     #
     # @return [Response]
     def post(path, body: {}, options: {})
+      full_path = full_path(path)
+
       Util.log_info(
         "API Request Initiated",
-        path: "#{base_api_path}/#{path}",
+        path: full_path,
         method: "POST",
         body: body.to_s,
       )
@@ -68,7 +72,7 @@ module Procore
       with_response_handling(request_body: body) do
         RestClient::Request.execute(
           method: :post,
-          url: "#{base_api_path}/#{path}",
+          url: full_path,
           payload: payload(body),
           headers: headers(options),
           timeout: Procore.configuration.timeout,
@@ -86,9 +90,11 @@ module Procore
     #
     # @return [Response]
     def put(path, body: {}, options: {})
+      full_path = full_path(path)
+
       Util.log_info(
         "API Request Initiated",
-        path: "#{base_api_path}/#{path}",
+        path: full_path,
         method: "PUT",
         body: body.to_s,
       )
@@ -96,7 +102,7 @@ module Procore
       with_response_handling(request_body: body) do
         RestClient::Request.execute(
           method: :put,
-          url: "#{base_api_path}/#{path}",
+          url: full_path,
           payload: payload(body),
           headers: headers(options),
           timeout: Procore.configuration.timeout,
@@ -118,9 +124,11 @@ module Procore
     #
     # @return [Response]
     def patch(path, body: {}, options: {})
+      full_path = full_path(path)
+
       Util.log_info(
         "API Request Initiated",
-        path: "#{base_api_path}/#{path}",
+        path: full_path,
         method: "PATCH",
         body: body.to_s,
       )
@@ -128,7 +136,7 @@ module Procore
       with_response_handling(request_body: body) do
         RestClient::Request.execute(
           method: :patch,
-          url: "#{base_api_path}/#{path}",
+          url: full_path,
           payload: payload(body),
           headers: headers(options),
           timeout: Procore.configuration.timeout,
@@ -145,9 +153,11 @@ module Procore
     #
     # @return [Response]
     def delete(path, query: {}, options: {})
+      full_path = full_path(path)
+
       Util.log_info(
         "API Request Initiated",
-        path: "#{base_api_path}/#{path}",
+        path: full_path,
         method: "DELETE",
         headers: headers(options),
         query: query.to_s,
@@ -156,7 +166,7 @@ module Procore
       with_response_handling do
         RestClient::Request.execute(
           method: :delete,
-          url: "#{base_api_path}/#{path}",
+          url: full_path,
           headers: headers.merge(params: query),
           timeout: Procore.configuration.timeout,
         )
@@ -285,5 +295,9 @@ module Procore
     def multipart?(body)
       RestClient::Payload::has_file?(body)
     end
+
+    def full_path(path)
+      File.join(base_api_path, path).to_s
+    end
   end
 end

data/lib/procore/version.rb

@@ -1,3 +1,3 @@
 module Procore
-  VERSION = "0.8.5".freeze
+  VERSION = "0.8.6".freeze
 end

data/procore.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "actionpack"
   spec.add_development_dependency "activerecord"
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "dalli"
   spec.add_development_dependency "fakefs"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procore
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Procore Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dalli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +241,7 @@ files:
 - lib/procore/auth/access_token_credentials.rb
 - lib/procore/auth/client_credentials.rb
 - lib/procore/auth/stores/active_record.rb
+- lib/procore/auth/stores/dalli.rb
 - lib/procore/auth/stores/file.rb
 - lib/procore/auth/stores/memory.rb
 - lib/procore/auth/stores/redis.rb