ruby_api_pack_cloudways 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55bab48c0d619f7918865a2a4e3f73a8384253844892e29231fe00843e4168b2
-  data.tar.gz: 44054862918fd30db13413b2b8d344e59a44e7f522add84b13d31c93afa5d9e5
+  metadata.gz: 6765ce6819c078879372426341ea342075ff9affdb4bba5d0b975cb9bb6a9490
+  data.tar.gz: 2686e6ab99b91918efec326913b6e47efc0f6362f783d0e81f96c32d2392fa10
 SHA512:
-  metadata.gz: 97fbbb96b0ebc20a12ce6af6912e08f1a9962d95c319fe40a6f48c3a4de41c1d45b66ad2fa3b1b2a17402051e700df54f4eb2500664cee3182871b80705f40c9
-  data.tar.gz: 0b85aeeb9211ffab7c946fdf219a4015f8ab3c937274700f356f0e39d5e769e77588a0c172d608e7e05628b5ee6abbed4d98b2f2f82385c19b2713fea555732a
+  metadata.gz: c146cd133b425c9b233b2140d154ec607c7c3cd720466b70300338b22a7f338e934f25cd49633199fe8de3d492f3a0de74d008853780e21f089060843b8266fb
+  data.tar.gz: 4f6a16799faae8d64f844b312cd7b2775fa4428a62c5f1abb3cf193d508873ba31763ae5b3e216ae31f8669ae113e86ef50439386d3dc98b231a4aa18a6f632b

data/lib/ruby_api_pack_cloudways/api/cw_lists.rb

@@ -1,15 +1,19 @@
 # frozen_string_literal: true
 
+require 'ruby_api_pack_cloudways/handlers/response_validator'
+
 module RubyApiPackCloudways
   module Api
     class CwLists
