zotero-rb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4766ba9e6a279552e06f893d7a30c0689ada6c8166dbf59a1a8eaeaf56189887
-  data.tar.gz: 4f37812a884e8079d1ff2643a0e21a40f05f487e9261bc5fb902959a16c39d6c
+  metadata.gz: fec7634f993dfdf13ab89d23638bb4a1754a386749fc375eee188c0731be65cc
+  data.tar.gz: af1f817fe3c696dc7f480100db3a6bc6d78a8ed902dfe4624840af931c11e97d
 SHA512:
-  metadata.gz: d03e2f9b7eb2323eca3a6e896a22d295b80e999037c7a345c5e10bc60cc10fe79218b6f801b71ad89dffb657aa63f023047e7518cd5cc2c7105ddfbc763b32fa
-  data.tar.gz: 25b58f33822bcae33b0f65a6090e744fc0f1f8198bc16ba23b87cfcc2703c679b7dc9f76d9139e1a257661265dc2bf907052130efdff1158975e15322621d0fd
+  metadata.gz: c7ee12554c2e9aff9a6e05e6929da003ff65fa09ebd5301e8eb56e44cfbf3c9048ad95578ede3945f09445a00175d38680dc95654f9408f067ca6e98dcf62a8f
+  data.tar.gz: c7351998cf6efff225f4b19dfdc6a8d14a5414fed82f1e81e8b68f9d8b20ead9f1a675fef2dfdd7902a97e38f540e6a849e9c31a8cc6846514c832a75494119e

data/CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.0](https://github.com/andrewhwaller/zotero-rb/compare/v0.1.2...v1.0.0) (2025-09-04)
+
+
+### ⚠ BREAKING CHANGES
+
+* Internal HTTP implementation migrated from HTTParty to Net::HTTP
+
+### Features
+
+* replace HTTParty with Net::HTTP to eliminate dependencies ([f1af7cc](https://github.com/andrewhwaller/zotero-rb/commit/f1af7ccd27cf401bd963062763b701f2b32ea923))
+
+
+### Bug Fixes
+
+* avoid Digest mocking to resolve CI RSpec environment issues ([94adc4a](https://github.com/andrewhwaller/zotero-rb/commit/94adc4a7edd6fd8362c9794f1b1826fd8dda5ec9))
+* move digest require to top level for test compatibility ([c88a64b](https://github.com/andrewhwaller/zotero-rb/commit/c88a64b8972018b9e01682cd9f405f0d3b5f4fec))
+
 ## [0.1.2](https://github.com/andrewhwaller/zotero-rb/compare/v0.1.1...v0.1.2) (2025-09-04)
 
 

data/lib/zotero/client.rb

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 
-require "httparty"
+require "net/http"
+require "uri"
+require "json"
+require "cgi"
 require_relative "item_types"
 require_relative "fields"
 require_relative "file_upload"
 require_relative "http_errors"
 require_relative "syncing"
+require_relative "http_config"
+require_relative "http_connection"
+require_relative "network_errors"
 
 module Zotero
   # The main HTTP client for interacting with the Zotero Web API v3.
@@ -15,15 +21,16 @@ module Zotero
   #   client = Zotero::Client.new(api_key: 'your-api-key-here')
   #   library = client.user_library(12345)
   #
+  # rubocop:disable Metrics/ClassLength
   class Client
-    include HTTParty
     include ItemTypes
     include Fields
     include FileUpload
     include HTTPErrors
     include Syncing
+    include NetworkErrors
 
-    base_uri "https://api.zotero.org"
+    BASE_URI = "https://api.zotero.org"
 
     # Initialize a new Zotero API client.
     #
@@ -33,44 +40,44 @@ module Zotero
     end
 
     def get(path, params: {})
-      response = self.class.get(path,
-                                headers: auth_headers.merge(default_headers),
-                                query: params)
+      response = http_request(:get, path,
+                              headers: auth_headers.merge(default_headers),
+                              params: params)
       handle_response(response, params[:format])
     end
 
     def post(path, data:, version: nil, write_token: nil, params: {})
       headers = build_write_headers(version: version, write_token: write_token)
-      response = self.class.post(path,
-                                 headers: headers,
-                                 body: data,
-                                 query: params)
+      response = http_request(:post, path,
+                              headers: headers,
+                              body: data,
+                              params: params)
       handle_write_response(response)
     end
 
     def patch(path, data:, version: nil, params: {})
       headers = build_write_headers(version: version)
-      response = self.class.patch(path,
-                                  headers: headers,
-                                  body: data,
-                                  query: params)
+      response = http_request(:patch, path,
+                              headers: headers,
+                              body: data,
+                              params: params)
       handle_write_response(response)
     end
 
     def put(path, data:, version: nil, params: {})
       headers = build_write_headers(version: version)
-      response = self.class.put(path,
-                                headers: headers,
-                                body: data,
-                                query: params)
+      response = http_request(:put, path,
+                              headers: headers,
+                              body: data,
+                              params: params)
       handle_write_response(response)
     end
 
     def delete(path, version: nil, params: {})
       headers = build_write_headers(version: version)
-      response = self.class.delete(path,
-                                   headers: headers,
-                                   query: params)
+      response = http_request(:delete, path,
+                              headers: headers,
+                              params: params)
       handle_write_response(response)
     end
 
@@ -90,6 +97,80 @@ module Zotero
       Library.new(client: self, type: :group, id: group_id)
     end
 
+    protected
+
+    def http_request(method, path, **options)
+      request_options = build_request_options(options)
+      uri = build_uri(path, request_options[:params])
+
+      handle_network_errors do
+        connection = HTTPConnection.new(uri)
+        request = build_request(method, uri, request_options[:headers], request_options[:body], request_options)
+
+        net_response = connection.request(request)
+        ResponseAdapter.new(net_response, uri)
+      end
+    end
+
+    def build_request_options(options)
+      {
+        headers: options[:headers] || {},
+        body: options[:body],
+        params: options[:params] || {},
+        multipart: options.dig(:options, :multipart),
+        format: options.dig(:options, :format)
+      }
+    end
+
+    def build_uri(path, params = {})
+      base = path.start_with?("http") ? path : "#{BASE_URI}#{path}"
+      uri = URI(base)
+
+      unless params.empty?
+        query_params = params.map { |k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join("&")
+        uri.query = uri.query ? "#{uri.query}&#{query_params}" : query_params
+      end
+
+      uri
+    end
+
+    def build_request(method, uri, headers, body, request_options)
+      request = create_request(method, uri)
+      set_headers(request, headers)
+      set_request_body(request, method, body, headers, request_options) if body
+      request
+    end
+
+    def create_request(method, uri)
+      request_class = case method
+                      when :get then Net::HTTP::Get
+                      when :post then Net::HTTP::Post
+                      when :put then Net::HTTP::Put
+                      when :patch then Net::HTTP::Patch
+                      when :delete then Net::HTTP::Delete
+                      else raise ArgumentError, "Unsupported HTTP method: #{method}"
+                      end
+
+      request_class.new(uri)
+    end
+
+    def set_headers(request, headers)
+      headers.each { |key, value| request[key] = value }
+    end
+
+    def set_request_body(request, method, body, headers, request_options)
+      return unless %i[post put patch].include?(method)
+
+      if request_options[:multipart]
+        request.set_form(body, "multipart/form-data")
+      elsif headers["Content-Type"] == "application/x-www-form-urlencoded"
+        request.set_form_data(body)
+      else
+        request.body = body.is_a?(String) ? body : JSON.generate(body)
+        request["Content-Type"] = "application/json" unless headers["Content-Type"]
+      end
+    end
+
     private
 
     attr_reader :api_key
@@ -136,4 +217,63 @@ module Zotero
       end
     end
   end
+  # rubocop:enable Metrics/ClassLength
+
+  # Adapter to provide HTTParty-compatible interface for Net::HTTP responses
+  class ResponseAdapter
+    attr_reader :net_response, :uri
+
+    def initialize(net_response, uri)
+      @net_response = net_response
+      @uri = uri
+    end
+
+    def code
+      @net_response.code.to_i
+    end
+
+    def parsed_response
+      @parsed_response ||= parse_body
+    end
+
+    def body
+      @net_response.body
+    end
+
+    def headers
+      @headers ||= @net_response.to_hash.transform_values(&:first)
+    end
+
+    def message
+      @net_response.message
+    end
+
+    def request
+      @request ||= RequestAdapter.new(@uri)
+    end
+
+    private
+
+    def parse_body
+      content_type = @net_response.content_type
+      return nil if @net_response.body.nil? || @net_response.body.empty?
+
+      if content_type&.include?("application/json")
+        JSON.parse(@net_response.body)
+      else
+        @net_response.body
+      end
+    rescue JSON::ParserError
+      @net_response.body
+    end
+  end
+
+  # Adapter to provide request.path access for error handling
+  class RequestAdapter
+    attr_reader :path
+
+    def initialize(uri)
+      @path = uri.path
+    end
+  end
 end

data/lib/zotero/file_upload.rb

@@ -9,12 +9,12 @@ module Zotero
       headers["If-Match"] = if_match if if_match
       headers["If-None-Match"] = if_none_match if if_none_match
 
-      response = self.class.post(path, headers: headers, body: form_data, query: params)
+      response = http_request(:post, path, headers: headers, body: form_data, params: params)
       handle_response(response)
     end
 
     def external_post(url, multipart_data:)
-      response = self.class.post(url, body: multipart_data, multipart: true, format: :plain)
+      response = http_request(:post, url, body: multipart_data, options: { multipart: true, format: :plain })
 
       case response.code
       when 200..299

data/lib/zotero/http_config.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Zotero
+  # Configuration for HTTP requests
+  class HTTPConfig
+    attr_accessor :open_timeout, :read_timeout, :verify_ssl
+
+    def initialize(open_timeout: 30, read_timeout: 60, verify_ssl: true)
+      @open_timeout = open_timeout
+      @read_timeout = read_timeout
+      @verify_ssl = verify_ssl
+    end
+
+    def self.default
+      @default ||= new
+    end
+
+    def self.configure
+      yield(default) if block_given?
+      default
+    end
+  end
+end

data/lib/zotero/http_connection.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "net/http"
+require "openssl"
+
+module Zotero
+  # Manages HTTP connections with proper SSL configuration and timeouts
+  class HTTPConnection
+    DEFAULT_OPEN_TIMEOUT = 30
+    DEFAULT_READ_TIMEOUT = 60
+
+    def initialize(uri, config = nil)
+      @uri = uri
+      @config = config || HTTPConfig.default
+      @http = build_connection
+    end
+
+    def request(net_request)
+      configure_connection unless @configured
+      @http.request(net_request)
+    end
+
+    private
+
+    attr_reader :uri, :config, :http
+
+    def build_connection
+      Net::HTTP.new(@uri.host, @uri.port)
+    end
+
+    def configure_connection
+      configure_ssl if @uri.scheme == "https"
+      configure_timeouts
+      @configured = true
+    end
+
+    def configure_ssl
+      @http.use_ssl = true
+      @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      @http.ca_file = OpenSSL::X509::DEFAULT_CERT_FILE
+    end
+
+    def configure_timeouts
+      @http.open_timeout = @config.open_timeout
+      @http.read_timeout = @config.read_timeout
+    end
+  end
+end

data/lib/zotero/library_file_operations.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "digest"
+
 module Zotero
   # File upload operations for library items
   module LibraryFileOperations
@@ -36,8 +38,6 @@ module Zotero
     end
 
     def extract_file_metadata(file_path)
-      require "digest"
-
       {
         filename: File.basename(file_path),
         md5: Digest::MD5.file(file_path).hexdigest,

data/lib/zotero/network_errors.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "socket"
+require "openssl"
+
+module Zotero
+  # Handles network errors and translates them to appropriate Zotero exceptions
+  module NetworkErrors
+    ERROR_MESSAGES = {
+      Errno::ECONNREFUSED => "Connection refused - server may be down",
+      Errno::EHOSTUNREACH => "Host unreachable - check network connectivity",
+      Errno::ENETUNREACH => "Host unreachable - check network connectivity",
+      SocketError => "DNS resolution failed - check hostname",
+      Net::OpenTimeout => "Connection timeout - server took too long to respond",
+      Net::ReadTimeout => "Read timeout - server response was too slow",
+      OpenSSL::SSL::SSLError => "SSL error - certificate verification failed",
+      Timeout::Error => "Request timeout"
+    }.freeze
+
+    def handle_network_errors
+      yield
+    rescue *network_error_classes => e
+      raise translate_network_error(e)
+    end
+
+    private
+
+    def network_error_classes
+      [
+        Errno::ECONNREFUSED,
+        Errno::EHOSTUNREACH,
+        Errno::ENETUNREACH,
+        SocketError,
+        Net::OpenTimeout,
+        Net::ReadTimeout,
+        OpenSSL::SSL::SSLError,
+        Timeout::Error
+      ]
+    end
+
+    def translate_network_error(error)
+      message = error_message_for(error)
+      Error.new("#{message} (#{error.class})")
+    end
+
+    def error_message_for(error)
+      ERROR_MESSAGES.fetch(error.class) { "Network error: #{error.message}" }
+    end
+  end
+end

data/lib/zotero/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zotero
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,42 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zotero-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Waller
 bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: csv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.21.0
+dependencies: []
 description: A feature-complete Ruby client for the Zotero Web API v3, providing full
   CRUD operations for items, collections, tags, and searches, plus file uploads, fulltext
   content access, and library synchronization. Built with a modular architecture and
@@ -62,10 +34,13 @@ files:
 - lib/zotero/fields.rb
 - lib/zotero/file_upload.rb
 - lib/zotero/fulltext.rb
+- lib/zotero/http_config.rb
+- lib/zotero/http_connection.rb
 - lib/zotero/http_errors.rb
 - lib/zotero/item_types.rb
 - lib/zotero/library.rb
 - lib/zotero/library_file_operations.rb
+- lib/zotero/network_errors.rb
 - lib/zotero/syncing.rb
 - lib/zotero/version.rb
 - sig/zotero/rb.rbs