parking_ticket 1.0.46 → 1.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de1dded37503f11b5a809b56ca98dec69781e02cf6cd73d1641e9965de3ae257
-  data.tar.gz: 1f6387e3eb9da51dedeb572dfa2671ecf7fc1406fc9d5df1b030c514ee9480a2
+  metadata.gz: 3b46304973466b46ffd135627aa9ed02e08d0165275e3d309d07fa7cdd4f043a
+  data.tar.gz: b1b7d77658c9ffb2ca0886b0ec4e056e843d5ff662223b64f7cd2a37d9b3b31d
 SHA512:
-  metadata.gz: e198ce49533ab058756a127c17cd3a55e51e9a752689b035453025f214fa774171994db7447979652c244da2722bf9200a5b7fd365936048cd0b446e154c6cf1
-  data.tar.gz: 4e4284028b493807cefcb0c6efbd6d12ec34eb901d5ad085660178899e6b13cae736351cb37bcf022659d9b19bdc0d4a5447f950fff35406e27004ab60d4389f
+  metadata.gz: 86469cd585d95b63a7366a61081159a6e800aa3c4bb046adad5ad51cf0d5d3a9e7c9964c2f58d4c3e8af296a57cf61c986b26d378df215255a25f29b96aa9506
+  data.tar.gz: 45f94644040eb191fb0d44ec90e565de09fa8f00daa4387eea31dbfbcc5d55100db0cd480bde2ae67cadce4b4d7f7dc9b8b3a0a2c34f57e6ce1ddf0ef052b995

data/.rubocop.yml

@@ -0,0 +1,4 @@
+require:
+  - rubocop-sorbet
+AllCops:
+    NewCops: enable

data/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "ruby.rubocop.onSave": false
+}

data/Gemfile

@@ -1,19 +1,4 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in parking_ticket.gemspec
 gemspec
-
-gem 'rake', '~> 13.0'
-
-gem 'rspec', '~> 3.0'
-
-# VCR, save test suite's http requests and replay them
-gem 'vcr', '~> 6.0'
-# Mock web requests in tests
-gem 'webmock', '~> 3.12'
-
-gem 'faraday', '~> 2.7', '>= 2.7.2'
-
-gem 'json_matchers'

data/Gemfile.lock

@@ -1,27 +1,42 @@
 PATH
   remote: .
   specs:
