synsbasen_api 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 488fa94b15f086f18590d5e13bda9455648fbdc8794b639760bf5b39708b74f5
-  data.tar.gz: b6f821fc79f849a6a97927e65f39a68896b08307579b0bf62b09c3f606b22b29
+  metadata.gz: 6ba050bd5ad13d81687977a3963bb9ff3029508c76ff2390b96bb47808229b45
+  data.tar.gz: 1b00104a8517540a698866f3297cc0e451e5febc8e6afb0eea945a2d3585632c
 SHA512:
-  metadata.gz: b4ab45d11acbfecd31e8f925952697f84f5a41bee63f941a5eb7d14600ce6e6c88b38f7b0c5d0d663bcba393f4ac89b1463f1f2ed1396663e767dfddb5712389
-  data.tar.gz: eea99086d568db341f04f43e1e54048126a658c4dbd753e83b127b232f83121c8721a690bd503a86e0b206bc4d5ea7a9fd44c20f08341978d4b7704983579d3e
+  metadata.gz: 680d20a16b8e05837775a3ca5feb39703e09ed19a39f23f2b8c4031f89ccce241c871349c97fe5045e49e5c20a99d18df348dfb154ce1d6e147ce1b695720969
+  data.tar.gz: 410e80b9db9a317ca11a285452f5b1875b54556e17880354952bb4b01351952299a5bfd0d51de396af3456cd8343a73815e96e6fa7e16b6074565af1bb7e9dd8

data/lib/synsbasen_api/api_response.rb

@@ -15,17 +15,22 @@ module SynsbasenApi
     # @return [Numeric] The total number of pages available.
     attr_reader :total_pages
 
+    # @return [Numeric] The total count of items available.
+    attr_reader :total_count
+
     # Initializes a new instance of `ApiResponse` with the provided response data.
     #
     # @param response [Hash] The response data from the API.
     # @option response [Hash] :data The data included in the API response.
     # @option response [Numeric] :cost The cost associated with the API response.
     # @option response [Boolean] :has_more Indicates whether there is more data available in the response.
+    # @option response [Boolean] :total_pages The total number of pages available.
+    # @option response [Boolean] :total_count The total count of items available.
     def initialize(response)
       @data = response[:data]
       @cost = response[:cost]
 
-      %i[has_more total_pages].each do |key|
+      %i[has_more total_pages total_count].each do |key|
         instance_variable_set("@#{key}", response[key]) if response.key?(key)
       end
     end

data/lib/synsbasen_api/client.rb

@@ -2,10 +2,9 @@
 
 require "synsbasen_api/api_response"
 require "synsbasen_api/error"
-require "faraday"
-require "active_support/core_ext/hash/keys"
-require "active_support/core_ext/object/blank"
-require "active_support/core_ext/enumerable"
+require "net/http"
+require "uri"
+require "json"
 
 module SynsbasenApi
   # The `Client` class serves as the base class for interacting with the Synsbasen API.
@@ -13,86 +12,139 @@ module SynsbasenApi
     DEFAULT_BASE_URL = "https://api.synsbasen.dk".freeze
 
     class << self
-      # Establishes and returns a connection to the Synsbasen API.
-      #
-      # @return [Faraday::Connection] A Faraday connection instance.
-      def connection
-        @_connection ||= Faraday.new(url: SynsbasenApi.config[:base_url] || DEFAULT_BASE_URL) do |conn|
-          conn.use Faraday::Response::RaiseError
-          conn.headers = {
-            'Content-Type' => 'application/json',
-            'Authorization' => 'Bearer ' + SynsbasenApi.config[:api_key],
-          }
-        end
-      end
-
-      # Sends a GET request to the Synsbasen API.
+      # Sends a GET request to Synsbasen API.
       #
       # @param path [String] The API endpoint path.
       # @param params [Hash] Query parameters for the request.
-      # @param body [Hash] Request body.
+      # @param expand [Array] List of fields to expand in the response.
       # @return [ApiResponse] An instance of `ApiResponse` containing the API response.
       # @raise [ClientError, ServerError] Raised for client or server errors.
       def get(path, params: {}, expand: [])
-        response = connection.get(path) do |req|
-          req.params = { **params, expand: expand }.compact_blank
-        end
+        request = build_request(path, method: Net::HTTP::Get, params: params, expand: expand)
+
+        response = connection.request(request)
+
+        raise_errors(response)
 
         handle_after_request_callback(response)
 
-        ApiResponse.new(JSON.parse(response.body).deep_symbolize_keys)
-      rescue => e
-        rescue_and_raise_errors(e)
+        ApiResponse.new(parse_json(response.body))
       end
 
-      # Sends a POST request to the Synsbasen API.
+      # Sends a POST request to Synsbasen API.
       #
       # @param path [String] The API endpoint path.
       # @param params [Hash] Query parameters for the request.
       # @param body [Hash] Request body.
+      # @param expand [Array] List of fields to expand in the response.
       # @return [ApiResponse] An instance of `ApiResponse` containing the API response.
       # @raise [ClientError, ServerError] Raised for client or server errors.
       def post(path, params: {}, body: {}, expand: [])
-        response = connection.post(path) do |req|
-          req.params = params
-          req.body = { **body, expand: expand }.compact_blank.to_json
-        end
+        request = build_request(path, method: Net::HTTP::Post, params: params, body: body, expand: expand)
+
+        response = connection.request(request)
+
+        raise_errors(response)
 
         handle_after_request_callback(response)
 
-        ApiResponse.new(JSON.parse(response.body).deep_symbolize_keys)
-      rescue => e
-        rescue_and_raise_errors(e)
+        ApiResponse.new(parse_json(response.body))
       end
 
       private
 
-      # Rescues and raises specific errors based on the type of Faraday error encountered.
+      # Establishes and returns a connection to Synsbasen API.
+      #
+      # @return [Net::HTTP] A Net::HTTP connection instance.
+      def connection
+        uri = URI.parse(SynsbasenApi.config[:base_url] || DEFAULT_BASE_URL)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = uri.scheme == "https"
+        http
+      end
+
+      # Builds a Net::HTTP request object with the specified parameters.
+      #
+      # @param path [String] The API endpoint path.
+      # @param params [Hash] Query parameters for the request.
+      # @param body [Hash] Request body.
+      # @param expand [Array] List of fields to expand in the response.
+      # @param method [Net::HTTP::Get, Net::HTTP::Post] The HTTP method to use.
+      #
+      # @return [Net::HTTP::Get, Net::HTTP::Post] A Net::HTTP request object.
+      def build_request(path, method:, params: {}, body: {}, expand: [])
+        uri = URI.parse(SynsbasenApi.config[:base_url] || DEFAULT_BASE_URL)
+        uri.path = path
+        query = params
+        query.merge!('expand[]': expand) unless expand.nil? || expand.empty?
+        uri.query = URI.encode_www_form(query)
+
+        request = method.new(uri)
+        request.body = body.reject { |i| i.nil? || i.empty? }.to_json if method == Net::HTTP::Post
+        request["Content-Type"] = "application/json"
+        request["Authorization"] = "Bearer #{SynsbasenApi.config[:api_key]}"
+
+        request
+      end
+
+      # Raises specific errors based on the type of Net::HTTP error encountered.
       #
       # @param e [Exception] The exception to handle.
       # @raise [ClientError, ServerError] Raised for client or server errors.
