bouncie 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88709352c65b73b8d0309b7e568b3fbb2cba215c4110770289971ff033b507d4
-  data.tar.gz: 1205a6c8f02271170b47a39994ccd25c0fd46ddf437e9ee46ae0960c0acd31fa
+  metadata.gz: 0202c63ed663c1ac4412667cdc72e6d6474150bafd4dfcfadd8e4a63c8d4ba2d
+  data.tar.gz: cc62cd47492c08d5ec017a2c1258b9c4c48b329b48a0478a7f8c32b0f491407e
 SHA512:
-  metadata.gz: a2d6cecd4277f7564ea8e96c8c9dbd1e5e7c0330e00591a7bc90bd3fa3c411f24b68c57a7de5b179e04d90ce17c2dc902a701831e08cc7c406048fcac847c81a
-  data.tar.gz: 92cfe4d41f800b4ad705fa7a1ea5e26f5c0bfbc9ced0606ea40878e1fc76bb7a2400f9955ce90e56eb47b1fa7f7a0747eb6e3c1025aea92a6bdaa6db9e987300
+  metadata.gz: 129ffd0ce66cd76d86b980529137ec2d0570305112c1bb4ece7cf0784aae69de38139ba0b5a90ed6e43f617338038e1f6b881dc3ca88fae294120ed7957587f7
+  data.tar.gz: 773c27196353fb8a3f840745f7ea78e369dc677745be41edc873530c1959a5ebbc939cfcba0b7a987182f2e64ef2a03ffb2c1d46059c0f5afa5d0f6686411c50

data/.github/workflows/lint.yml

@@ -0,0 +1,15 @@
+name: Linting
+
+on: [push]
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - run: bundle install
+    - name: Rubocop
+      run: rubocop

data/.github/workflows/matrix_testing.yml

@@ -0,0 +1,24 @@
+name: Matrix Testing
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu]
+        ruby: [2.5, 2.6, 2.7, head, debug, jruby, jruby-head, truffleruby, truffleruby-head]
+    continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - run: bundle install
+    - run: rspec spec

data/.github/workflows/publish.yml

@@ -1,18 +1,48 @@
 name: Ruby Gem
 
 on:
-  push:
-    branches: [ master ]
+  # Manually publish
+  workflow_dispatch:
+  # push:
+  #   branches: [ main ]
+  # pull_request:
+  #   branches: [ main ]
 
 jobs:
   build:
-
+    name: Build + Publish
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Build and publish gem
-      uses: jstastny/publish-gem-to-github@master
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.7
+      uses: ruby/setup-ruby@v1
       with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        owner: streetsmartslabs
+        ruby-version: 2.7
+    - run: bundle install
+
+    - name: Publish to GPR
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
+      env:
+        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
+        OWNER: ${{ github.repository_owner }}
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/Gemfile.lock

@@ -1,32 +1,39 @@
 PATH
   remote: .
   specs:
-    bouncie (0.4.0)
+    bouncie (0.7.0)
       activesupport
       faraday
-      oj
+      json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.1)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.3)
-    faraday (1.0.1)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
-    i18n (1.8.3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
+    json (2.5.1)
     method_source (0.9.2)
-    minitest (5.14.1)
+    minitest (5.14.4)
     multipart-post (2.1.1)
-    oj (3.10.6)
     parallel (1.19.1)
     parser (2.7.1.3)
       ast (~> 2.4.0)
@@ -62,12 +69,12 @@ GEM
     rubocop-ast (0.0.3)
       parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    ruby2_keywords (0.0.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
     yard (0.9.25)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -82,4 +89,4 @@ DEPENDENCIES
   yard (~> 0.9.25)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/bouncie.gemspec

@@ -38,5 +38,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport'
   spec.add_dependency 'faraday'
-  spec.add_dependency 'oj'
+  spec.add_dependency 'json'
 end

data/lib/bouncie/client.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'faraday'
-require 'oj'
+require 'json'
 
 module Bouncie
   # Class that wraps a Faraday connection in order to interact with the Bouncie API
@@ -47,10 +47,10 @@ module Bouncie
     def vehicles(imei: nil, vin: nil)
       request(
         http_method: :get,
-        endpoint:    'vehicles',
-        params:      {
+        endpoint: 'vehicles',
+        params: {
           imei: imei,
-          vin:  vin
+          vin: vin
         }.compact
       ).map { |data| Bouncie::Vehicle.new(data) }
     end
@@ -64,21 +64,23 @@ module Bouncie
       Bouncie::User.new(data)
     end
 
+    # rubocop:disable Metrics/AbcSize
     def refresh!
       resp = Faraday.post('https://auth.bouncie.com/oauth/token', {
-                     client_id:     options[:client_id],
-                     client_secret: options[:client_secret],
-                     grant_type:    'authorization_code',
-                     code:          options[:authorization_code],
-                     redirect_uri:  options[:redirect_uri]
-                   })
+                            client_id: options[:client_id],
+                            client_secret: options[:client_secret],
+                            grant_type: 'authorization_code',
+                            code: options[:authorization_code],
+                            redirect_uri: options[:redirect_uri]
+                          })
       if resp.success?
-        parsed_resp = Oj.load(resp.body)
+        parsed_resp = JSON.parse(resp.body)
         @headers = headers.merge(Authorization: parsed_resp['access_token'])
         @client = build_client
       end
       resp
     end
+    # rubocop:enable Metrics/AbcSize
 
     private
 
@@ -100,7 +102,7 @@ module Bouncie
     def request(http_method:, endpoint:, params: {})
       params.transform_keys! { |k| k.to_s.dasherize }
       resp = client.public_send(http_method, endpoint, params)
-      Oj.load(resp.body)
+      JSON.parse(resp.body)
     end
   end
 end

data/lib/bouncie/entity.rb

@@ -6,8 +6,8 @@ module Bouncie
   # Abstract base class for objects returned from API requests. Parses dates, converts keys to underscore.
   class Entity
     def initialize(data)
-      @data = data.transform_keys { |k| k.to_s.underscore.to_sym }
-      massage_data
+      transformed = data.transform_keys { |k| k.to_s.underscore.to_sym }
+      @data = massage_data(transformed)
     end
 
     def method_missing(method_name, *args, &block)
@@ -24,15 +24,21 @@ module Bouncie
 
     private
 
-    def massage_data
-      @data.each do |key, val|
-        if val.is_a?(Hash)
-          @data[key] = Bouncie::Entity.new(val)
-        elsif val.is_a?(Array)
-          @data[key] = val.map { |v| Bouncie::Entity.new(v) }
-        elsif val.is_a?(String) && %w[_updated _time timestamp].any? { |v| key.to_s.end_with?(v) }
-          @data[key] = DateTime.parse(val)
-        end
+    def massage_data(input)
+      input.each_with_object({}) do |(key, val), memo|
+        memo[key] = massage_value(val)
+      end
+    end
+
+    def massage_value(value)
+      if value.is_a?(Hash)
+        Bouncie::Entity.new(value)
+      elsif value.is_a?(Array)
+        value.map { |v| massage_value(v) }
+      elsif value.is_a?(String) && value.match?(/^(\d{4})-(\d{2})-(\d{2})(T|\s)(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)((-(\d{2}):(\d{2})|Z)?)$/)
+        DateTime.parse(value)
+      else
+        value
       end
     end
   end

data/lib/bouncie/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bouncie
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bouncie
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Corey Psoinos
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,14 +136,15 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - corey@streetsmarts.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
+- ".github/workflows/lint.yml"
+- ".github/workflows/matrix_testing.yml"
 - ".github/workflows/publish.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -175,7 +176,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/streetsmartslabs/bouncie
   source_code_uri: https://github.com/streetsmartslabs/bouncie
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,8 +191,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: An API wrapper for Bouncie
 test_files: []

data/.github/workflows/ci.yml

@@ -1,32 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - 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@v1
-      with:
-        ruby-version: 2.6
-    - name: Install dependencies
-      run: bundle install
-    - name: RSpec tests
-      run: rspec spec
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Rubocop Linter Action
-      uses: andrewmcodes/rubocop-linter-action@v3.2.0
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}