smartcar 3.0.4 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0671574e0a757bee551618fed49a329cf600fab00df745de53877e75b7f17a67
-  data.tar.gz: 3bd83358b2a16209d001297e295c31b75cfd937a3a9a6c6132f58995ef99cfb6
+  metadata.gz: af85a8f04bb5ecfd37182ae539ef60e5ca4e9487edf5db544109417df43d82d0
+  data.tar.gz: 5f2ccac9657e5e5b122b32943fa48845aa0acd5319dccc8836fd6b3cbf063ced
 SHA512:
-  metadata.gz: c20e0a508b8f228becddb76a18d99e95d1d994ced31f490bb207334cb40771ff9aa8e903da70fcfeba2982410e8032bbbe0d689d13b03de15841270134d6a35e
-  data.tar.gz: de7ba075efa2a18c3f5c5340bc0c28f132afc2db33baa3c176f8601f756ab1cbfd846b5c52ffc8b7678dbf1b7788a37c96425c6731dafc7ca6097730ebaf01eb
+  metadata.gz: 47abd5b611ddc7089be88614c2b79a4d2c33db498f1254eea55f2ed1426b795752b47b7e08e9ac8825086790313738f16affdf536ebed450963b36fd0d1305e3
+  data.tar.gz: 3ffef0a6f8f06da4c9f70a6798a9f701521831cdc30bbc183e613515b2b9520a492bd2d9e686a5c4cca0421d42def98bc0ccb6c4239cabd1d7b250ba5416f31d

data/.rubocop.yml

@@ -11,6 +11,12 @@ Metrics/AbcSize:
 Naming/AccessorMethodName:
   Enabled: false
 
+# Disabling this until we figure out a better way than using openstruct
+# Currently we use open struct because this gives us an object representing the JSON 
+# with accessor style methods.
+Style/OpenStructUse:
+  Enabled: false
+
 Metrics/BlockLength:
   Exclude:
     - '**/*.gemspec'
@@ -21,3 +27,6 @@ Metrics/MethodLength:
   Max: 20
   Exclude:
     - 'spec/smartcar/helpers/auth_helper.rb'
+
+Metrics/ClassLength:
+  Max: 200

data/.travis.yml

@@ -8,6 +8,7 @@ addons:
 rvm:
 - 2.6
 - 2.7
+- 3.0
 before_install:
   - gem install bundler -v 2.1.2
   - wget https://github.com/mozilla/geckodriver/releases/download/v0.26.0/geckodriver-v0.26.0-linux64.tar.gz

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smartcar (3.0.4)
+    smartcar (3.2.0)
       oauth2 (~> 1.4)
       recursive-open-struct (~> 1.1.3)
 
@@ -11,58 +11,42 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
-    backport (1.1.2)
+    backport (1.2.0)
     byebug (11.1.3)
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     codecov (0.5.2)
       simplecov (>= 0.15, < 0.22)
     crack (0.4.5)
       rexml
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.2.0)
+      faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
+    faraday-net_http (2.0.2)
     hashdiff (1.0.1)
     jwt (2.3.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (1.4.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.21.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
     rack (2.2.3)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (12.3.3)
-    readapt (1.3.0)
-      backport (~> 1.1)
+    readapt (1.4.3)
+      backport (~> 1.2)
       thor (~> 1.0)
     recursive-open-struct (1.1.3)
     redcarpet (3.5.1)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -76,23 +60,24 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.16.1)
+    rspec-support (3.10.3)
+    rubocop (1.24.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.0)
-    selenium-webdriver (3.142.7)
-      childprocess (>= 0.5, < 4.0)
+    rubyzip (2.3.2)
+    selenium-webdriver (4.1.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
     simplecov (0.21.2)
       docile (~> 1.1)
@@ -100,15 +85,16 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
-    thor (1.1.0)
-    unicode-display_width (2.0.0)
-    webmock (3.13.0)
-      addressable (>= 2.3.6)
+    thor (1.2.1)
+    unicode-display_width (2.1.0)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler (~> 2.0)
@@ -119,9 +105,9 @@ DEPENDENCIES
   redcarpet (~> 3.5.0)
   rspec (~> 3.0)
   rubocop (~> 1.12)
-  selenium-webdriver (~> 3.142)
+  selenium-webdriver (~> 4.1.0)
   smartcar!
   webmock (~> 3.13)
 
 BUNDLED WITH
-   2.1.4
+   2.3.1

data/README.md

@@ -116,6 +116,32 @@ Example Usage for oAuth -
 # get a new token or use .
 ```
 
+## Advanced configuration
+
+This SDK uses the [Faraday HTTP client library](https://lostisland.github.io/faraday/) which supports extensive customization through the use of middleware. If you need to customize the behavior of HTTP request/response processing, you can provide your own instance of Faraday::Connection to most methods in this library.
+
+**Important:** If you provide your own Faraday connection, you are responsible for configuring all HTTP connection behavior, including timeouts! This SDK uses some custom timeouts internally to ensure best behavior by default, so unless you want to customize them you may want to replicate those timeouts.
+
+Example of providing a custom Faraday connection to various methods:
+```ruby
+  # Example Faraday connection that uses the Instrumentation middleware
+  service = Faraday::Connection.new(url: Smartcar::API_ORIGIN, request: { timeout: Smartcar::DEFAULT_REQUEST_TIMEOUT }) do |c|
+    c.request :instrumentation
+  end
+
+  # Passing the custom service to #get_vehicles
+  Smartcar.get_vehicles(token: token, options: { service: service })
+
+  # Passing the custom service to #get_user
+  Smartcar.get_user(token: token, options: { service: service })
+
+  # Passing the custom service to #get_compatibility
+  Smartcar.get_compatibility(vin: vin, scope: scope, options: { service: service })
+
+  # Passing the custom service into a Smartcar::Vehicle object
+  vehicle = Smartcar::Vehicle.new(token: token, id: id, options: { service: service })
+```
+
 ## Development
 
 To install this gem onto your local machine, run `bundle exec rake install`.

data/lib/smartcar/base.rb

@@ -2,6 +2,7 @@
 
 require 'oauth2'
 require 'base64'
+require 'rbconfig'
 module Smartcar
   # The Base class for all of the other class.
   # Let other classes inherit from here and put common methods here.
@@ -12,8 +13,6 @@ module Smartcar
     class InvalidParameterValue < StandardError; end
     # Constant for Basic auth type
     BASIC = 'Basic'
-    # Number of seconds to wait for response
-    REQUEST_TIMEOUT = 310
 
     attr_accessor :token, :error, :unit_system, :version, :auth_type
 
@@ -23,11 +22,15 @@ module Smartcar
       # @param data [Hash] request body if needed.
       #
       # @return [Hash] The response Json parsed as a hash.
-      define_method verb do |path, data = nil|
+      define_method verb do |path, data = nil, headers = {}|
         response = service.send(verb) do |request|
-          request.headers['Authorization'] = auth_type == BASIC ? "Basic #{token}" : "Bearer #{token}"
-          request.headers['sc-unit-system'] = unit_system if unit_system
-          request.headers['Content-Type'] = 'application/json'
+          request_headers = {}
+          request_headers['Authorization'] = auth_type == BASIC ? "Basic #{token}" : "Bearer #{token}"
+          request_headers['sc-unit-system'] = unit_system if unit_system
+          request_headers['Content-Type'] = 'application/json'
+          request_headers['User-Agent'] =
+            "Smartcar/#{VERSION} (#{RbConfig::CONFIG['host_os']}; #{RbConfig::CONFIG['arch']}) Ruby v#{RUBY_VERSION}"
+          request.headers = request_headers.merge(headers)
           complete_path = "/v#{version}#{path}"
           if verb == :get
             request.url complete_path, data
@@ -60,7 +63,10 @@ module Smartcar
     #
     # @return [OAuth2::AccessToken] An initialized AccessToken instance that acts as service client
     def service
-      @service ||= Faraday.new(url: ENV['SMARTCAR_API_ORIGIN'] || API_ORIGIN, request: { timeout: REQUEST_TIMEOUT })
+      @service ||= Faraday.new(
+        url: ENV['SMARTCAR_API_ORIGIN'] || API_ORIGIN,
+        request: { timeout: DEFAULT_REQUEST_TIMEOUT }
+      )
     end
   end
 end

data/lib/smartcar/vehicle.rb

@@ -11,6 +11,7 @@ module Smartcar
   # @attr [Hash] options
   # @attr unit_system [String] Unit system to represent the data in, defaults to Imperial
   # @attr version [String] API version to be used.
+  # @attr service [Faraday::Connection] An optional connection object to be used for requests.
   class Vehicle < Base
     attr_reader :id
 
@@ -69,12 +70,13 @@ module Smartcar
                                          }, skip: true }
     }.freeze
 
-    def initialize(token:, id:, options: { unit_system: METRIC, version: Smartcar.get_api_version })
+    def initialize(token:, id:, options: {})
       super
       @token = token
       @id = id
-      @unit_system = options[:unit_system]
-      @version = options[:version]
+      @unit_system = options[:unit_system] || METRIC
+      @version = options[:version] || Smartcar.get_api_version
+      @service = options[:service]
 
       raise InvalidParameterValue.new, "Invalid Units provided : #{@unit_system}" unless UNITS.include?(@unit_system)
       raise InvalidParameterValue.new, 'Vehicle ID (id) is a required field' if id.nil?
@@ -201,7 +203,7 @@ module Smartcar
     #
     # @param webhook_id [String] Webhook id to subscribe to
     #
-    # @return [OpenStruct] And object representing the JSON response and a meta attribute
+    # @return [OpenStruct] An object representing the JSON response and a meta attribute
     #   with the relevant items from response headers.
     def subscribe!(webhook_id)
       response, headers = post(METHODS.dig(:subscribe!, :path).call(id, webhook_id), {})
@@ -234,5 +236,22 @@ module Smartcar
       response, headers = post("/vehicles/#{id}/batch", request_body)
       process_batch_response(response, headers)
     end
+
+    # General purpose method to make requests to the Smartcar API - can be
+    # used to make requests to brand specific endpoints.
+    #
+    # @param method [String] The HTTP request method to use.
+    # @param path [String] The path to make the request to.
+    # @param body [Hash] The request body.
+    # @param headers [Hash] The headers to inlcude in the request.
+    #
+    # @return [OpenStruct] An object with a "body" attribute that contains the
+    #   response body and a "meta" attribute with the relevant items from response headers.
+    def request(method, path, body = {}, headers = {})
+      path = "/vehicles/#{id}/#{path}"
+      raw_response, headers = send(method.downcase, path, body, headers)
+      meta = build_meta(headers)
+      json_to_ostruct({ body: raw_response, meta: meta })
+    end
   end
 end

data/lib/smartcar/version.rb

@@ -2,5 +2,5 @@
 
 module Smartcar
   # Gem current version number
-  VERSION = '3.0.4'
+  VERSION = '3.2.0'
 end

data/lib/smartcar.rb

@@ -31,6 +31,9 @@ module Smartcar
   # Constant for units
   UNITS = [IMPERIAL, METRIC].freeze
 
+  # Number of seconds to wait for responses
+  DEFAULT_REQUEST_TIMEOUT = 310
+
   # Smartcar API version variable - defaulted to 2.0
   @api_version = '2.0'
 
@@ -54,22 +57,22 @@ module Smartcar
 
     # Module method Used to check compatiblity for VIN and scope
     #
-    # API Documentation - https://smartcar.com/docs/api#connect-compatibility
+    # API Documentation - https://smartcar.com/docs/api#compatibility-api. Options Hash
     # @param vin [String] VIN of the vehicle to be checked
     # @param scope [Array of Strings] - array of scopes
     # @param country [String] An optional country code according to
-    # [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2).
-    # Defaults to US.
-    # @param options [Hash] Other optional parameters including overrides
+    # [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). Defaults to US.
+    # @param options [Hash] Other optional parameters including overrides (only valid for Smartcar API v1.0)
     # @option options [String] :client_id Client ID that overrides ENV
     # @option options [String] :client_secret Client Secret that overrides ENV
     # @option options [String] :version API version to use, defaults to what is globally set
     # @option options [Hash] :flags A hash of flag name string as key and a string or boolean value.
-    # @option options [Boolean] :test_mode Wether to use test mode or not.
+    # @option options [Boolean] :test_mode Whether to use test mode or not.
     # @option options [String] :test_mode_compatibility_level this is required argument while using
     # test mode with a real vin. For more information refer to docs.
+    # @option options [Faraday::Connection] :service Optional connection object to be used for requests
     #
-    # @return [OpenStruct] And object representing the JSON response mentioned in https://smartcar.com/docs/api#connect-compatibility
+    # @return [OpenStruct] And object representing the JSON response mentioned in https://smartcar.com/docs/api#compatibility-api
     #  and a meta attribute with the relevant items from response headers.
     def get_compatibility(vin:, scope:, country: 'US', options: {})
       raise InvalidParameterValue.new, 'vin is a required field' if vin.nil?
@@ -78,17 +81,16 @@ module Smartcar
       base_object = Base.new(
         {
           version: options[:version] || Smartcar.get_api_version,
-          auth_type: Base::BASIC
+          auth_type: Base::BASIC,
+          service: options[:service]
         }
       )
 
       base_object.token = generate_basic_auth(options, base_object)
 
       base_object.build_response(*base_object.fetch(
-        {
-          path: PATHS[:compatibility],
-          query_params: build_compatibility_params(vin, scope, country, options)
-        }
+        path: PATHS[:compatibility],
+        query_params: build_compatibility_params(vin, scope, country, options)
       ))
     end
 
@@ -96,17 +98,21 @@ module Smartcar
     #
     # API Documentation - https://smartcar.com/docs/api#get-user
     # @param token [String] Access token
+    # @param version [String] Optional API version to use, defaults to what is globally set
+    # @param options [Hash] Other optional parameters including overrides
+    # @option options [Faraday::Connection] :service Optional connection object to be used for requests
     #
     # @return [OpenStruct] And object representing the JSON response mentioned in https://smartcar.com/docs/api#get-user
     #  and a meta attribute with the relevant items from response headers.
-    def get_user(token:, version: Smartcar.get_api_version)
+    def get_user(token:, version: Smartcar.get_api_version, options: {})
       base_object = Base.new(
         {
           token: token,
-          version: version
+          version: version,
+          service: options[:service]
         }
       )
-      base_object.build_response(*base_object.fetch({ path: PATHS[:user] }))
+      base_object.build_response(*base_object.fetch(path: PATHS[:user]))
     end
 
     # Module method Returns a paged list of all vehicles connected to the application for the current authorized user.
@@ -114,21 +120,23 @@ module Smartcar
     # API Documentation - https://smartcar.com/docs/api#get-all-vehicles
     # @param token [String] - Access token
     # @param paging [Hash] - Optional filter parameters (check documentation)
+    # @param version [String] Optional API version to use, defaults to what is globally set
+    # @param options [Hash] Other optional parameters including overrides
+    # @option options [Faraday::Connection] :service Optional connection object to be used for requests
     #
     # @return [OpenStruct] And object representing the JSON response mentioned in https://smartcar.com/docs/api#get-all-vehicles
     #  and a meta attribute with the relevant items from response headers.
-    def get_vehicles(token:, paging: {}, version: Smartcar.get_api_version)
+    def get_vehicles(token:, paging: {}, version: Smartcar.get_api_version, options: {})
       base_object = Base.new(
         {
           token: token,
-          version: version
+          version: version,
+          service: options[:service]
         }
       )
       base_object.build_response(*base_object.fetch(
-        {
-          path: PATHS[:vehicles],
-          query_params: paging
-        }
+        path: PATHS[:vehicles],
+        query_params: paging
       ))
     end
 

data/ruby-sdk.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |spec|
   spec.license = 'MIT'
   spec.metadata = {
     'source_code_uri' => 'https://github.com/smartcar/ruby-sdk',
-    'documentation_uri' => 'https://www.rubydoc.info/gems/smartcar'
+    'documentation_uri' => 'https://www.rubydoc.info/gems/smartcar',
+    'rubygems_mfa_required' => 'true'
   }
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
@@ -33,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'redcarpet', '~> 3.5.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 1.12'
-  spec.add_development_dependency 'selenium-webdriver', '~> 3.142'
+  spec.add_development_dependency 'selenium-webdriver', '~> 4.1.0'
   spec.add_development_dependency 'webmock', '~> 3.13'
   spec.add_dependency 'oauth2', '~> 1.4'
   spec.add_dependency 'recursive-open-struct', '~> 1.1.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartcar
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.2.0
 platform: ruby
 authors:
 - Ashwin Subramanian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.142'
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.142'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,7 @@ licenses:
 metadata:
   source_code_uri: https://github.com/smartcar/ruby-sdk
   documentation_uri: https://www.rubydoc.info/gems/smartcar
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths: