accessgrid 0.2.0 → 0.5.0

data/lib/accessgrid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # lib/accessgrid.rb
 require 'base64'
 require 'json'
@@ -5,171 +7,98 @@ require 'net/http'
 require 'openssl'
 require 'uri'
 
-require_relative 'accessgrid/version'
 require_relative 'accessgrid/access_cards'
 require_relative 'accessgrid/console'
+require_relative 'accessgrid/error'
+require_relative 'accessgrid/request'
+require_relative 'accessgrid/smart_tap_reveal_crypto'
+require_relative 'accessgrid/version'
 
+# Ruby SDK for the AccessGrid API.
 module AccessGrid
-  class Error < StandardError; end
-  class AuthenticationError < Error; end
-  class ResourceNotFoundError < Error; end
-  class ValidationError < Error; end
-  
-  # Additional error classes to match Python version
-  class AccessGridError < Error; end
-  
+  # API client for AccessGrid key card and template management.
   class Client
-    attr_reader :account_id, :api_secret, :api_host
-    
+    attr_reader :access_cards, :account_id, :api_secret, :api_host, :console
+
     def initialize(account_id, api_secret, api_host = 'https://api.accessgrid.com')
-      if account_id.nil? || account_id.empty?
-        raise ArgumentError, "Account ID is required"
-      end
-      
-      if api_secret.nil? || api_secret.empty?
-        raise ArgumentError, "API Secret is required"
-      end
-      
+      raise ArgumentError, 'Account ID is required' if account_id.nil? || account_id.empty?
+      raise ArgumentError, 'API Secret is required' if api_secret.nil? || api_secret.empty?
+
       @account_id = account_id
       @api_secret = api_secret
       @api_host = api_host.chomp('/')
+      @access_cards = AccessCards.new(self)
+      @console = Console.new(self)
     end
 
-    def access_cards
-      @access_cards ||= AccessCards.new(self)
-    end
+    def make_request(method, path, body = nil, params = nil)
+      request = Request.new(
+        account_id: account_id,
+        body: body,
+        host: api_host,
+        http_method: method,
+        params: params,
+        path: path
+      )
 
-    def console
-      @console ||= Console.new(self)
+      execute_and_process_request!(request)
     end
 
-    def make_request(method, path, body = nil, params = nil)
-      uri = URI.parse("#{api_host}#{path}")
-      
-      # Add query parameters if present
-      if params && !params.empty?
-        uri.query = URI.encode_www_form(params)
-      end
-      
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = uri.scheme == 'https'
-
-      # Create request object based on method
-      request = case method
-      when :get
-        Net::HTTP::Get.new(uri.request_uri)
-      when :post
-        Net::HTTP::Post.new(uri.request_uri)
-      when :put
-        Net::HTTP::Put.new(uri.request_uri)
-      when :patch
-        Net::HTTP::Patch.new(uri.request_uri)
-      else
-        raise ArgumentError, "Unsupported HTTP method: #{method}"
-      end
+    private
+
+    def execute_and_process_request!(request)
+      # set up net http
+      uri = request.uri
+      http = Net::HTTP.new(uri.host, uri.port).tap { |http| http.use_ssl = uri.scheme == 'https' }
 
-      # Set headers
-      request['Content-Type'] = 'application/json'
-      request['X-ACCT-ID'] = account_id
-      request['User-Agent'] = "accessgrid.rb @ v#{AccessGrid::VERSION}"
-      
-      # Extract resource ID from the path if needed for signature
-      resource_id = nil
-      if method == :get || (method == :post && (body.nil? || body.empty?))
-        parts = path.strip.split('/')
-        if parts.length >= 2
-          if ['suspend', 'resume', 'unlink', 'delete'].include?(parts.last)
-            resource_id = parts[-2]
-          else
-            resource_id = parts.last
-          end
-        end
-      end
-      
-      # Handle signature generation
-      if method == :get || (method == :post && (body.nil? || body.empty?))
-        payload = resource_id ? { id: resource_id }.to_json : '{}'
-        
-        # Include sig_payload in query params if needed
-        if resource_id
-          if params.nil?
-            params = {}
-          end
-          params[:sig_payload] = { id: resource_id }.to_json
-          
-          # Update the URI with the new params
-          uri.query = URI.encode_www_form(params)
-          request = case method
-          when :get
-            Net::HTTP::Get.new(uri.request_uri)
-          when :post
-            Net::HTTP::Post.new(uri.request_uri)
-          end
-          
-          # Reset headers after creating new request
-          request['Content-Type'] = 'application/json'
-          request['X-ACCT-ID'] = account_id
-          request['User-Agent'] = "accessgrid.rb @ v#{AccessGrid::VERSION}"
-        end
-      else
-        payload = body ? body.to_json : ""
-      end
-      
       # Generate signature
-      request['X-PAYLOAD-SIG'] = generate_signature(payload)
-      
-      # Add the body to the request
-      if body && method != :get
-        request.body = body.to_json
-      end
+      net_http_request = request.net_http_request
+      net_http_request['X-PAYLOAD-SIG'] = generate_signature_hash(request.payload)
 
       # Make request
-      response = http.request(request)
-      
+      response = http.request(net_http_request)
+
       # Parse response
       handle_response(response)
     end
 
-    private
-
-    def generate_signature(payload)
-      # Base64 encode the payload
-      encoded_payload = Base64.strict_encode64(payload.to_s)
-      
-      # Generate SHA256 hash
-      OpenSSL::HMAC.hexdigest(
-        OpenSSL::Digest.new('sha256'),
-        api_secret,
-        encoded_payload
-      )
-    end
-
     def handle_response(response)
       case response.code.to_i
-      when 200, 201, 202
-        JSON.parse(response.body)
-      when 401
-        raise AuthenticationError, 'Invalid credentials'
-      when 402
-        raise Error, 'Insufficient account balance'
-      when 404
-        raise ResourceNotFoundError, 'Resource not found'
-      when 422
-        raise ValidationError, JSON.parse(response.body)['message']
+      when 204 then {}
+      when 200, 201, 202 then JSON.parse(response.body)
+      when 401 then raise AuthenticationError, 'Invalid credentials'
+      when 402 then raise Error, 'Insufficient account balance'
+      when 404 then raise ResourceNotFoundError, 'Resource not found'
+      when 422 then raise ValidationError, JSON.parse(response.body)['message']
       else
-        error_message = response.body.empty? ? "HTTP Status #{response.code}" : response.body
-        begin
-          error_data = JSON.parse(response.body)
-          error_message = error_data['message'] if error_data['message']
-        rescue JSON::ParserError
-          # If it's not valid JSON, just use the response body
-        end
-        raise Error, "API request failed: #{error_message}"
+        process_unhandled_response(response)
       end
     end
+
+    def process_unhandled_response(response)
+      body = response.body
+      error_message = body.empty? ? "HTTP Status #{response.code}" : body
+
+      begin
+        error_data = JSON.parse(body)
+        error_message = error_data['message'] if error_data['message']
+      rescue JSON::ParserError
+        # If it's not valid JSON, just use the response body
+      end
+
+      raise Error, "API request failed: #{error_message}"
+    end
+
+    def generate_signature_hash(value)
+      # Base64 encode the value
+      encoded_value = Base64.strict_encode64(value.to_s)
+
+      # Generate SHA256 hash
+      OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha256'), api_secret, encoded_value)
+    end
   end
 
   def self.new(account_id, api_secret, api_host = 'https://api.accessgrid.com')
     Client.new(account_id, api_secret, api_host)
   end
-end
+end

metadata

@@ -1,71 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: accessgrid
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Auston Bunsen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-24 00:00:00.000000000 Z
+date: 2026-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: A Ruby client for the AccessGrid API
 email:
 - ab@accessgrid.com
@@ -78,6 +36,9 @@ files:
 - lib/accessgrid.rb
 - lib/accessgrid/access_cards.rb
 - lib/accessgrid/console.rb
+- lib/accessgrid/error.rb
+- lib/accessgrid/request.rb
+- lib/accessgrid/smart_tap_reveal_crypto.rb
 - lib/accessgrid/version.rb
 homepage: https://github.com/access-grid/accessgrid-rb
 licenses:
@@ -92,14 +53,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: AccessGrid API Client