Fixed the url endpoint issue

Author: sunil-lakshman

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    contentstack (0.8.5)
+    contentstack (0.9.0)
       activesupport (>= 3.2)
       contentstack_utils (~> 1.2)
 
@@ -119,7 +119,7 @@ CHECKSUMS
   bundler (4.0.11) sha256=5bcec0fb78302e48d02ee46f10ee6e6942be647ba5b44a6d1ddfda9a240ce785
   concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
-  contentstack (0.8.5)
+  contentstack (0.9.0)
   contentstack_utils (1.2.3) sha256=cf2f5f996eb487559fd2d7d48a99262710f53dec62c84c6e325b9a598cd31ba7
   crack (1.0.1) sha256=ff4a10390cd31d66440b7524eb1841874db86201d5b70032028553130b6d4c7e
   diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962

contentstack.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |s|
   s.summary = %q{Contentstack Ruby client for the Content Delivery API}
   s.description = %q{Contentstack Ruby client for the Content Delivery API}
 
-  s.files = `git ls-files`.split("\n")
+  s.files         = `git ls-files`.split("\n") +
+                    Dir['ext/**/*'].select { |f| File.file?(f) }
+  s.extensions    = ['ext/download_regions/extconf.rb']
   s.require_paths = ["lib"]
 
   s.add_dependency 'activesupport', '>= 3.2'

ext/download_regions/extconf.rb

@@ -0,0 +1,29 @@
+require 'net/http'
+require 'uri'
+require 'json'
+require 'fileutils'
+
+REGISTRY_URL = 'https://artifacts.contentstack.com/regions.json'
+
+gem_root  = File.expand_path('../..', __dir__)
+data_dir  = File.join(gem_root, 'lib', 'data')
+dest_file = File.join(data_dir, 'regions.json')
+
+FileUtils.mkdir_p(data_dir)
+
+begin
+  uri      = URI.parse(REGISTRY_URL)
+  response = Net::HTTP.get_response(uri)
+  if response.is_a?(Net::HTTPSuccess)
+    File.write(dest_file, JSON.pretty_generate(JSON.parse(response.body)))
+    $stdout.puts "[Contentstack] regions.json downloaded successfully."
+  else
+    $stdout.puts "[Contentstack] Warning: Could not download regions.json (HTTP #{response.code}). Runtime fallback will be used."
+  end
+rescue => e
+  $stdout.puts "[Contentstack] Warning: Could not download regions.json — #{e.message}. Runtime fallback will be used."
+end
+
+# RubyGems requires a Makefile to exist after extconf.rb runs.
+# We create a no-op one since this extension has no C code to compile.
+File.write('Makefile', "all:\n\ninstall:\n\nclean:\n\n")

lib/contentstack/endpoint.rb

@@ -5,33 +5,44 @@
 require 'contentstack/error'
 
 module Contentstack
-  # Centralised endpoint resolver. Reads region→service→URL mappings from the
-  # bundled regions.json and falls back to the live registry when the file is
-  # absent. Delegating to ContentstackUtils.get_contentstack_endpoint is
-  # preferred when that gem exposes the method (PR #41 of contentstack-utils-ruby).
+  # Centralised endpoint resolver. Reads region metadata from the local
+  # regions.json (downloaded from https://artifacts.contentstack.com/regions.json
+  # at gem install time) and falls back to a live fetch when the file is absent.
+  #
+  # Delegates to ContentstackUtils.get_contentstack_endpoint when that gem
+  # ships the method (contentstack-utils-ruby PR #41).
   class Endpoint
-    REGISTRY_URL  = 'https://raw.githubusercontent.com/contentstack/contentstack-utils-ruby/main/lib/data/regions.json'
+    REGISTRY_URL   = 'https://artifacts.contentstack.com/regions.json'
     DATA_FILE_PATH = File.join(File.dirname(File.dirname(__FILE__)), 'data', 'regions.json')
 
-    DEFAULT_SERVICE = 'cda'
+    # Maps the SDK's short service keys to the camelCase keys used in regions.json,
+    # preserving backward compatibility for callers using Service::CDA / Service::CMA.
+    SERVICE_MAP = {
+      'cda'     => 'contentDelivery',
+      'cma'     => 'contentManagement',
+      'preview' => 'preview'
+    }.freeze
+
+    DEFAULT_SERVICE = 'contentDelivery'
 
     # Resolve a Contentstack service URL for the given region and service.
     #
     #   Contentstack::Endpoint.get_contentstack_endpoint('eu')
     #   # => "https://eu-cdn.contentstack.com"
     #
-    #   Contentstack::Endpoint.get_contentstack_endpoint('us', 'cma')
+    #   Contentstack::Endpoint.get_contentstack_endpoint('us', 'contentManagement')
     #   # => "https://api.contentstack.io"
     #
+    #   Contentstack::Endpoint.get_contentstack_endpoint('eu', 'cda')   # short alias
+    #   # => "https://eu-cdn.contentstack.com"
+    #
     # When +custom_host+ is supplied the region CDN prefix is derived from
-    # regions.json and prepended to the custom domain, preserving the
-    # existing SDK behaviour for host-override configurations.
+    # regions.json and prepended to the custom domain.
     def self.get_contentstack_endpoint(region, service = DEFAULT_SERVICE, custom_host = nil)
       region_key  = region.to_s.downcase