-    parking_ticket (1.0.46)
-      faraday
+    parking_ticket (1.0.48)
+      faraday (>= 2.7.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
+    amazing_print (1.4.0)
+    ast (2.4.2)
+    byebug (11.1.3)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
-    faraday (2.7.2)
+    faraday (2.7.4)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
     hashdiff (1.0.1)
+    json (2.6.3)
     json_matchers (0.11.1)
       json_schema
     json_schema (0.21.0)
+    netrc (0.11.0)
+    parallel (1.22.1)
+    parser (3.2.2.0)
+      ast (~> 2.4.1)
     public_suffix (5.0.1)
+    rainbow (3.1.1)
     rake (13.0.6)
+    rbi (0.0.16)
+      ast
+      parser (>= 2.6.4.0)
+      sorbet-runtime (>= 0.5.9204)
+      unparser
+    regexp_parser (2.7.0)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -36,23 +51,76 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
+    rubocop (1.48.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
+    rubocop-sorbet (0.7.0)
+      rubocop (>= 0.90.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    sorbet (0.5.10746)
+      sorbet-static (= 0.5.10746)
+    sorbet-runtime (0.5.10746)
+    sorbet-static (0.5.10746-universal-darwin-20)
+    sorbet-static-and-runtime (0.5.10746)
+      sorbet (= 0.5.10746)
+      sorbet-runtime (= 0.5.10746)
+    spoom (1.2.1)
+      sorbet (>= 0.5.10187)
+      sorbet-runtime (>= 0.5.9204)
+      thor (>= 0.19.2)
+    tapioca (0.11.4)
+      bundler (>= 2.2.25)
+      netrc (>= 0.11.0)
+      parallel (>= 1.21.0)
+      rbi (~> 0.0.0, >= 0.0.16)
+      sorbet-static-and-runtime (>= 0.5.10187)
+      spoom (~> 1.2.0, >= 1.2.0)
+      thor (>= 1.2.0)
+      yard-sorbet
+    thor (1.2.1)
+    unicode-display_width (2.4.2)
+    unparser (0.6.7)
+      diff-lcs (~> 1.3)
+      parser (>= 3.2.0)
     vcr (6.1.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
+    yard (0.9.28)
+      webrick (~> 1.7.0)
+    yard-sorbet (0.8.0)
+      sorbet-runtime (>= 0.5)
+      yard (>= 0.9)
 
 PLATFORMS
   arm64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
-  faraday (~> 2.7, >= 2.7.2)
+  amazing_print
+  byebug
   json_matchers
   parking_ticket!
   rake (~> 13.0)
   rspec (~> 3.0)
+  rubocop
+  rubocop-sorbet
+  sorbet
+  sorbet-runtime
+  tapioca
+  unparser
   vcr (~> 6.0)
   webmock (~> 3.12)
 

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/bin/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "parking_ticket"
+require 'bundler/setup'
+require 'parking_ticket'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -11,5 +11,5 @@ require "parking_ticket"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/bin/tapioca

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'tapioca' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path('bundle', __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('tapioca', 'tapioca')

data/lib/clients/models/payment_method.rb

@@ -0,0 +1,15 @@
+# typed: true
+# frozen_string_literal: true
+
+module ParkingTicket
+  module Clients
+    module Models
+      class PaymentMethod < T::Struct
+        include ParkingTicket::Clients::Models::StructuralyComparable
+        const :client_internal_id, String
+        const :anonymised_card_number, String
+        const :payment_card_type, String
+      end
+    end
+  end
+end

data/lib/clients/models/quote.rb

@@ -0,0 +1,16 @@
+# typed: true
+# frozen_string_literal: true
+
+module ParkingTicket
+  module Clients
+    module Models
+      class Quote < T::Struct
+        include ParkingTicket::Clients::Models::StructuralyComparable
+        const :client_internal_id, String
+        const :starts_on, DateTime
+        const :ends_on, DateTime
+        const :cost, Float
+      end
+    end
+  end
+end

data/lib/clients/models/rate_option.rb

@@ -0,0 +1,19 @@
+# typed: true
+# frozen_string_literal: true
+
+module ParkingTicket
+  module Clients
+    module Models
+      class RateOption < T::Struct
+        include ParkingTicket::Clients::Models::StructuralyComparable
+
+        const :client_internal_id, String
+        const :name, String
+        const :type, String
+        const :accepted_time_units, T::Array[String]
+
+        prop :free, T.nilable(T::Boolean)
+      end
+    end
+  end
+end

data/lib/clients/models/structuraly_comparable.rb

@@ -0,0 +1,14 @@
+# typed: false
+# frozen_string_literal: true
+
+module ParkingTicket
+  module Clients
+    module Models
+      module StructuralyComparable
+        def ==(other)
+          serialize == other.serialize
+        end
+      end
+    end
+  end
+end

data/lib/clients/models/ticket.rb

@@ -0,0 +1,19 @@
+# typed: true
+# frozen_string_literal: true
+
+module ParkingTicket
+  module Clients
+    module Models
+      class Ticket < T::Struct
+        include ParkingTicket::Clients::Models::StructuralyComparable
+
+        const :client_internal_id, String
+        const :starts_on, DateTime
+        const :ends_on, DateTime
+        const :license_plate, String
+        const :cost, Float
+        const :client, String
+      end
+    end
+  end
+end

data/lib/clients/models/vehicle.rb

@@ -0,0 +1,17 @@
+# typed: true
+# frozen_string_literal: true
+
+module ParkingTicket
+  module Clients
+    module Models
+      class Vehicle < T::Struct
+        include ParkingTicket::Clients::Models::StructuralyComparable
+
+        const :client_internal_id, String
+        const :license_plate, String
+        const :vehicle_type, String
+        const :vehicle_description, T.nilable(String)
+      end
+    end
+  end
+end

data/lib/clients/pay_by_phone/adapter.rb

@@ -1,108 +1,162 @@
+# typed: strict
+# frozen_string_literal: true
+
 module ParkingTicket
   module Clients
     module PayByPhone
-      class Adapter < Clients::Adapter
-        ACCEPTED_TIME_UNIT_MAPPER = {
+      class Adapter
+        extend T::Sig
+
+        class << self
+          extend T::Sig
+          sig { returns(T.class_of(ParkingTicket::Clients::PayByPhone::Client)) }
+          def client_class
+            ParkingTicket::Clients::PayByPhone::Client
+          end
+
+          sig { params(username: String, password: String).returns(T::Boolean) }
+          def valid_credentials?(username, password)
+            client_class.auth(username, password).status == 200
+          end
+        end
+
+        ACCEPTED_TIME_UNIT_MAPPER = T.let({
           'Days' => 'days',
           'Minutes' => 'minutes',
           'Hours' => 'hours'
-        }.freeze
+        }.freeze, T::Hash[String, String])
 
-        PAYMENT_CARD_TYPE_MAPPER = {
+        PAYMENT_CARD_TYPE_MAPPER = T.let({
           'MasterCard' => 'master_card',
           'Visa' => 'visa'
-        }.freeze
+        }.freeze, T::Hash[String, String])
 
-        VEHICLE_TYPE_MAPPER = {
+        VEHICLE_TYPE_MAPPER = T.let({
           'Car' => 'combustion_car',
           'ElectricMotorcycle' => 'electric_motorcycle'
-        }.freeze
+        }.freeze, T::Hash[String, String])
 
-        private
+        class Error < StandardError; end
+
+        sig { params(username: String, password: String).void }
+        def initialize(username, password)
+          @username = username
+          @password = password
+          @valid_credentials = T.let(self.class.valid_credentials?(username, password), T::Boolean)
+          @client = T.let(self.class.client_class.new(@username, @password), ParkingTicket::Clients::PayByPhone::Client)
+        end
 
-        def fetch_and_map_vehicles
-          client.vehicles.map do |vehicle|
-            {
+        sig { returns(T::Array[ParkingTicket::Clients::Models::Vehicle]) }
+        def vehicles
+          raise_invalid_credentials! unless @valid_credentials
+          @client.vehicles.map do |vehicle|
+            ParkingTicket::Clients::Models::Vehicle.new(
               client_internal_id: vehicle['vehicleId'],
               license_plate: vehicle['licensePlate'],
-              vehicle_type: VEHICLE_TYPE_MAPPER[vehicle['type']],
-              vehicle_description: vehicle.dig("profile", "description"),
-            }
+              vehicle_type: T.must(VEHICLE_TYPE_MAPPER[vehicle['type']]),
+              vehicle_description: vehicle.dig('profile', 'description')
+            )
           end
         end
 
-        def fetch_and_map_rate_options(zipcode, license_plate)
-          client.rate_options(zipcode, license_plate).map do |rate_option|
+        sig do
+          params(zipcode: String, license_plate: String).returns(T::Array[ParkingTicket::Clients::Models::RateOption])
+        end
+        def rate_options(zipcode, license_plate)
+          raise_invalid_credentials! unless @valid_credentials
+          @client.rate_options(zipcode, license_plate).map do |rate_option|
             mapped_time_units = rate_option['acceptedTimeUnits'].map do |accepted_time_unit|
               ACCEPTED_TIME_UNIT_MAPPER[accepted_time_unit]
             end
-            time_unit = mapped_time_units.include?('days') ? 'days' : 'hours'
-            {
+            ParkingTicket::Clients::Models::RateOption.new(
               client_internal_id: rate_option['rateOptionId'],
               name: rate_option['name'],
               type: rate_option['type'],
-              accepted_time_units: mapped_time_units,
-              free: fetch_and_map_quote(rate_option['rateOptionId'], zipcode, license_plate, 1, time_unit)[:cost].zero?
-            }
+              accepted_time_units: mapped_time_units
+            )
           end
         end
 
-        def fetch_and_map_running_ticket(license_plate, zipcode)
-          client.running_tickets.filter do |ticket|
+        sig do
+          params(license_plate: String, zipcode: String).returns(T.nilable(ParkingTicket::Clients::Models::Ticket))
+        end
+        def running_ticket(license_plate, zipcode)
+          raise_invalid_credentials! unless @valid_credentials
+          @client.running_tickets.filter do |ticket|
             ticket.dig('vehicle', 'licensePlate') == license_plate && ticket['locationId'] == zipcode
           end.map do |ticket|
-            {
+            ParkingTicket::Clients::Models::Ticket.new(
               client_internal_id: ticket['parkingSessionId'],
               starts_on: DateTime.parse(ticket['startTime']),
               ends_on: DateTime.parse(ticket['expireTime']),
               license_plate: ticket.dig('vehicle', 'licensePlate'),
               cost: ticket.dig('segments', 0, 'cost'),
               client: 'PayByPhone'
-            }
+            )
           end.first
         end
 
-        def request_new_ticket(license_plate:, zipcode:, rate_option_client_internal_id:, quantity:, time_unit:, payment_method_id:)
-          mapped_time_unit = ACCEPTED_TIME_UNIT_MAPPER.key(time_unit)
+        sig do
+          returns(T::Array[ParkingTicket::Clients::Models::PaymentMethod])
+        end
+        def payment_methods
+          raise_invalid_credentials! unless @valid_credentials
+          @client.payment_methods.fetch('items').map do |payment_method|
+            ParkingTicket::Clients::Models::PaymentMethod.new(
+              client_internal_id: payment_method['id'],
+              anonymised_card_number: payment_method['maskedCardNumber'][-4..],
+              payment_card_type: PAYMENT_CARD_TYPE_MAPPER.fetch(payment_method['paymentCardType'])
+            )
+          end
+        end
 
-          quote = fetch_and_map_quote(rate_option_client_internal_id, zipcode, license_plate, quantity,
-                                      time_unit)
+        sig do
+          params(rate_option_id: String, zipcode: String, license_plate: String, quantity: Integer,
+                 time_unit: String).returns(ParkingTicket::Clients::Models::Quote)
+        end
+        def quote(rate_option_id, zipcode, license_plate, quantity, time_unit)
+          raise_invalid_credentials! unless @valid_credentials
+          mapped_time_unit = T.must(ACCEPTED_TIME_UNIT_MAPPER.key(time_unit))
+          fetched_quote = @client.quote(rate_option_id, zipcode, license_plate, quantity, mapped_time_unit)
 
-          client.new_ticket(
+          ParkingTicket::Clients::Models::Quote.new(
+            client_internal_id: fetched_quote['quoteId'],
+            starts_on: DateTime.parse(fetched_quote['parkingStartTime']),
+            ends_on: DateTime.parse(fetched_quote['parkingExpiryTime']),
+            cost: fetched_quote.dig('totalCost', 'amount').to_f
+          )
+        end
+
+        sig do
+          params(license_plate: String, zipcode: String, rate_option_client_internal_id: String, quantity: Integer,
+                 time_unit: String, payment_method_id: T.nilable(String)).void
+        end
+        def new_ticket(license_plate:, zipcode:, rate_option_client_internal_id:, quantity:, time_unit:,
+                       payment_method_id:)
+          raise_invalid_credentials! unless @valid_credentials
+
+          mapped_time_unit = ACCEPTED_TIME_UNIT_MAPPER.invert.fetch(time_unit)
+
+          quote = quote(rate_option_client_internal_id, zipcode, license_plate, quantity,
+                        time_unit)
+
+          @client.new_ticket(
             license_plate: license_plate,
             zipcode: zipcode,
             rate_option_client_internal_id: rate_option_client_internal_id,
             quantity: quantity,
             time_unit: mapped_time_unit,
-            quote_client_internal_id: quote[:client_internal_id],
-            starts_on: quote[:starts_on],
+            quote_client_internal_id: quote.client_internal_id,
+            starts_on: quote.starts_on.to_s,
             payment_method_id: payment_method_id
           )
         end
 
-        def fetch_and_map_payment_methods
-          client.payment_methods['items'].map do |payment_method|
-            {
-              client_internal_id: payment_method['id'],
-              anonymised_card_number: payment_method['maskedCardNumber'][-4..],
-              payment_card_type: PAYMENT_CARD_TYPE_MAPPER[payment_method['paymentCardType']]
-            }
-          end
-        end
-
-        def fetch_and_map_quote(rate_option_id, zipcode, license_plate, quantity, time_unit)
-          mapped_time_unit = ACCEPTED_TIME_UNIT_MAPPER.key(time_unit)
-          fetched_quote = client.quote(rate_option_id, zipcode, license_plate, quantity, mapped_time_unit)
-
-          {
-            client_internal_id: fetched_quote['quoteId'],
-            starts_on: fetched_quote['parkingStartTime'],
-            ends_on: fetched_quote['parkingExpiryTime'],
-            cost: fetched_quote.dig('totalCost', 'amount')
-          }
+        sig { void }
+        def raise_invalid_credentials!
+          raise Error, 'Adapter credentials are not valid'
         end
       end
     end
   end
 end
-