paylocity_web_service 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33f09a98ae188a34663ec0cebb9f794cf7047fd30450554c96e9bc96aa4f878b
-  data.tar.gz: 1463dad0fec22d676864f791b4526ea2e696d1741d462435a1b3648525243dbf
+  metadata.gz: 8ed38f1a130e21d527fa2f42777314ecf3a200eeceb28cd1c1d6d6bebf13d5c5
+  data.tar.gz: 67d80bab97b9568534e1c031683267cdbaf503caabd4264d58d98e287be60104
 SHA512:
-  metadata.gz: b1e62adc3cf74ac566588e02874a2ca991a204266fbedaa2c4cf20d5098ac653c40ee66b2af1eecd1849db2b07ba324d57a58d0a38d1ff9bf8ad732d6c5aa27e
-  data.tar.gz: 1f14ab469633028556a3c58714c15acf4c64d6e7e63b91d5479e11a8421d496cf4dee75d98a0a5c881e359b14d1d2ae5844b76f053b01dd869b48df86fbc3ee7
+  metadata.gz: ff5f640ac32954fbbbd6641d2b6c709d65b91ff4dc88844f6fbaf8525af539d69340afaf21114b82eff2020c986842a09bd2d54744068afcf3cd51a86fd94f37
+  data.tar.gz: dd71548e6420fb38bebbd99848d5f960f1d1d51fd79230379a8853f0686fb2c5e90dd7227e975fdafa3cbecae0eec14d95ed2dd9462fc204cd76032b07e82a66

data/.github/workflows/rspec.yml

@@ -0,0 +1,38 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    environment: test
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['3.0']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@2b019609e2b0f1ea1a2bc8ca11cb82ab46ada124
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: SANDBOX_PAYLOCITY_CLIENT_ID=${{ secrets.SANDBOX_PAYLOCITY_CLIENT_ID }} SANDBOX_PAYLOCITY_CLIENT_SECRET=${{ secrets.SANDBOX_PAYLOCITY_CLIENT_SECRET }} SANDBOX_PAYLOCITY_DEMO_COMPANY_ID=${{ secrets.SANDBOX_PAYLOCITY_DEMO_COMPANY_ID }} SANDBOX_PAYLOCITY_ENDPOINT=${{ secrets.SANDBOX_PAYLOCITY_ENDPOINT }} SANDBOX_PAYLOCITY_PUBLIC_KEY="${{ secrets.SANDBOX_PAYLOCITY_PUBLIC_KEY }}" bundle exec rspec

data/.gitignore

@@ -11,3 +11,4 @@ Gemfile.lock
 
 # rspec failure tracking
 .rspec_status
+.env.test

data/Gemfile

@@ -8,10 +8,11 @@ gemspec
 # The following gems are required for local development and will not be included by `gem install mygem` or `bundle add mygem`.
 group :development, :test do
   gem 'awesome_print', require: 'ap'
+  gem 'rails'
   gem 'pry'
   gem 'rubocop'
   gem 'rake'
   gem 'bundler'
   gem "rspec", "~> 3.0"
-  gem 'webmock', '~> 3.8', '>= 3.8.2'
+  gem 'dotenv'
 end

data/lib/paylocity_web_service/authentication.rb

@@ -5,7 +5,7 @@ require 'paylocity_web_service/cache'
 module PaylocityWebService
   module Authentication
     def access_token
-      token = PaylocityWebService::Cache.read(access_token_cache_key)
+      token = cache_store.read(access_token_cache_key)
 
       if token.nil?
         refresh_token
@@ -26,15 +26,24 @@ module PaylocityWebService
         }
       end
 
-
       body = JSON.parse(resp.body)
       token, expires_in = body['access_token'], body['expires_in']
-      PaylocityWebService::Cache.write(access_token_cache_key, token, expires_in)
+      cache_store.write(access_token_cache_key, token, expires_in: expires_in)
       token
     end
 
     def access_token_cache_key
-      'access_token_cache_key'
+      raise 'company_id is required' if company_id.nil?
+      "PaylocityCompany/#{company_id}/AccessToken/#{endpoint}"
+    end
+
+
+    def cache_store
+      if defined?(Rails)
+        Rails.cache
+      else
+        PaylocityWebService::Cache
+      end
     end
 
     def basic_auth_token

data/lib/paylocity_web_service/cache.rb

@@ -9,7 +9,8 @@ module PaylocityWebService
       store[key][:value]
     end
 
-    def self.write(key, value, expires_in = 3600 )
+    def self.write(key, value, options = {} )
+      expires_in = options[:expires_in] || 3600
       expires_at = (Time.now.to_i + expires_in.to_i) - 60
       store[key] = { value: value, expires_at: expires_at}
     end
@@ -18,7 +19,7 @@ module PaylocityWebService
       @cache_store ||= {}
     end
 
-    def self.flush!
+    def self.clear
       @cache_store = {}
     end
   end

data/lib/paylocity_web_service/connection.rb

@@ -95,6 +95,7 @@ module PaylocityWebService
         conn.use Faraday::Request::Authorization, :Bearer, access_token
         conn.request :retry, max: 2
         conn.request :json
+        conn.request :instrumentation, name: 'request.paylocity'
 
         # conn.use PaylocityWebService::Middleware::Response::RaiseError
         conn.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/

data/lib/paylocity_web_service/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PaylocityWebService
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paylocity_web_service
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Ryan Lv
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -45,10 +45,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rspec.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Ruby wrapper for the API of Paylocity Web Service

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.6.6
-before_install: gem install bundler -v 2.2.15