-      def rescue_and_raise_errors(e)
-        case e
-        when Faraday::UnauthorizedError
-          raise ClientError.new(e.message, e.response[:status], {})
-        when Faraday::ClientError
-          raise ClientError.new(e.message, e.response[:status], JSON.parse(e.response[:body]).deep_symbolize_keys)
-        when Faraday::ServerError
-          raise ServerError.new(e.message, e.response[:status], JSON.parse(e.response[:body]).deep_symbolize_keys)
+      def raise_errors(response)
+        case response
+        when Net::HTTPUnauthorized
+          raise ClientError.new(response.message, response.code, {})
+        when Net::HTTPClientError, Net::HTTPBadRequest, Net::HTTPForbidden, Net::HTTPNotFound
+          raise ClientError.new(response.message, response.code, parse_json(response.body))
+        when Net::HTTPServerError
+          raise ServerError.new(response.message, response.code, {})
         else
-          raise e
+          response
         end
       end
 
       # Calls the after_request callback if configured in the SynsbasenApi.
       #
-      # @param response [Faraday::Response] The Faraday response object.
+      # @param response [Net::HTTPResponse] The Net::HTTPResponse object.
       # @return [void]
       def handle_after_request_callback(response)
         return unless SynsbasenApi.config[:after_request]
 
         SynsbasenApi.config[:after_request].call(response)
       end
+
+      # Parses a JSON string into a hash with symbolized keys.
+      #
+      # @param data [String] The JSON string to parse.
+      # @return [Hash] The parsed JSON string as a hash with symbolized keys.
+      def parse_json(data)
+        deep_symbolize_keys(JSON.parse(data))
+      end
+
+      # Recursively converts all keys in a hash to symbols.
+      #
+      # This method is used to convert all keys in the API response to symbols.
+      #
+      # @param hash [Hash] The hash to convert.
+      # @return [Hash] The hash with all keys converted to symbols.
+      # @example
+      #  deep_symbolize_keys({ "key" => "value" }) #=> { key: "value" }
+      #  deep_symbolize_keys({ "key" => { "nested_key" => "value" } }) #=> { key: { nested_key: "value" } }
+      def deep_symbolize_keys(obj)
+        case obj
+        when Hash
+          obj.each_with_object({}) do |(key, value), result|
+            new_key = key.is_a?(String) ? key.to_sym : key
+            new_value = deep_symbolize_keys(value)
+            result[new_key] = new_value
+          end
+        when Array
+          obj.map { |value| deep_symbolize_keys(value) }
+        else
+          obj
+        end
+      end
     end
   end
 end

data/lib/synsbasen_api/resources/inspection_test_center.rb

@@ -12,6 +12,21 @@ module SynsbasenApi
       def all
         get("/v1/inspection_test_centers")
       end
+
+      # Performs a search for inspection test centers based on the provided criteria.
+      #
+      # @param args [Hash] Additional parameters to customize the search.
+      # @option args [String] :method The search method. Default is 'SELECT'.
+      # @return [ApiResponse] An instance of `ApiResponse` containing search results.
+      def search(args = {}, expand: [])
+        post(
+          "/v1/inspection_test_centers/search",
+          body: {
+            method: 'SELECT',
+          }.merge(args),
+          expand: expand
+        )
+      end
     end
   end
 end

data/lib/synsbasen_api/version.rb

@@ -2,5 +2,5 @@
 
 module SynsbasenApi
   # The `VERSION` module specifies the version of the SynsbasenApi gem.
-  VERSION = "1.0.5"
+  VERSION = "1.0.7"
 end

data/lib/synsbasen_api.rb

@@ -9,6 +9,7 @@ require "synsbasen_api/resources/test_center"
 require "synsbasen_api/resources/vehicle"
 require "synsbasen_api/resources/variant"
 require "synsbasen_api/resources/version"
+require "ostruct"
 
 # The `SynsbasenApi` module provides a configuration mechanism and requires various
 # classes and modules related to interacting with the Synsbasen API.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synsbasen_api
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Jimmy Poulsen
@@ -9,36 +9,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
+date: 2024-04-24 00:00:00.000000000 Z
+dependencies: []
 description: Synsbasen API is the easiest way to get access to the Danish vehicle
   registry. See https://api.synsbasen.dk for details.
 email: