x 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56ad55c544f1c7774395d906e0d9d07b6dc2a6d20e37d7df0b3e5b9f7b7b2bb6
-  data.tar.gz: 1747e256413ee2aeae02d8ed0e351b6d411217b00e634a42aeec5299764d6fac
+  metadata.gz: ff49ecaad847aef0d9da4bdfc4f89cc3bc54da5edbadab40be265e9ec2ec1cf6
+  data.tar.gz: 1ddef9c1479654f53ed7a889cb33b3d1e4d972c005c4f631726bb4270721c2b0
 SHA512:
-  metadata.gz: c5b386cd7386457b148c555359e68c4f9cb72b598ff9eb0a75405f3af75599dca0d5fc1700b01653465b2e50e401b69e9f9e5e9dd126d6a56c46b6df96b5736c
-  data.tar.gz: 462957aeee740d46f4a83497e69bec852fa0a4d8a9e38aec6bf8ffcd8f432e862737fa34847995dce5a49c09a40d9a08607ace68a1314a32972292d881cbd1db
+  metadata.gz: 406e9aaa6f6166f9d267718ac22e94324b243c85475b30cb7569db957683014644542a3b44a6a3d337f0658a1204e8656b1b0c4ed2355b12ffc195c34b0734e4
+  data.tar.gz: b0754554e6272ef9b9ede3f650c3c407b71ae6ed8ede70d6da314ca408874898e83c2d6c14b31335817b0fb036422adde8ccefe3c13c274794c2e08229196812

data/.rubocop.yml

@@ -1,4 +1,6 @@
 require:
+ - standard
+ - standard-performance
  - rubocop-minitest
  - rubocop-performance
  - rubocop-rake
@@ -7,6 +9,39 @@ AllCops:
   NewCops: enable
   TargetRubyVersion: 3.0
 
+Layout/ArgumentAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+
+Layout/ArrayAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+
+Layout/HashAlignment:
+  Enabled: true
+  EnforcedHashRocketStyle: key
+  EnforcedColonStyle: key
+  EnforcedLastArgumentHashStyle: always_inspect
+
+Layout/ParameterAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+  IndentationWidth: ~
+
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: false
+
+Metrics/ParameterLists:
+  CountKeywordArgs: false
+
+Style/Alias:
+  Enabled: true
+  EnforcedStyle: prefer_alias_method
+
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes
@@ -17,6 +52,3 @@ Style/StringLiteralsInInterpolation:
 
 Style/FrozenStringLiteralComment:
   Enabled: false
-
-Metrics/ParameterLists:
-  CountKeywordArgs: false

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [0.5.0] - 2023-08-10
+
+- Add configurable write timeout (2a31f84)
+- Use built-in Gem::Version class (066e0b6)
+
+## [0.4.0] - 2023-08-06
+
+- Refactor Client into Authenticator, RequestBuilder, Connection, ResponseHandler (6bee1e9)
+- Add configurable open timeout (1000f9d)
+- Allow configuration of content type (f33a732)
+
+## [0.3.0] - 2023-08-04
+
 - Add accessors to X::Client (e61fa73)
 - Add configurable read timeout (41502b9)
 - Handle network-related errors (9ed1fb4)

data/Gemfile

@@ -3,6 +3,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in x.gemspec
 gemspec
 
+gem "hashie", ">= 5"
 gem "minitest", ">= 5.19"
 gem "rake", ">= 13.0.6"
 gem "rubocop", ">= 1.21"
@@ -10,4 +11,5 @@ gem "rubocop-minitest", ">= 0.31"
 gem "rubocop-performance", ">= 1.18"
 gem "rubocop-rake", ">= 0.6"
 gem "simplecov", ">= 0.22"
+gem "standard", ">= 1.30.1"
 gem "webmock", ">= 3.18.1"

data/README.md

@@ -1,6 +1,6 @@
 # X
 
-A Ruby interface to the X 2.0 API.
+A Ruby interface to the X API.
 
 ## Installation
 
@@ -15,7 +15,7 @@ If bundler is not being used to manage dependencies, install the gem by executin
 ## Usage
 
 ```ruby
-oauth_credentials = {
+x_oauth_credentials = {
   api_key:             "INSERT YOUR X API KEY HERE",
   api_key_secret:      "INSERT YOUR X API KEY SECRET HERE",
   access_token:        "INSERT YOUR X API ACCESS TOKEN HERE",
@@ -23,7 +23,7 @@ oauth_credentials = {
 }
 
 # Initialize X API client with OAuth credentials
-x_client = X::Client.new(**oauth_credentials)
+x_client = X::Client.new(**x_oauth_credentials)
 
 # Request yourself
 x_client.get("users/me")
@@ -38,18 +38,34 @@ x_client.delete("tweets/#{tweet["data"]["id"]}")
 # {"data"=>{"deleted"=>true}}
 
 # Initialize an API v1.1 client
-v1_client = X::Client.new(base_url: "https://api.twitter.com/1.1/", **oauth_credentials)
+v1_client = X::Client.new(base_url: "https://api.twitter.com/1.1/", **x_oauth_credentials)
 
 # Request your account settings
 v1_client.get("account/settings.json")
 
 # Initialize an X Ads API client
-ads_client = X::Client.new(base_url: "https://ads-api.twitter.com/12/", **oauth_credentials)
+ads_client = X::Client.new(base_url: "https://ads-api.twitter.com/12/", **x_oauth_credentials)
 
 # Request your ad accounts
 ads_client.get("accounts")
 ```
 
+## History and Philosophy
+
+This library is a rewrite of the [Twitter Ruby library](https://github.com/sferik/twitter). Over 16 years, that library ballooned to over 3,000 lines of code (plus 7,500 lines of tests). At the time of writing, this library is about 300 lines of code (plus 200 test lines) and I’d like to keep it that way. That doesn’t mean new features won’t be added over time, but the benefits of potential new features must be weighed against the benefits of simplicity:
+
+* Less code is easier to maintain.
+* Less code means fewer bugs.
+* Less code runs faster.
+
+In the immortal words of [Ezra Zygmuntowicz](https://github.com/ezmobius) and his [Merb](https://github.com/merb) project (may they both rest in peace): “No code is faster than no code.” The fastest code is the code that is never executed because it doesn’t exist. That principle should apply not just to this library itself but to third-party dependencies. At present, this library has one dependency ([oauth](https://rubygems.org/gems/oauth)) and I’d like to keep it that way. If anything, it should have fewer.
+
+The tests for the previous version of this library ran in about 2 seconds. That sounds pretty fast until you see that tests for this library run in 2 hundredths of a second. This means you can automatically run the tests any time you write a file and receive immediate feedback. For such of workflows, 2 seconds feels painfully slow. At the same time, we aim to maintain 100% C0 code coverage.
+
+This code is not littered with comments that are intended to generate documentation. Rather, this code is intended to be simple enough to serve as its own documentation. If you want to understand how something works, don’t read the documentation—it might be wrong—just read the code. The code is always right.
+
+This project conforms to [Standard Ruby](https://github.com/standardrb/standard). Patches that don’t maintain that standard will not be accepted.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/Rakefile

@@ -7,8 +7,9 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/test_*.rb"]
 end
 
+require "standard/rake"
 require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 
-task default: %i[test rubocop]
+task default: %i[test rubocop standard]

data/lib/x/authenticator.rb

@@ -0,0 +1,43 @@
+require "oauth"
+require "forwardable"
+
+module X
+  # Handles OAuth and bearer token authentication
+  class Authenticator
+    extend Forwardable
+
+    attr_accessor :bearer_token
+
+    def_delegator :@access_token, :secret, :access_token_secret
+    def_delegator :@access_token, :secret=, :access_token_secret=
+    def_delegator :@access_token, :token, :access_token
+    def_delegator :@access_token, :token=, :access_token=
+    def_delegator :@consumer, :key, :api_key
+    def_delegator :@consumer, :key=, :api_key=
+    def_delegator :@consumer, :secret, :api_key_secret
+    def_delegator :@consumer, :secret=, :api_key_secret=
+
+    def initialize(bearer_token:, api_key:, api_key_secret:, access_token:, access_token_secret:)
+      if bearer_token
+        @bearer_token = bearer_token
+      else
+        initialize_oauth(api_key, api_key_secret, access_token, access_token_secret)
+      end
+    end
+
+    def sign!(request)
+      @consumer.sign!(request, @access_token)
+    end
+
+    private
+
+    def initialize_oauth(api_key, api_key_secret, access_token, access_token_secret)
+      unless api_key && api_key_secret && access_token && access_token_secret
+        raise ArgumentError, "Missing OAuth credentials"
+      end
+
+      @consumer = OAuth::Consumer.new(api_key, api_key_secret, site: ClientDefaults::DEFAULT_BASE_URL)
+      @access_token = OAuth::Token.new(access_token, access_token_secret)
+    end
+  end
+end

data/lib/x/client.rb

@@ -1,100 +1,35 @@
 require "forwardable"
-require "json"
-require "net/http"
-require "oauth"
-require "uri"
-require_relative "version"
+require_relative "authenticator"
+require_relative "client_defaults"
+require_relative "connection"
+require_relative "request_builder"
+require_relative "response_handler"
 
 module X
-  JSON_CONTENT_TYPE = "application/json; charset=utf-8".freeze
-
-  # Base error class
-  class Error < ::StandardError
-    attr_reader :object
-
-    def initialize(response = nil)
-      if response.is_a?(Net::HTTPResponse) && response.body && response["content-type"] == JSON_CONTENT_TYPE
-        @object = JSON.parse(response.body)
-      end
-      super
-    end
-  end
-
-  class NetworkError < Error; end
-  class ClientError < Error; end
-  class AuthenticationError < ClientError; end
-  class BadRequestError < ClientError; end
-  class ForbiddenError < ClientError; end
-  class NotFoundError < ClientError; end
-
-  # Rate limit error
-  class TooManyRequestsError < ClientError
-    def initialize(response = nil)
-      @response = response
-      super
-    end
-
-    def limit
-      @response && @response["x-rate-limit-limit"]&.to_i
-    end
-
-    def remaining
-      @response && @response["x-rate-limit-remaining"]&.to_i
-    end
-
-    def reset_at
-      reset = @response && @response["x-rate-limit-reset"]&.to_i
-      Time.at(reset.to_i).utc if reset
-    end
-
-    def reset_in
-      [(reset_at - Time.now).ceil, 0].max if reset_at
-    end
-    alias retry_after reset_in
-  end
-
-  class ServerError < Error; end
-  class ServiceUnavailableError < ServerError; end
-
-  # HTTP client that handles authentication and requests
+  # Main public interface
   class Client
     extend Forwardable
+    include ClientDefaults
 
-    attr_accessor :bearer_token, :user_agent, :read_timeout
-    attr_reader :base_url
-
-    def_delegator :@access_token, :secret, :access_token_secret
-    def_delegator :@access_token, :secret=, :access_token_secret=
-    def_delegator :@access_token, :token, :access_token
-    def_delegator :@access_token, :token=, :access_token=
-    def_delegator :@consumer, :key, :api_key
-    def_delegator :@consumer, :key=, :api_key=
-    def_delegator :@consumer, :secret, :api_key_secret
-    def_delegator :@consumer, :secret=, :api_key_secret=
-
-    DEFAULT_BASE_URL = "https://api.twitter.com/2/".freeze
-    DEFAULT_USER_AGENT = "X-Client/#{X::Version} Ruby/#{RUBY_VERSION}".freeze
-    DEFAULT_READ_TIMEOUT = 60 # seconds
-    HTTP_METHODS = {
-      get: Net::HTTP::Get,
-      post: Net::HTTP::Post,
-      put: Net::HTTP::Put,
-      delete: Net::HTTP::Delete
-    }.freeze
+    def_delegators :@authenticator, :bearer_token, :api_key, :api_key_secret, :access_token, :access_token_secret
+    def_delegators :@authenticator, :bearer_token=, :api_key=, :api_key_secret=, :access_token=, :access_token_secret=
+    def_delegators :@connection, :base_url, :open_timeout, :read_timeout, :write_timeout
+    def_delegators :@connection, :base_url=, :open_timeout=, :read_timeout=, :write_timeout=
+    def_delegators :@request_builder, :content_type, :user_agent
+    def_delegators :@request_builder, :content_type=, :user_agent=
+    def_delegators :@response_handler, :array_class, :object_class
+    def_delegators :@response_handler, :array_class=, :object_class=
 
     def initialize(bearer_token: nil, api_key: nil, api_key_secret: nil, access_token: nil, access_token_secret: nil,
-                   base_url: DEFAULT_BASE_URL, user_agent: DEFAULT_USER_AGENT, read_timeout: DEFAULT_READ_TIMEOUT)
-      @base_url = URI(base_url)
-      @user_agent = user_agent
-      @read_timeout = read_timeout
-
-      validate_base_url!
-
-      if bearer_token.nil?
-        initialize_oauth(api_key, api_key_secret, access_token, access_token_secret)
-      else
-        @bearer_token = bearer_token
-      end
+      base_url: DEFAULT_BASE_URL, content_type: DEFAULT_CONTENT_TYPE, user_agent: DEFAULT_USER_AGENT,
+      open_timeout: DEFAULT_OPEN_TIMEOUT, read_timeout: DEFAULT_READ_TIMEOUT, write_timeout: DEFAULT_WRITE_TIMEOUT,
+      array_class: DEFAULT_ARRAY_CLASS, object_class: DEFAULT_OBJECT_CLASS)
+      @authenticator = Authenticator.new(bearer_token: bearer_token, api_key: api_key, api_key_secret: api_key_secret,
+        access_token: access_token, access_token_secret: access_token_secret)
+      @connection = Connection.new(base_url: base_url, open_timeout: open_timeout, read_timeout: read_timeout,
+        write_timeout: write_timeout)
+      @request_builder = RequestBuilder.new(content_type: content_type, user_agent: user_agent)
+      @response_handler = ResponseHandler.new(array_class: array_class, object_class: object_class)
     end
 
     def get(endpoint)
@@ -113,103 +48,13 @@ module X
       send_request(:delete, endpoint)
     end
 
-    def base_url=(base_url)
-      @base_url = URI(base_url)
-      validate_base_url!
-    end
-
     private
 
-    def initialize_oauth(api_key, api_key_secret, access_token, access_token_secret)
-      unless api_key && api_key_secret && access_token && access_token_secret
-        raise ArgumentError, "Missing OAuth credentials"
-      end
-
-      @consumer = OAuth::Consumer.new(api_key, api_key_secret, site: @base_url)
-      @access_token = OAuth::Token.new(access_token, access_token_secret)
-    end
-
     def send_request(http_method, endpoint, body = nil)
-      url = URI.join(@base_url, endpoint)
-      http = Net::HTTP.new(url.host, url.port)
-      http.use_ssl = url.scheme == "https"
-      http.read_timeout = @read_timeout
-
-      request = create_request(http_method, url, body)
-      add_headers(request)
-
-      handle_response(http.request(request))
-    rescue Errno::ECONNREFUSED, Net::OpenTimeout, Net::ReadTimeout => e
-      raise X::NetworkError, "Network error: #{e.message}"
-    end
-
-    def create_request(http_method, url, body)
-      http_method_class = HTTP_METHODS[http_method]
-
-      raise ArgumentError, "Unsupported HTTP method: #{http_method}" unless http_method_class
-
-      request = http_method_class.new(url)
-      request.body = body if body && http_method != :get
-      request
-    end
-
-    def add_headers(request)
-      add_authorization(request)
-      add_content_type(request)
-      add_user_agent(request)
-    end
-
-    def add_authorization(request)
-      if @bearer_token.nil?
-        @consumer.sign!(request, @access_token)
-      else
-        request["Authorization"] = "Bearer #{@bearer_token}"
-      end
-    end
-
-    def add_content_type(request)
-      request["Content-Type"] = JSON_CONTENT_TYPE
-    end
-
-    def add_user_agent(request)
-      request["User-Agent"] = @user_agent if @user_agent
-    end
-
-    def validate_base_url!
-      raise ArgumentError, "Invalid base URL" unless @base_url.is_a?(URI::HTTPS) || @base_url.is_a?(URI::HTTP)
-    end
-
-    def handle_response(response)
-      ResponseHandler.new(response).handle
-    end
-
-    # HTTP client response handler
-    class ResponseHandler
-      ERROR_CLASSES = {
-        Net::HTTPBadRequest => X::BadRequestError,
-        Net::HTTPUnauthorized => X::AuthenticationError,
-        Net::HTTPForbidden => X::ForbiddenError,
-        Net::HTTPNotFound => X::NotFoundError,
-        Net::HTTPTooManyRequests => X::TooManyRequestsError,
-        Net::HTTPInternalServerError => X::ServerError,
-        Net::HTTPServiceUnavailable => X::ServiceUnavailableError
-      }.freeze
-
-      def initialize(response)
-        @response = response
-      end
-
-      def handle
-        if @response.is_a?(Net::HTTPSuccess) && @response["content-type"] == JSON_CONTENT_TYPE
-          return JSON.parse(@response.body)
-        end
-
-        error_class = ERROR_CLASSES[@response.class] || X::Error
-        error_message = "#{@response.code} #{@response.message}"
-        raise error_class, error_message if @response.body.nil? || @response.body.empty?
-
-        raise error_class.new(@response), error_message
-      end
+      request = @request_builder.build(authenticator: @authenticator, http_method: http_method, base_url: base_url,
+        endpoint: endpoint, body: body)
+      response = @connection.send_request(request: request)
+      @response_handler.handle(response: response)
     end
   end
 end

data/lib/x/client_defaults.rb

@@ -0,0 +1,14 @@
+require_relative "version"
+
+module X
+  module ClientDefaults
+    DEFAULT_BASE_URL = "https://api.twitter.com/2/".freeze
+    DEFAULT_CONTENT_TYPE = "application/json; charset=utf-8".freeze
+    DEFAULT_ARRAY_CLASS = Array
+    DEFAULT_OBJECT_CLASS = Hash
+    DEFAULT_OPEN_TIMEOUT = 60 # seconds
+    DEFAULT_READ_TIMEOUT = 60 # seconds
+    DEFAULT_WRITE_TIMEOUT = 60 # seconds
+    DEFAULT_USER_AGENT = "X-Client/#{VERSION} Ruby/#{RUBY_VERSION}".freeze
+  end
+end

data/lib/x/connection.rb

@@ -0,0 +1,40 @@
+require "forwardable"
+require "net/http"
+require "uri"
+require_relative "errors/errors"
+require_relative "errors/network_error"
+
+module X
+  # Sends HTTP requests
+  class Connection
+    extend Forwardable
+    include Errors
+
+    attr_reader :base_url
+
+    def_delegators :@http_client, :open_timeout, :read_timeout, :write_timeout
+    def_delegators :@http_client, :open_timeout=, :read_timeout=, :write_timeout=
+
+    def initialize(base_url:, open_timeout:, read_timeout:, write_timeout:)
+      self.base_url = URI(base_url)
+      @http_client = Net::HTTP.new(@base_url.host, @base_url.port)
+      @http_client.use_ssl = @base_url.scheme == "https"
+      @http_client.open_timeout = open_timeout
+      @http_client.read_timeout = read_timeout
+      @http_client.write_timeout = write_timeout
+    end
+
+    def send_request(request:)
+      @http_client.request(request)
+    rescue *NETWORK_ERRORS => e
+      raise NetworkError, "Network error: #{e.message}"
+    end
+
+    def base_url=(new_base_url)
+      uri = URI(new_base_url)
+      raise ArgumentError, "Invalid base URL" unless uri.is_a?(URI::HTTPS) || uri.is_a?(URI::HTTP)
+
+      @base_url = uri
+    end
+  end
+end

data/lib/x/errors/authentication_error.rb

@@ -0,0 +1,5 @@
+require_relative "client_error"
+
+module X
+  class AuthenticationError < ClientError; end
+end

data/lib/x/errors/bad_request_error.rb

@@ -0,0 +1,5 @@
+require_relative "client_error"
+
+module X
+  class BadRequestError < ClientError; end
+end

data/lib/x/errors/client_error.rb

@@ -0,0 +1,5 @@
+require_relative "error"
+
+module X
+  class ClientError < Error; end
+end

data/lib/x/errors/error.rb

@@ -0,0 +1,24 @@
+require "json"
+require "net/http"
+require_relative "../client_defaults"
+
+module X
+  # Base error class
+  class Error < ::StandardError
+    include ClientDefaults
+    attr_reader :object
+
+    def initialize(msg = nil, response: nil, array_class: DEFAULT_ARRAY_CLASS, object_class: DEFAULT_OBJECT_CLASS)
+      if json_response?(response)
+        @object = JSON.parse(response.body, array_class: array_class, object_class: object_class)
+      end
+      super(msg)
+    end
+
+    private
+
+    def json_response?(response)
+      response.is_a?(Net::HTTPResponse) && response.body && response["content-type"] == DEFAULT_CONTENT_TYPE
+    end
+  end
+end

data/lib/x/errors/errors.rb

@@ -0,0 +1,28 @@
+require "net/http"
+require_relative "bad_request_error"
+require_relative "authentication_error"
+require_relative "forbidden_error"
+require_relative "not_found_error"
+require_relative "too_many_requests_error"
+require_relative "server_error"
+require_relative "service_unavailable_error"
+
+module X
+  module Errors
+    ERROR_CLASSES = {
+      400 => BadRequestError,
+      401 => AuthenticationError,
+      403 => ForbiddenError,
+      404 => NotFoundError,
+      429 => TooManyRequestsError,
+      500 => ServerError,
+      503 => ServiceUnavailableError
+    }.freeze
+
+    NETWORK_ERRORS = [
+      Errno::ECONNREFUSED,
+      Net::OpenTimeout,
+      Net::ReadTimeout
+    ].freeze
+  end
+end

data/lib/x/errors/forbidden_error.rb

@@ -0,0 +1,5 @@
+require_relative "client_error"
+
+module X
+  class ForbiddenError < ClientError; end
+end

data/lib/x/errors/network_error.rb

@@ -0,0 +1,5 @@
+require_relative "error"
+
+module X
+  class NetworkError < Error; end
+end

data/lib/x/errors/not_found_error.rb

@@ -0,0 +1,5 @@
+require_relative "client_error"
+
+module X
+  class NotFoundError < ClientError; end
+end

data/lib/x/errors/server_error.rb

@@ -0,0 +1,5 @@
+require_relative "error"
+
+module X
+  class ServerError < Error; end
+end

data/lib/x/errors/service_unavailable_error.rb

@@ -0,0 +1,5 @@
+require_relative "server_error"
+
+module X
+  class ServiceUnavailableError < ServerError; end
+end

data/lib/x/errors/too_many_requests_error.rb

@@ -0,0 +1,32 @@
+require_relative "client_error"
+require_relative "../client_defaults"
+
+module X
+  # Rate limit error
+  class TooManyRequestsError < ClientError
+    include ClientDefaults
+
+    def initialize(msg = nil, response: nil, array_class: DEFAULT_ARRAY_CLASS, object_class: DEFAULT_OBJECT_CLASS)
+      @response = response
+      super
+    end
+
+    def limit
+      @response&.fetch("x-rate-limit-limit", 0).to_i
+    end
+
+    def remaining
+      @response&.fetch("x-rate-limit-remaining", 0).to_i
+    end
+
+    def reset_at
+      Time.at(@response&.fetch("x-rate-limit-reset", 0).to_i).utc if @response
+    end
+
+    def reset_in
+      [(reset_at - Time.now).ceil, 0].max if reset_at
+    end
+
+    alias_method :retry_after, :reset_in
+  end
+end

data/lib/x/request_builder.rb

@@ -0,0 +1,58 @@
+require "net/http"
+require "uri"
+
+module X
+  # Creates HTTP requests
+  class RequestBuilder
+    HTTP_METHODS = {
+      get: Net::HTTP::Get,
+      post: Net::HTTP::Post,
+      put: Net::HTTP::Put,
+      delete: Net::HTTP::Delete
+    }.freeze
+
+    attr_accessor :content_type, :user_agent
+
+    def initialize(content_type:, user_agent:)
+      @content_type = content_type
+      @user_agent = user_agent
+    end
+
+    def build(authenticator:, http_method:, base_url:, endpoint:, body: nil)
+      url = URI.join(base_url, endpoint)
+      request = create_request(http_method, url, body)
+      add_authorization(authenticator, request)
+      add_content_type(request)
+      add_user_agent(request)
+      request
+    end
+
+    private
+
+    def create_request(http_method, url, body)
+      http_method_class = HTTP_METHODS[http_method]
+
+      raise ArgumentError, "Unsupported HTTP method: #{http_method}" unless http_method_class
+
+      request = http_method_class.new(url)
+      request.body = body if body && http_method != :get
+      request
+    end
+
+    def add_authorization(authenticator, request)
+      if authenticator.bearer_token
+        request["Authorization"] = "Bearer #{@bearer_token}"
+      else
+        authenticator.sign!(request)
+      end
+    end
+
+    def add_content_type(request)
+      request["Content-Type"] = content_type if content_type
+    end
+
+    def add_user_agent(request)
+      request["User-Agent"] = user_agent if user_agent
+    end
+  end
+end

data/lib/x/response_handler.rb

@@ -0,0 +1,40 @@
+require "json"
+require "net/http"
+require_relative "errors/errors"
+
+module X
+  # Process HTTP responses
+  class ResponseHandler
+    include ClientDefaults
+    include Errors
+
+    attr_accessor :array_class, :object_class
+
+    def initialize(array_class:, object_class:)
+      @array_class = array_class
+      @object_class = object_class
+    end
+
+    def handle(response:)
+      if successful_json_response?(response)
+        return JSON.parse(response.body, array_class: array_class, object_class: object_class)
+      end
+
+      error_class = ERROR_CLASSES[response.code.to_i] || Error
+      error_message = "#{response.code} #{response.message}"
+      raise error_class, error_message if empty_response_body?(response)
+
+      raise error_class.new(error_message, response: response, array_class: array_class, object_class: object_class)
+    end
+
+    private
+
+    def successful_json_response?(response)
+      response.is_a?(Net::HTTPSuccess) && response.body && response["content-type"] == DEFAULT_CONTENT_TYPE
+    end
+
+    def empty_response_body?(response)
+      response.body.nil? || response.body.empty?
+    end
+  end
+end

data/lib/x/version.rb

@@ -1,39 +1,5 @@
-module X
-  # The version of this library
-  module Version
-    module_function
-
-    def major
-      0
-    end
-
-    def minor
-      3
-    end
-
-    def patch
-      0
-    end
+require "rubygems/version"
 
-    def pre
-      nil
-    end
-
-    def to_h
-      {
-        major: major,
-        minor: minor,
-        patch: patch,
-        pre: pre
-      }
-    end
-
-    def to_a
-      [major, minor, patch, pre].compact
-    end
-
-    def to_s
-      to_a.join(".")
-    end
-  end
+module X
+  VERSION = Gem::Version.create("0.5.0")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: x
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Erik Berlin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-04 00:00:00.000000000 Z
+date: 2023-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -38,7 +38,23 @@ files:
 - README.md
 - Rakefile
 - lib/x.rb
+- lib/x/authenticator.rb
 - lib/x/client.rb
+- lib/x/client_defaults.rb
+- lib/x/connection.rb
+- lib/x/errors/authentication_error.rb
+- lib/x/errors/bad_request_error.rb
+- lib/x/errors/client_error.rb
+- lib/x/errors/error.rb
+- lib/x/errors/errors.rb
+- lib/x/errors/forbidden_error.rb
+- lib/x/errors/network_error.rb
+- lib/x/errors/not_found_error.rb
+- lib/x/errors/server_error.rb
+- lib/x/errors/service_unavailable_error.rb
+- lib/x/errors/too_many_requests_error.rb
+- lib/x/request_builder.rb
+- lib/x/response_handler.rb
 - lib/x/version.rb
 - sig/x.rbs
 homepage: https://github.com/sferik/x-ruby
@@ -65,8 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.4.18
 signing_key:
 specification_version: 4
-summary: A Ruby interface to the X 2.0 API.
+summary: A Ruby interface to the X API.
 test_files: []