+      extend RubyApiPackCloudways::Handlers::ResponseValidator
+
       # List endpoints
       ENDPOINTS = {
         apps: '/apps',
         backup_frequencies: '/backup-frequencies',
         countries: '/countries',
-        monitor_durations: '/monitoring/durations',
-        monitor_targets: '/monitoring/targets',
+        monitor_durations: '/monitor_durations',
+        monitor_targets: '/monitor_targets',
         packages: '/packages',
         providers: '/providers',
         regions: '/regions',
@@ -19,52 +23,54 @@ module RubyApiPackCloudways
 
       # Fetch list of applications available
       def self.app_list
-        fetch_resource(ENDPOINTS[:apps])['apps']
+        validate_response(fetch_resource(ENDPOINTS[:apps]), 'apps')
       end
 
       # Fetch list of available backup frequencies
       def self.backup_frequency_list
-        fetch_resource(ENDPOINTS[:backup_frequencies])['frequencies']
+        validate_response(fetch_resource(ENDPOINTS[:backup_frequencies]), 'frequencies')
       end
 
       # Fetch list of supported countries
       def self.country_list
-        fetch_resource(ENDPOINTS[:countries])['countries']
+        response = fetch_resource(ENDPOINTS[:countries])
+        wrapped_response = { 'countries' => response } if response.is_a?(Array)
+        validate_response(wrapped_response || response, 'countries')
       end
 
       # Fetch list of monitoring durations
       def self.monitor_duration_list
-        fetch_resource(ENDPOINTS[:monitor_durations])['durations']
+        validate_response(fetch_resource(ENDPOINTS[:monitor_durations]), 'durations')
       end
 
       # Fetch list of monitoring targets
       def self.monitor_target_list
-        fetch_resource(ENDPOINTS[:monitor_targets])['targets']
+        validate_response(fetch_resource(ENDPOINTS[:monitor_targets]), 'targets')
       end
 
       # Fetch list of available packages
       def self.package_list
-        fetch_resource(ENDPOINTS[:packages])['packages']
+        validate_response(fetch_resource(ENDPOINTS[:packages]), 'packages')
       end
 
       # Fetch list of providers
       def self.provider_list
-        fetch_resource(ENDPOINTS[:providers])['providers']
+        validate_response(fetch_resource(ENDPOINTS[:providers]), 'providers')
       end
 
       # Fetch list of regions
       def self.region_list
-        fetch_resource(ENDPOINTS[:regions])['regions']
+        validate_response(fetch_resource(ENDPOINTS[:regions]), 'regions')
       end
 
       # Fetch list of server sizes
       def self.server_size_list
-        fetch_resource(ENDPOINTS[:server_sizes])['sizes']
+        validate_response(fetch_resource(ENDPOINTS[:server_sizes]), 'sizes')
       end
 
       # Fetch list of available settings
       def self.setting_list
-        fetch_resource(ENDPOINTS[:settings])['settings']
+        validate_response(fetch_resource(ENDPOINTS[:settings]), 'settings')
       end
 
       # Private method to fetch resources from a specified endpoint

data/lib/ruby_api_pack_cloudways/connection/cw_connect.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require 'httparty'
+require 'oj'
+require 'openssl'
+
 module RubyApiPackCloudways
   module Connection
     class CwConnect
@@ -17,9 +21,16 @@ module RubyApiPackCloudways
         token = CwToken.new.cw_api_token
         response = HTTParty.get(
           "#{@cw_api_url_base}#{@cw_api_path}",
-          headers: { 'Authorization' => "Bearer #{token}" }
+          headers: { 'Authorization' => "Bearer #{token}" },
+          ssl_version: :TLSv1_2,
+          debug_output: $stdout
         )
         handle_response(response)
+      rescue RuntimeError => e
+        raise unless e.message.include?('Rate limit exceeded')
+
+        sleep(60)
+        retry
       end
 
       # POST request to Cloudways API
@@ -28,7 +39,9 @@ module RubyApiPackCloudways
         response = HTTParty.post(
           "#{@cw_api_url_base}#{@cw_api_path}",
           headers: { 'Authorization' => "Bearer #{token}", 'Content-Type' => 'application/json' },
-          body: params.to_json
+          body: params.to_json,
+          ssl_version: :TLSv1_2,
+          debug_output: $stdout
         )
         handle_response(response)
       end
@@ -47,9 +60,12 @@ module RubyApiPackCloudways
 
       # Parse response from Cloudways API
       def parse_response(response)
+        content_type = response.headers&.fetch('content-type', nil)
+        raise "Unexpected response: #{response.body}" unless content_type&.include?('application/json')
+
         Oj.load(response.body, mode: :strict)
       rescue Oj::ParseError => e
-        raise "Error parsing response: #{e.message}"
+        raise "Error parsing response: #{e.message}. Raw body: #{response.body}"
       end
     end
   end

data/lib/ruby_api_pack_cloudways/connection/cw_token.rb

@@ -3,6 +3,9 @@
 module RubyApiPackCloudways
   module Connection
     class CwToken
+      # Buffer time before token expiration to fetch a new token
+      TOKEN_EXPIRATION_BUFFER = 300
+
       attr_reader :cw_api_url_base, :cw_url_path_auth, :cw_user_email, :cw_user_key
 
       def initialize
@@ -10,23 +13,53 @@ module RubyApiPackCloudways
         @cw_url_path_auth = RubyApiPackCloudways.configuration.api_path_token
         @cw_user_email = RubyApiPackCloudways.configuration.api_email
         @cw_user_key = RubyApiPackCloudways.configuration.api_key
+        @cached_token = nil
+        @token_expiry = nil
       end
 
+      # Fetch the API token, using caching to avoid unnecessary requests
       def cw_api_token
+        # Use cached token if valid and not near expiration
+        return @cached_token if valid_cached_token?
+
+        # Fetch a new token
         response = HTTParty.post(
           "#{@cw_api_url_base}#{@cw_url_path_auth}",
           headers: { 'Content-Type' => 'application/x-www-form-urlencoded' },
-          body: { email: @cw_user_email, api_key: @cw_user_key }
+          body: { email: @cw_user_email, api_key: @cw_user_key },
+          debug_output: $stdout # Enable debug output for troubleshooting
         )
-        parse_response(response)['access_token']
+
+        if response.code == 200
+          # Parse the response and cache the token
+          parsed_response = parse_response(response)
+          @cached_token = parsed_response['access_token']
+          @token_expiry = Time.now + parsed_response['expires_in']
+          @cached_token
+        else
+          handle_error_response(response)
+        end
       end
 
       private
 
+      # Check if the cached token is still valid
+      def valid_cached_token?
+        @cached_token && @token_expiry && Time.now < (@token_expiry - TOKEN_EXPIRATION_BUFFER)
+      end
+
+      # Parse the API response
       def parse_response(response)
         Oj.load(response.body, mode: :strict)
       rescue Oj::ParseError => e
-        raise "Error parsing response: #{e.message}"
+        raise "Error parsing response: #{e.message}. Raw body: #{response.body}"
+      end
+
+      # Handle non-200 responses
+      def handle_error_response(response)
+        error_message = "Failed to fetch token: #{response.code} - #{response.body}"
+        puts error_message
+        raise error_message
       end
     end
   end

data/lib/ruby_api_pack_cloudways/handlers/response_validator.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module RubyApiPackCloudways
+  module Handlers
+    module ResponseValidator
+      def validate_response(response, expected_key)
+        raise "Unexpected response format: #{response.inspect}" unless response.is_a?(Hash) && response.key?(expected_key)
+
+        result = response[expected_key]
+        raise "Expected '#{expected_key}' to be an Array, got #{result.class}: #{result.inspect}" unless result.is_a?(Array)
+
+        result
+      rescue StandardError => e
+        log_error("Error validating response: #{e.message}")
+        raise "An error occurred while processing the response: #{e.message}"
+      end
+
+      private
+
+      def log_error(message)
+        if defined?(Rails)
+          Rails.logger.error(message)
+        else
+          puts "[ERROR] #{message}"
+        end
+      end
+    end
+  end
+end

data/lib/ruby_api_pack_cloudways/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyApiPackCloudways
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/ruby_api_pack_cloudways.rb

@@ -4,6 +4,7 @@ require 'httparty'
 require 'oj'
 
 require_relative 'ruby_api_pack_cloudways/configuration'
+require_relative 'ruby_api_pack_cloudways/handlers/response_validator'
 require_relative 'ruby_api_pack_cloudways/connection/cw_token'
 require_relative 'ruby_api_pack_cloudways/connection/cw_connect'
 require_relative 'ruby_api_pack_cloudways/api/cw_lists'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_api_pack_cloudways
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - PHCDevworks
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-01 00:00:00.000000000 Z
+date: 2024-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -58,6 +58,7 @@ files:
 - lib/ruby_api_pack_cloudways/configuration.rb
 - lib/ruby_api_pack_cloudways/connection/cw_connect.rb
 - lib/ruby_api_pack_cloudways/connection/cw_token.rb
+- lib/ruby_api_pack_cloudways/handlers/response_validator.rb
 - lib/ruby_api_pack_cloudways/version.rb
 homepage: https://github.com/phcdevworks/ruby_api_pack_cloudways/wiki
 licenses:
@@ -82,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: API Pack for Cloudways