regolith 0.1.6 → 0.1.8

data/lib/regolith/service_client.rb

@@ -1,32 +1,66 @@
-# lib/regolith/service_client.rb
+require 'net/http'
+require 'uri'
+require 'json'
+require 'ostruct'
+
 module Regolith
   class ServiceClient
     class << self
-      def get(service_name, path)
-        make_request(service_name, :get, path)
+      def get(service_name, path, params = nil)
+        make_request(service_name, :get, path, nil, params)
+      end
+
+      def post(service_name, path, body = nil, params = nil)
+        make_request(service_name, :post, path, body, params)
       end
 
-      def post(service_name, path, body = nil)
-        make_request(service_name, :post, path, body)
+      def put(service_name, path, body = nil, params = nil)
+        make_request(service_name, :put, path, body, params)
       end
 
-      def put(service_name, path, body = nil)
-        make_request(service_name, :put, path, body)
+      def delete(service_name, path, params = nil)
+        make_request(service_name, :delete, path, nil, params)
       end
 
-      def delete(service_name, path)
-        make_request(service_name, :delete, path)
+      def health(service_name)
+        get(service_name, 'health')
+      end
+
+      def parsed_body(response)
+        JSON.parse(response.body) rescue {}
       end
 
       private
 
-      def make_request(service_name, method, path, body = nil)
-        service_config = Regolith.service_registry[service_name.to_s]
-        
-        unless service_config
-          raise "Service '#{service_name}' not found in registry"
+      def make_request(service_name, method, path, body = nil, params = nil)
+        with_retries do
+          service_config = Regolith.service_registry[service_name.to_s]
+          
+          unless service_config
+            raise "Service '#{service_name}' not found in registry"
+          end
+
+          uri = build_uri(service_name, path, params, service_config)
+          
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.read_timeout = Regolith.configuration.timeout
+          http.open_timeout = Regolith.configuration.timeout
+          
+          request = build_request(method, uri, body)
+          
+          begin
+            http.request(request)
+          rescue => e
+            # Return a mock response for connection errors
+            OpenStruct.new(
+              code: 500, 
+              body: { error: e.message, service: service_name }.to_json
+            )
+          end
         end
+      end
 
+      def build_uri(service_name, path, params, service_config)
         # In Docker Compose, services can be reached by service name
         # In development, use localhost with the mapped port
         host = in_docker? ? service_name.to_s : 'localhost'
@@ -34,34 +68,56 @@ module Regolith
         
         uri = URI("http://#{host}:#{port}/#{path}")
         
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.read_timeout = Regolith.configuration.timeout
+        # Add query parameters if provided
+        if params && !params.empty?
+          query_params = params.map { |k, v| "#{URI.encode_www_form_component(k)}=#{URI.encode_www_form_component(v)}" }
+          uri.query = query_params.join('&')
+        end
         
+        uri
+      end
+
+      def build_request(method, uri, body)
         case method
         when :get
-          request = Net::HTTP::Get.new(uri)
+          Net::HTTP::Get.new(uri)
         when :post
           request = Net::HTTP::Post.new(uri)
-          request.body = body if body
-          request['Content-Type'] = 'application/json'
+          if body
+            request.body = body
+            request['Content-Type'] = 'application/json'
+          end
+          request
         when :put
           request = Net::HTTP::Put.new(uri)
-          request.body = body if body
-          request['Content-Type'] = 'application/json'
+          if body
+            request.body = body
+            request['Content-Type'] = 'application/json'
+          end
+          request
         when :delete
-          request = Net::HTTP::Delete.new(uri)
+          Net::HTTP::Delete.new(uri)
         end
+      end
 
+      def with_retries(max_retries: 2, base_delay: 0.1)
+        attempt = 0
         begin
-          http.request(request)
+          attempt += 1
+          yield
         rescue => e
-          # Return a mock response for connection errors
-          OpenStruct.new(code: '500', body: { error: e.message }.to_json)
+          if attempt <= max_retries
+            delay = base_delay * (2 ** (attempt - 1)) # Exponential backoff
+            sleep(delay)
+            retry
+          else
+            raise e
+          end
         end
       end
 
       def in_docker?
-        File.exist?('/.dockerenv') || ENV['REGOLITH_SERVICE_NAME'].present?
+        File.exist?('/.dockerenv') || ENV['REGOLITH_SERVICE_NAME']
       end
     end
   end

data/lib/regolith/version.rb

@@ -1,4 +1,4 @@
 # lib/regolith/version.rb
 module Regolith
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/lib/regolith.rb

@@ -4,7 +4,6 @@ require 'active_model'
 require 'net/http'
 require 'json'
 require 'yaml'
-
 require_relative 'regolith/version'
 require_relative 'regolith/service_client'
 require_relative 'regolith/regolith_association'
@@ -16,17 +15,17 @@ module Regolith
     def configure
       yield(configuration)
     end
-
+    
     def configuration
       @configuration ||= Configuration.new
     end
-
+    
     def service_registry
       @service_registry ||= load_service_registry
     end
-
+    
     private
-
+    
     def load_service_registry
       if defined?(Rails) && Rails.application.config.respond_to?(:regolith)
         registry_path = Rails.application.config.regolith.service_registry
@@ -40,12 +39,13 @@ module Regolith
       end
     end
   end
-
+  
   class Configuration
-    attr_accessor :service_name, :service_port, :timeout
-
+    attr_accessor :service_name, :service_port, :timeout, :default_port  # Add default_port here
+    
     def initialize
       @timeout = 30
+      @default_port = 3001  # Add this line
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: regolith
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Regolith Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-06 00:00:00.000000000 Z
+date: 2025-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport