tesla_api 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0a2c77105e4ceabe402f838427c9efbfb917d7f74b49d3f5f6637e3581e0678
-  data.tar.gz: f07b11556f4d3a4a874d68ed9ced60ba40e71f759f251b0449a07fcf1513b8a0
+  metadata.gz: 310c9a551e9ace78ebf8eeee97d301ef30421545f0c0a876532653bad401d00f
+  data.tar.gz: 01344c140bec766dd95697124888b9b860d8a1a3028811d64ec41e15ff5f4adf
 SHA512:
-  metadata.gz: ba1727791cdb0493e9a703e55d3b400d4c59dc300d5e1d463482c3622466f0f6172904c6185273405188735337b42c7ffaf055c1fe1e1b7fbd984a7894f85b34
-  data.tar.gz: 5d73d9cf6960742d4d63b013b2ece343879a4809cb4f9dccf4ac1e1dd3f9e36f6b2e3b731bf9675d70a512f6afc6ddea9a03052ab81f65283be26e8cc6124d39
+  metadata.gz: 7b5c85dfc21d90bb311b8818d636d2e320aff0ca5fd5da3d6a99046c717dd91cd7b0d1ba0404d130aec49f55904442776cf1df3b78e3dfd5661aa6f92c92bfbd
+  data.tar.gz: 8f5bf9d04e7ee75980510f5705ecc8d1530086798a858c9a65744ac2eeb346173bbaa290898dd649c1e666e4f2b6df2f92a533f059e7f60adcbaf82afd9cb0e6

data/README.md

@@ -36,8 +36,11 @@ Here's a quick example:
 ```ruby
 require 'tesla_api'
 
-tesla_api = TeslaApi::Client.new(email, client_id, client_secret)
-tesla_api.login!(password) # Or tesla_api.token = token if you have an existing token.
+tesla_api = TeslaApi::Client.new(email: email, client_id: client_id, client_secret: client_secret)
+tesla_api.login!(password)
+# Or if you have an access token:
+tesla_api = TeslaApi::Client.new(access_token: access_token) 
+
 model_s = tesla_api.vehicles.first # => <TeslaApi::Vehicle>
 
 model_s.wake_up

data/Rakefile

@@ -19,7 +19,7 @@ task :console do
   # Set up a global client
   def client
     @client ||= begin
-        client = TeslaApi::Client.new(ENV['TESLA_EMAIL'])
+        client = TeslaApi::Client.new(email: ENV['TESLA_EMAIL'])
         client.login!(ENV['TESLA_PASS'])
         client
     end

data/docs/vehicle/optioncodes.md

@@ -30,7 +30,7 @@ appreciated!_
 | AD09 | Adapter, Swiss (1 phase, 10A) | | 
 | AD10 | Adapter, Denmark (1 phase, 13A) | | 
 | AD11 | Adapter, Italy (1 phase, 13A) | | 
-| AD15 | ? | | 
+| AD15 | Adapter | J1772 | 
 | ADPX2 | Type 2 Public Charging Connector | | 
 | ADX4 | No European 3-Phase | |
 | ADX5 | European 3-Phase, IT | |
@@ -38,7 +38,7 @@ appreciated!_
 | ADX7 | No - 3-ph Red IEC309 (3 phase, 16A) | |
 | ADX9 | No - Adapter, Swiss (1 phase, 10A) | |
 | ADX8 | Blue IEC309 (1 phase, 230V 32A) | | 
-| AF00 | No HEPA Filter | | 
+| AF00 | No HEPA Filter | Standard air filter, no air ionizer | 
 | AF02 | HEPA Filter | | 
 | AH00 | No Accessory Hitch | | 
 | APE1 | Enhanced Autopilot | | 
@@ -55,17 +55,19 @@ appreciated!_
 | APPB | Enhanced Autopilot | | 
 | AU00 | No Audio Package | | 
 | AU01 | Ultra High Fidelity Sound | | 
+| AU3P | Sound Studio Package | Premium audio package |
 | BC0B | Black Brake Calipers | | 
 | BC0R | Red Brake Calipers | |
 | BC3B | Black Brake Calipers, Model 3 | |
 | BCMB | Black Brake Calipers | | 
 | BCYR | Performance Brakes | |
+| BG30 | No Badge | Model 3 |
 | BP00 | No Ludicrous | | 
 | BP01 | Ludicrous Speed Upgrade | | 
 | BR00 | No Battery Firmware Limit | | 
 | BR03 | Battery Firmware Limit (60kWh) | | 
 | BR05 | Battery Firmware Limit (75kWh) | | 
-| BS00 | General Production Flag | | 
+| BS00 | Blind Spot Sensor Package | | 
 | BS01 | Special Production Flag | | 
 | BT37 | 75 kWh (Model 3) | | 
 | BT40 | 40 kWh | | 
@@ -85,7 +87,7 @@ appreciated!_
 | CF00 | High Power Charger | |
 | CF01 | 48amp charger | |
 | CH00 | Standard Charger (40 Amp) | | 
-| CH01 | Dual Chargers (80 Amp) | | 
+| CH01 | Dual Chargers (80 Amp) | Twin 10kW charge config | 
 | CH04 | 72 Amp Charger (Model S/X) | | 
 | CH05 | 48 Amp Charger (Model S/X) | | 
 | CH07 | 48 Amp Charger (Model 3) | | 
@@ -96,32 +98,38 @@ appreciated!_
 | COUS | Country: United States | | 
 | CONL | Country: Netherlands | |
 | CPW1 | 20" Performance Wheels | |
-| CW00 | No Cold Weather Package | | 
-| CW02 | Subzero Weather Package | | 
+| CW00 | Weather Package | No Cold Weather Package | 
+| CW02 | Weather Package | Subzero Weather Package | 
 | DA00 | No Autopilot | | 
-| DA01 | Active Safety (ACC,LDW,SA) | | 
+| DA01 | Active Safety (ACC,LDW,SA) | Drivers Assistance Package | 
 | DA02 | Autopilot Convenience Features | | 
 | DCF0 | Autopilot Convenience Features (DCF0) | | 
 | DRLH | Left Hand Drive | | 
 | BC3R | Performance Brakes | Model 3 |
 | DRRH | Right Hand Drive | | 
-| DSH5 | PUR Dash Pad | | 
+| DSH5 | Dashboard | PUR Dashboard Pad | 
 | DSH7 | Alcantara Dashboard Accents | | 
 | DSHG | PUR Dash Pad | | 
 | DU00 | Drive Unit - IR | | 
 | DU01 | Drive Unit - Infineon | | 
 | DV2W | Rear-Wheel Drive | | 
 | DV4W | All-Wheel Drive | | 
+| FC3P | Front Console Front Console (Premium) | Model 3 |
 | FG00 | No Exterior Lighting Package | | 
-| FG01 | Exterior Lighting Package | | 
-| FG02 | Exterior Lighting Package | | 
+| FG01 | Fog Lamps | Exterior Lighting Package | 
+| FG02 | Fog Lamps | Fog Lamps |
+| FG31 | Fog Lamps | Premium Fog Lights (Model 3) |
+| FM3B | Performance Package (Model 3) | |
 | FMP6 | FMP6 | | 
 | FR01 | Base Front Row | | 
 | FR02 | Ventilated Front Seats | |
 | FR03 | FR03 | | 
 | FR04 | FR04 | | 
+| GLFR | Assembly | Final Assembly Fremont |
 | HC00 | No Home Charging installation | | 
 | HC01 | Home Charging Installation | | 
+| HM31 | Teck Package - Homelink | Homelink |
+| HL31 | Head Lamp (Model 3) | Uplevel Headlamps | 
 | HP00 | No HPWC Ordered | | 
 | HP01 | HPWC Ordered | | 
 | ID3W | (Model 3) Wood Decor | | 
@@ -132,7 +140,7 @@ appreciated!_
 | IDOM | Matte Obeche Wood Decor | | 
 | IDOG | Gloss Obeche Wood Decor | | 
 | IDLW | Lacewood Decor | | 
-| IDPB | Piano Black Decor | | 
+| IDPB | Piano Black Decor | |
 | IN3BB | All Black Partial Premium Interior | | 
 | IN3PB | All Black Premium Interior | | 
 | INBBW | White | | 
@@ -145,6 +153,7 @@ appreciated!_
 | INWPT | Tan Interior | | 
 | INYPB | All Black Premium Interior | |
 | INYPW | Black and White Premium Interior | |
+| IL31 | Interior Ambient Lighting | |
 | IVBPP | All Black Interior | | 
 | IVBSW | Ultra White Interior | | 
 | IVBTB | All Black Interior | | 
@@ -153,10 +162,11 @@ appreciated!_
 | IX01 | Extended Nappa Leather Trim | | 
 | LLP1 | LLP1 | | 
 | LLP2 | LLP2 | | 
-| LP01 | Premium Interior Lighting | | 
+| LP00 | Lighting Package | No Lighting Package |
+| LP01 | Lighting Package | Premium Interior Lighting | 
 | LT00 | Vegan interior | | 
 | LT01 | Standard interior | | 
-| LT1B | LT1B | | 
+| LT1B | Lower Trim | Lower Trim | 
 | LT3W | LT3W | | 
 | LT4B | LT4B | | 
 | LT4C | LT4C | | 
@@ -166,11 +176,13 @@ appreciated!_
 | LT6P | LT6P | |
 | LTPB | Lower Trim PUR Black | |
 | ME01 | Memory Seats | |
-| ME02 | Memory Seats | | 
+| ME02 | Seat Memory | Seat Memory LHD Driver | 
 | MI00 | 2015 Production Refresh | | 
+| MI00 | Project/Program Code M3 | Base Manufacturing Intro Code |
 | MI01 | 2016 Production Refresh | | 
 | MI02 | 2017 Production Refresh | | 
 | MI03 | 201? Production Refresh | Found on Model X ordered 11/2018 delivered 3/2019 | 
+| MR31 | Tech Package - Mirror -YES	| Uplevel Mirrors |
 | MT300 | Standard Range Rear-Wheel Drive | |
 | MT301 | Standard Range Plus Rear-Wheel Drive | |
 | MT302 | Long Range Rear-Wheel Drive | |
@@ -192,7 +204,7 @@ appreciated!_
 | PF01 | Performance Legacy Package | | 
 | PI00 | No Premium Interior | | 
 | PI01 | Premium Upgrades Package | | 
-| PK00 | LEGACY No Parking Sensors | | 
+| PK00 | Parking Sensors | | 
 | PMAB | Anza Brown Metallic Color | | 
 | PMBL | Obsidian Black Multi-Coat Color | | 
 | PMMB | Monterey Blue Metallic Color | | 
@@ -206,6 +218,7 @@ appreciated!_
 | PPSR | Signature Red Color | | 
 | PPSW | Pearl White Multi-Coat Color | | 
 | PPTI | Titanium Metallic Color | | 
+| PL30 | No Aluminum Pedal | |
 | PL31 | Performance Pedals | Model 3 |
 | PRM30 | Partial Premium Interior | |
 | PRM31 | Premium Interior | | 
@@ -213,6 +226,7 @@ appreciated!_
 | PRMY1 | Premium Interior | |
 | PS00 | No Parcel Shelf | | 
 | PS01 | Parcel Shelf | | 
+| RS3H | Second Row Seat Rear Seats (Heated) | Model 3 |
 | PX00 | No Performance Plus Package | | 
 | PX01 | Performance Plus | | 
 | PX6D | Zero to 60 in 2.5 sec | | 
@@ -242,32 +256,40 @@ appreciated!_
 | RCX0 | No Rear Console | | 
 | RF3G | Model 3 Glass Roof | | 
 | RFBK | Black Roof | | 
-| RFBC | Body Color Roof | | 
+| RFBC | Body Color Roof | Roof | 
 | RFFG | Glass Roof | | 
 | RFP0 | All Glass Panoramic Roof | | 
 | RFP2 | Sunroof | | 
 | RFPX | Model X Roof | | 
+| S02B | Seat | BLK Leather |
 | S02P | S02P | | 
 | S31B | S31B | | 
 | S32C | S32C | | 
 | S32P | S32P | | 
 | S32W | S32W | | 
+| S3PB | Seat Black PUR Premium Seats | | 
 | SC00 | No Supercharging | | 
 | SC01 | Supercharging Enabled | | 
 | SC04 | Pay Per Use Supercharging | | 
 | SC05 | Free Supercharging | | 
+| SLR0 | No Rear Spoiler | |
 | SP00 | No Security Package | |
-| SR01 | Standard 2nd row | | 
+| SR01 | Standard 2nd row | Second Row Seat | 
 | SR06 | Seven Seat Interior | | 
 | SR07 | Standard 2nd row | | 
 | ST00 | Non-leather Steering Wheel | | 
 | ST01 | Non-heated Leather Steering Wheel | | 
+| ST31 | Steering Wheel | Premium Steering Wheel |
+| STCP | Steering Wheel | Steering Column (Power) |
 | STY5S | Five Seat Interior | |
 | STY7S | Seven Seat Interior | |
 | SU00 | Standard Suspension | | 
 | SU01 | Smart Air Suspension | | 
-| TIC4 | All-Season Tires | | 
-| TM00 | General Production Trim | | 
+| SU3C | Suspension | Coil spring suspension |
+| T3MA | Tires M3 | 18 Michelin All Season, Square |
+| TIC4 | Tires | All-Season Tires | 
+| TIMP | Tires | Michelin Primacy 19" Tire |
+| TM00 | Model Trim | General Production Series Vehicle | 
 | TM02 | General Production Signature Trim | | 
 | TM0A | ALPHA PRE-PRODUCTION NON-SALEABLE | | 
 | TM0B | BETA PRE-PRODUCTION NON-SALEABLE | | 
@@ -275,22 +297,28 @@ appreciated!_
 | TP01 | Tech Package - No Autopilot | | 
 | TP02 | Tech Package with Autopilot | | 
 | TP03 | Tech Package with Enhanced Autopilot | | 
-| TR00 | No Third Row Seat | | 
+| TR00 | No Rear Facing Seats | 
 | TR01 | Third Row Seating | | 
 | TRA1 | Third Row HVAC | | 
-| TW01 | Towing Package | | 
+| TW00 | No Tow Package | |
+| TW01 | Tow Package | | 
 | UM01 | Universal Mobile Charger - US Port (Single) | | 
+| UT3P | Suede Grey Premium Headliner | |
 | UTAB | Black Alcantara Headliner | | 
 | UTAW | Light Headliner | | 
+| UTMF | Headliner | |
 | UTPB | Dark Headliner | | 
 | UTSB | Dark Headliner | | 
 | UTZW | Light Headliner | |
+| USSB | Safety | Safety US Black |
 | SLR1 | Carbon Fibre Spoiler | Model 3 |
 | SPT31 | Performance Upgrade | Model 3 |
 | SPTY1 | Performance Upgrade | Model Y |
 | W32P | 20" Performance Wheels | Model 3 |
 | W38B | 18" Aero Wheels | For the Model 3 and Model Y |
 | W39B | 19" Sport Wheels | | 
+| WR00 | No Wrap | |
+| WT19 | 19" Wheels | |
 | WT20 | 20" Silver Slipstream Wheels | | 
 | WT22 | 22" Silver Turbine Wheels | |
 | WTAB | 21" Black Arachnid Wheels | |
@@ -338,14 +366,14 @@ appreciated!_
 | X014 | Override: No Satellite Radio | | 
 | X019 | Carbon Fiber Spoiler | | 
 | X020 | No Performance Exterior | | 
-| X021 | No Spoiler | | 
+| X021 | No Rear Carbon Fiber Spoiler | |
 | X024 | Performance Package | | 
-| X025 | No Performance Package | | 
-| X027 | Lighted Door Handles | | 
-| X028 | Battery Badge | | 
+| X025 | Performance Powertrain | | 
+| X027 | Lighted Door Handles | Light handle | 
+| X028 | Battery Badge | Normal Badging | 
 | X029 | Remove Battery Badge | | 
 | X030 | Override: No Passive Entry Pkg | | 
-| X031 | Keyless Entry | | 
+| X031 | Keyless Entry | Passive Entry Pkg | 
 | X037 | Powerfolding Mirrors | | 
 | X039 | DAB Radio | | 
 | X040 | No DAB Radio | | 

data/lib/tesla_api.rb

@@ -1,5 +1,10 @@
-require 'httparty'
-require 'em-http-request'
+require 'date'
+require 'base64'
+
+require 'faraday'
+require 'faraday_middleware'
+require 'eventmachine'
+require 'faye/websocket'
 
 require 'tesla_api/version'
 require 'tesla_api/client'

data/lib/tesla_api/autopark.rb

@@ -1,10 +1,8 @@
-require 'faye/websocket'
-
 module TeslaApi
   module Autopark
     def start_autopark(&handler)
       EventMachine.run do
-        socket.on(:message) do |event|
+        autopark_socket.on(:message) do |event|
           message = if event.data.is_a?(Array)
             JSON.parse(event.data.map(&:chr).join)
           else
@@ -15,8 +13,8 @@ module TeslaApi
           handler.call(message.delete('msg_type'), message)
         end
 
-        socket.on(:close) do |_|
-          @socket = nil
+        autopark_socket.on(:close) do |_|
+          @autopark_socket = nil
           @heartbeat && @heartbeat.cancel
           EventMachine.stop
         end
@@ -34,14 +32,14 @@ module TeslaApi
                 msg_type: 'autopark:heartbeat_app',
                 timestamp: Time.now.to_i
             }
-            socket.send(beat.to_json)
+            autopark_socket.send(beat.to_json)
           end
       end
     end
 
-    def socket
-      @socket ||= Faye::WebSocket::Client.new(
-          socket_endpoint,
+    def autopark_socket
+      @autopark_socket ||= Faye::WebSocket::Client.new(
+          autopark_socket_endpoint,
           nil,
           {
               headers: {
@@ -55,7 +53,7 @@ module TeslaApi
       Base64.strict_encode64("#{email}:#{self['tokens'].first}")
     end
 
-    def socket_endpoint
+    def autopark_socket_endpoint
       "wss://streaming.vn.teslamotors.com/connect/#{self['vehicle_id']}"
     end
   end

data/lib/tesla_api/client.rb

@@ -1,12 +1,8 @@
 module TeslaApi
   class Client
-    include HTTParty
-    base_uri 'https://owner-api.teslamotors.com/api/1'
-    headers 'User-Agent' => "github.com/timdorr/tesla-api v:#{VERSION}"
-    format :json
-    raise_on [401]
+    attr_reader :api, :email, :access_token, :access_token_expires_at, :refresh_token, :client_id, :client_secret
 
-    attr_reader :email, :access_token, :access_token_expires_at, :refresh_token, :client_id, :client_secret
+    BASE_URI = 'https://owner-api.teslamotors.com/api/1'
 
     def initialize(
         email: nil,
@@ -21,59 +17,54 @@ module TeslaApi
       @client_id = client_id
       @client_secret = client_secret
 
-      self.update_token(
-          access_token: access_token,
-          access_token_expires_at: access_token_expires_at,
-          refresh_token: refresh_token
-      )
-    end
-
-    def update_token(access_token:, access_token_expires_at:, refresh_token:)
       @access_token = access_token
       @access_token_expires_at = access_token_expires_at
       @refresh_token = refresh_token
-      self.class.headers 'Authorization' => "Bearer #{access_token}" if access_token
 
-      access_token
+      @api = Faraday.new(
+        BASE_URI,
+        headers: { 'User-Agent' => "github.com/timdorr/tesla-api v:#{VERSION}" }
+      ) do |conn|
+        conn.request :json
+        conn.response :json
+        conn.response :raise_error
+        conn.adapter Faraday.default_adapter
+      end
     end
 
     def refresh_access_token
-      response = self.class.post(
-          'https://owner-api.teslamotors.com/oauth/token',
-          body: {
-              grant_type: 'refresh_token',
-              client_id: client_id,
-              client_secret: client_secret,
-              refresh_token: refresh_token
-          }
-      )
-
-      self.update_token(
-          access_token: response['access_token'],
-          access_token_expires_at: Time.at(response['created_at'] + response['expires_in']).to_datetime,
-          refresh_token: response['refresh_token']
-      )
+      response = api.post(
+        'https://owner-api.teslamotors.com/oauth/token',
+        {
+          grant_type: 'refresh_token',
+          client_id: client_id,
+          client_secret: client_secret,
+          refresh_token: refresh_token
+        }
+      ).body
+
+      @access_token = response['access_token']
+      @access_token_expires_at = Time.at(response['created_at'].to_f + response['expires_in'].to_f).to_datetime
+      @refresh_token = response['refresh_token']
 
       response
     end
 
     def login!(password)
-      response = self.class.post(
-          'https://owner-api.teslamotors.com/oauth/token',
-          body: {
-              grant_type: 'password',
-              client_id: client_id,
-              client_secret: client_secret,
-              email: email,
-              password: password
-          }
-      )
-
-      self.update_token(
-          access_token: response['access_token'],
-          access_token_expires_at: Time.at(response['created_at'] + response['expires_in']).to_datetime,
-          refresh_token: response['refresh_token']
-      )
+      response = api.post(
+        'https://owner-api.teslamotors.com/oauth/token',
+        {
+          grant_type: 'password',
+          client_id: client_id,
+          client_secret: client_secret,
+          email: email,
+          password: password
+        }
+      ).body
+
+      @access_token = response['access_token']
+      @access_token_expires_at = Time.at(response['created_at'].to_f + response['expires_in'].to_f).to_datetime
+      @refresh_token = response['refresh_token']
 
       response
     end
@@ -83,12 +74,20 @@ module TeslaApi
       access_token_expires_at <= DateTime.now
     end
 
-    def vehicles
-      self.class.get('/vehicles')['response'].map { |v| Vehicle.new(self.class, email, v['id'], v) }
+    def get(url)
+      api.get(url.sub(/^\//, ''), nil, { 'Authorization' => "Bearer #{access_token}" }).body
     end
 
-    private
+    def post(url, body: nil)
+      api.post(url.sub(/^\//, ''), body, { 'Authorization' => "Bearer #{access_token}" }).body
+    end
 
-    attr_writer :refresh_token
+    def vehicles
+      get('/vehicles')['response'].map { |v| Vehicle.new(self, email, v['id'], v) }
+    end
+
+    def vehicle(id)
+      Vehicle.new(self, email, id, self.class.get("/vehicles/#{id}")['response'])
+    end
   end
 end

data/lib/tesla_api/stream.rb

@@ -2,10 +2,19 @@ module TeslaApi
   module Stream
     def stream(&receiver)
       EventMachine.run do
-        http.stream do |chunk|
-          attributes = chunk.split(",")
+        socket = create_streaming_socket
 
-          receiver.call({
+        socket.on(:open) do |event|
+          socket.send(JSON.generate(stream_connect_message))
+        end
+
+        socket.on(:message) do |event|
+          data = JSON.parse(event.data.pack('c*'))
+
+          if data['msg_type'] == 'data:update'
+            attributes = data['value'].split(',')
+
+            receiver.call({
               time: DateTime.strptime((attributes[0].to_i/1000).to_s, '%s'),
               speed: attributes[1].to_f,
               odometer: attributes[2].to_f,
@@ -19,35 +28,33 @@ module TeslaApi
               range: attributes[10].to_f,
               est_range: attributes[11].to_f,
               heading: attributes[12].to_f
-          })
+            })
+          end
         end
 
-        http.callback { EventMachine.stop }
-        http.errback { EventMachine.stop }
+        socket.on(:close) do |event|
+          EventMachine.stop
+        end
       end
     end
 
     private
 
-    def request
-      @request ||= EventMachine::HttpRequest.new(
-          "#{stream_endpoint}/stream/#{self['vehicle_id']}/?values=#{stream_params}")
-    end
-
-    def http
-      request.get(
-          head: {
-              'authorization' => [email, self['tokens'].first]
-          },
-          inactivity_timeout: 15)
+    def create_streaming_socket
+      Faye::WebSocket::Client.new(streaming_endpoint)
     end
 
-    def stream_endpoint
-      'https://streaming.vn.teslamotors.com'
+    def streaming_endpoint
+      'wss://streaming.vn.teslamotors.com/streaming/'
     end
 
-    def stream_params
-      'speed,odometer,soc,elevation,est_heading,est_lat,est_lng,power,shift_state,range,est_range,heading'
+    def stream_connect_message
+      {
+        msg_type: 'data:subscribe',
+        token: Base64.strict_encode64("#{email}:#{self['tokens'].first}"),
+        value: 'speed,odometer,soc,elevation,est_heading,est_lat,est_lng,power,shift_state,range,est_range,heading',
+        tag: self['vehicle_id'].to_s,
+      }
     end
   end
 end

data/lib/tesla_api/vehicle.rb

@@ -2,10 +2,10 @@ module TeslaApi
   class Vehicle
     include Stream
     include Autopark
-    attr_reader :api, :email, :id, :vehicle
+    attr_reader :client, :api, :email, :id, :vehicle
 
-    def initialize(api, email, id, vehicle)
-      @api = api
+    def initialize(client, email, id, vehicle)
+      @client = client
       @email = email
       @id = id
       @vehicle = vehicle
@@ -28,15 +28,15 @@ module TeslaApi
     # State
 
     def data
-      api.get("/vehicles/#{id}/data")['response']
+      client.get("/vehicles/#{id}/data")['response']
     end
 
     def mobile_enabled
-      api.get("/vehicles/#{id}/mobile_enabled")['response']
+      client.get("/vehicles/#{id}/mobile_enabled")['response']
     end
 
     def nearby_charging_sites
-      api.get("/vehicles/#{id}/nearby_charging_sites")['response']
+      client.get("/vehicles/#{id}/nearby_charging_sites")['response']
     end
 
     def gui_settings
@@ -62,7 +62,7 @@ module TeslaApi
     # Commands
 
     def wake_up
-      @vehicle = api.post("/vehicles/#{id}/wake_up")['response']
+      @vehicle = client.post("/vehicles/#{id}/wake_up")['response']
     end
 
     def set_valet_mode(on, password=nil)
@@ -197,11 +197,11 @@ module TeslaApi
     private
 
     def data_request(name)
-      api.get("/vehicles/#{id}/data_request/#{name}")
+      client.get("/vehicles/#{id}/data_request/#{name}")
     end
 
     def command(name, body: nil)
-      api.post("/vehicles/#{id}/command/#{name}", body: body)
+      client.post("/vehicles/#{id}/command/#{name}", body: body)
     end
   end
 end

data/lib/tesla_api/version.rb

@@ -1,3 +1,3 @@
 module TeslaApi
-  VERSION = '2.0.0'
+  VERSION = '3.0.0'
 end

data/spec/lib/tesla_api/client_spec.rb

@@ -19,12 +19,7 @@ RSpec.describe TeslaApi::Client do
 
       it 'logs into the API' do
         tesla_api.login!(ENV['TESLA_PASS'])
-        expect(a_request(:post, "https://#{URI.parse(tesla_api.class.base_uri).host}/oauth/token")).to have_been_made.once
-      end
-
-      it 'sets a Bearer token header' do
-        tesla_api.login!(ENV['TESLA_PASS'])
-        expect(tesla_api.class.headers).to include({'Authorization' => /Bearer [a-z0-9]{32}/})
+        expect(a_request(:post, "https://#{URI.parse(TeslaApi::Client::BASE_URI).host}/oauth/token")).to have_been_made.once
       end
 
       it 'obtains a Bearer token' do
@@ -63,10 +58,6 @@ RSpec.describe TeslaApi::Client do
       it 'is not expired' do
         expect(tesla_api.expired?).to eq(false)
       end
-
-      it 'sets a Bearer token header' do
-        expect(tesla_api.class.headers).to include({'Authorization' => "Bearer #{access_token}"})
-      end
     end
 
     describe '#refresh_access_token', vcr: {cassette_name: 'client-refresh'} do

data/tesla_api.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty'
+  spec.add_dependency 'faraday'
+  spec.add_dependency 'faraday_middleware'
   spec.add_dependency 'faye-websocket'
-  spec.add_dependency 'em-http-request'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 12.0'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: tesla_api
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Tim Dorr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faye-websocket
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="