regolith 0.1.15 → 0.1.18

data/lib/regolith/service_client.rb

@@ -1,66 +1,32 @@
-require 'net/http'
-require 'uri'
-require 'json'
-require 'ostruct'
-
+# lib/regolith/service_client.rb
 module Regolith
   class ServiceClient
     class << self
-      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)
+      def get(service_name, path)
+        make_request(service_name, :get, path)
       end
 
-      def put(service_name, path, body = nil, params = nil)
-        make_request(service_name, :put, path, body, params)
+      def post(service_name, path, body = nil)
+        make_request(service_name, :post, path, body)
       end
 
-      def delete(service_name, path, params = nil)
-        make_request(service_name, :delete, path, nil, params)
+      def put(service_name, path, body = nil)
+        make_request(service_name, :put, path, body)
       end
 
-      def health(service_name)
-        get(service_name, 'health')
-      end
-
-      def parsed_body(response)
-        JSON.parse(response.body) rescue {}
+      def delete(service_name, path)
+        make_request(service_name, :delete, path)
       end
 
       private
 
-      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
+      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"
         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'
@@ -68,56 +34,34 @@ module Regolith
         
         uri = URI("http://#{host}:#{port}/#{path}")
         
-        # 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
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.read_timeout = Regolith.configuration.timeout
         
-        uri
-      end
-
-      def build_request(method, uri, body)
         case method
         when :get
-          Net::HTTP::Get.new(uri)
+          request = Net::HTTP::Get.new(uri)
         when :post
           request = Net::HTTP::Post.new(uri)
-          if body
-            request.body = body
-            request['Content-Type'] = 'application/json'
-          end
-          request
+          request.body = body if body
+          request['Content-Type'] = 'application/json'
         when :put
           request = Net::HTTP::Put.new(uri)
-          if body
-            request.body = body
-            request['Content-Type'] = 'application/json'
-          end
-          request
+          request.body = body if body
+          request['Content-Type'] = 'application/json'
         when :delete
-          Net::HTTP::Delete.new(uri)
+          request = Net::HTTP::Delete.new(uri)
         end
-      end
 
-      def with_retries(max_retries: 2, base_delay: 0.1)
-        attempt = 0
         begin
-          attempt += 1
-          yield
+          http.request(request)
         rescue => e
-          if attempt <= max_retries
-            delay = base_delay * (2 ** (attempt - 1)) # Exponential backoff
-            sleep(delay)
-            retry
-          else
-            raise e
-          end
+          # Return a mock response for connection errors
+          OpenStruct.new(code: '500', body: { error: e.message }.to_json)
         end
       end
 
       def in_docker?
-        File.exist?('/.dockerenv') || ENV['REGOLITH_SERVICE_NAME']
+        File.exist?('/.dockerenv') || ENV['REGOLITH_SERVICE_NAME'].present?
       end
     end
   end

data/lib/regolith/version.rb

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

data/lib/regolith.rb

@@ -4,6 +4,7 @@ require 'active_model'
 require 'net/http'
 require 'json'
 require 'yaml'
+
 require_relative 'regolith/version'
 require_relative 'regolith/service_client'
 require_relative 'regolith/regolith_association'
@@ -15,17 +16,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
@@ -39,13 +40,12 @@ module Regolith
       end
     end
   end
-  
+
   class Configuration
-    attr_accessor :service_name, :service_port, :timeout, :default_port  # Add default_port here
-    
+    attr_accessor :service_name, :service_port, :timeout
+
     def initialize
       @timeout = 30
-      @default_port = 3001  # Add this line
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regolith
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.18
 platform: ruby
 authors:
 - Regolith Team