-      service_key = service.to_s.downcase
+      service_key = SERVICE_MAP.fetch(service.to_s, service.to_s)
 
       if custom_host.nil? || custom_host.to_s.empty?
-        # Prefer the utils SDK when it ships endpoint resolution (PR #41)
         if defined?(ContentstackUtils) && ContentstackUtils.respond_to?(:get_contentstack_endpoint)
           return ContentstackUtils.get_contentstack_endpoint(region_key, service_key)
         end
@@ -41,10 +52,9 @@ def self.get_contentstack_endpoint(region, service = DEFAULT_SERVICE, custom_hos
       end
     end
 
-    # Download and persist the latest region metadata from the registry.
-    # Equivalent to `composer refresh-regions` in the PHP SDK.
-    #
-    #   Rake: bundle exec rake refresh_regions
+    # Download the latest regions.json from https://artifacts.contentstack.com/regions.json
+    # and persist it locally. Called automatically by ext/download_regions/extconf.rb
+    # during bundle install / bundle update, and by `bundle exec rake refresh_regions`.
     def self.refresh_regions
       data = fetch_from_registry
       FileUtils.mkdir_p(File.dirname(DATA_FILE_PATH))
@@ -55,34 +65,43 @@ def self.refresh_regions
     private
 
     def self.resolve_standard(region_key, service_key)
-      regions = load_regions
-      unless regions.key?(region_key)
+      region_data = find_region(region_key)
+      unless region_data
         raise Contentstack::Error.new(
-          Contentstack::ErrorMessages.region_invalid(region_key, regions.keys)
+          Contentstack::ErrorMessages.region_invalid(region_key, all_region_ids)
         )
       end
-      unless regions[region_key].key?(service_key)
+      unless region_data['endpoints'].key?(service_key)
         raise Contentstack::Error.new(
-          Contentstack::ErrorMessages.service_invalid(service_key, regions[region_key].keys)
+          Contentstack::ErrorMessages.service_invalid(service_key, region_data['endpoints'].keys)
         )
       end
-      regions[region_key][service_key]
+      region_data['endpoints'][service_key]
     end
 
-    # Derive the CDN subdomain prefix from regions.json and combine with the
-    # caller-supplied custom domain, e.g. "eu-cdn" + "example.com" →
-    # "https://eu-cdn.example.com".
     def self.resolve_custom_host(region_key, service_key, custom_host)
-      regions = load_regions
-      if regions.key?(region_key) && regions[region_key].key?(service_key)
-        standard_url = regions[region_key][service_key]
+      region_data = find_region(region_key)
+      if region_data && region_data['endpoints'].key?(service_key)
+        standard_url = region_data['endpoints'][service_key]
         prefix = URI.parse(standard_url).host.split('.').first
         "https://#{prefix}.#{custom_host}"
       else
         "https://cdn.#{custom_host}"
       end
     end
 
+    # Find a region by its canonical id or any of its declared aliases.
+    def self.find_region(region_key)
+      load_regions['regions'].find do |r|
+        r['id'] == region_key ||
+          r['alias'].any? { |a| a.downcase == region_key }
+      end
+    end
+
+    def self.all_region_ids
+      load_regions['regions'].map { |r| r['id'] }
+    end
+
     def self.load_regions
       if File.exist?(DATA_FILE_PATH)
         JSON.parse(File.read(DATA_FILE_PATH))

lib/contentstack/region.rb

@@ -1,17 +1,38 @@
 module Contentstack
   class Region
     EU       = 'eu'
-    US       = 'us'
+    US       = 'us'       # alias for the 'na' region in regions.json
     AZURE_NA = 'azure-na'
     AZURE_EU = 'azure-eu'
     GCP_NA   = 'gcp-na'
     GCP_EU   = 'gcp-eu'
+    AU       = 'au'
   end
 
   class Service
-    CDA     = 'cda'
-    CMA     = 'cma'
-    PREVIEW = 'preview'
+    # Full camelCase keys matching regions.json
+    CONTENT_DELIVERY   = 'contentDelivery'
+    CONTENT_MANAGEMENT = 'contentManagement'
+    PREVIEW            = 'preview'
+    AUTH               = 'auth'
+    GRAPHQL_DELIVERY   = 'graphqlDelivery'
+    GRAPHQL_PREVIEW    = 'graphqlPreview'
+    IMAGES             = 'images'
+    ASSETS             = 'assets'
+    AUTOMATE           = 'automate'
+    LAUNCH             = 'launch'
+    DEVELOPER_HUB      = 'developerHub'
+    BRAND_KIT          = 'brandKit'
+    GEN_AI             = 'genAI'
+    PERSONALIZE_MGMT   = 'personalizeManagement'
+    PERSONALIZE_EDGE   = 'personalizeEdge'
+    COMPOSABLE_STUDIO  = 'composableStudio'
+    ASSET_MANAGEMENT   = 'assetManagement'
+    APPLICATION        = 'application'
+
+    # Short aliases kept for backward compatibility
+    CDA = CONTENT_DELIVERY
+    CMA = CONTENT_MANAGEMENT
   end
 
   class Host