Added test cases for region support and include_metadata

Author: sunil-lakshman

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    contentstack (0.6.4)
+    contentstack (0.7.0)
       activesupport (>= 3.2)
       contentstack_utils (~> 1.0)
 

lib/contentstack/client.rb

@@ -81,16 +81,16 @@ def sync(params)
 
     private
     def get_default_region_hosts(region='us')
-      host = "https://cdn.contentstack.io" #set default host if region is nil
+      host = "#{Contentstack::Region::PROTOCOL}://#{Contentstack::Region::DEFAULT_HOST}" #set default host if region is nil
       case region
       when "us"
-        host = "https://cdn.contentstack.io"
+        host = "#{Contentstack::Region::PROTOCOL}://#{Contentstack::Region::DEFAULT_HOST}"
       when "eu"
-        host = "https://eu-cdn.contentstack.com"
+        host = "#{Contentstack::Region::PROTOCOL}://eu-cdn.#{Contentstack::Region::HOST}"
       when "azure-na"
-        host = "https://azure-na-cdn.contentstack.com"
+        host = "#{Contentstack::Region::PROTOCOL}://azure-na-cdn.#{Contentstack::Region::HOST}"
       when "azure-eu"
-        host = "https://azure-eu-cdn.contentstack.com"
+        host = "#{Contentstack::Region::PROTOCOL}://azure-eu-cdn.#{Contentstack::Region::HOST}"
       end
       host
     end
@@ -102,19 +102,19 @@ def get_host_by_region(region, options)
         custom_host = options[:host]
         case region
         when "us"
-        host = "https://cdn.#{custom_host}"
+        host = "#{Contentstack::Region::PROTOCOL}://cdn.#{custom_host}"
         when "eu"
-          host = "https://eu-cdn.#{custom_host}"
+          host = "#{Contentstack::Region::PROTOCOL}://eu-cdn.#{custom_host}"
         when "azure-na"
-          host = "https://azure-na-cdn.#{custom_host}"
+          host = "#{Contentstack::Region::PROTOCOL}://azure-na-cdn.#{custom_host}"
         when "azure-eu"
-          host = "https://azure-eu-cdn.#{custom_host}"
+          host = "#{Contentstack::Region::PROTOCOL}://azure-eu-cdn.#{custom_host}"
         end
       elsif options[:host].present? && region.empty?
         custom_host = options[:host]
-        host = "https://cdn.#{custom_host}"
+        host = "#{Contentstack::Region::PROTOCOL}://cdn.#{custom_host}"
       else
-        host = "https://cdn.contentstack.io" #set default host if region and host is empty  
+        host = "#{Contentstack::Region::PROTOCOL}://#{Contentstack::Region::DEFAULT_HOST}" #set default host if region and host is empty  
       end
       host
     end

lib/contentstack/region.rb

@@ -4,5 +4,8 @@ class Region
     US='us'
     AZURE_NA='azure-na'
     AZURE_EU='azure-eu'
+    PROTOCOL='https'
+    DEFAULT_HOST='cdn.contentstack.io'
+    HOST='contentstack.com'
   end
 end

lib/contentstack/version.rb

@@ -1,3 +1,3 @@
 module Contentstack
-  VERSION = "0.6.4"
+  VERSION = "0.7.0"
 end

spec/contentstack_spec.rb

@@ -4,7 +4,11 @@
 describe Contentstack do
   let(:client) { create_client }
   let(:eu_client) { create_client('DELIVERY_TOKEN_TOKEN', 'API_KEY', 'STACK_ENV', {region: Contentstack::Region::EU}) }
-  let(:custom_host_client) { create_client('DELIVERY_TOKEN_TOKEN', 'API_KEY', 'STACK_ENV', {host: "https://custom-cdn.contentstack.com"}) }
+  let(:azure_na_client) { create_client('DELIVERY_TOKEN_TOKEN', 'API_KEY', 'STACK_ENV', {region: Contentstack::Region::AZURE_NA}) }
+  let(:azure_eu_client) { create_client('DELIVERY_TOKEN_TOKEN', 'API_KEY', 'STACK_ENV', {region: Contentstack::Region::AZURE_EU}) }
+  let(:custom_host_eu_client) { create_client('DELIVERY_TOKEN_TOKEN', 'API_KEY', 'STACK_ENV', {host: "contentstack.com", region: Contentstack::Region::EU}) }
+  let(:custom_host_azure_eu_client) { create_client('DELIVERY_TOKEN_TOKEN', 'API_KEY', 'STACK_ENV', {host: "contentstack.com", region: Contentstack::Region::AZURE_EU}) }
+  let(:custom_host_azure_na_client) { create_client('DELIVERY_TOKEN_TOKEN', 'API_KEY', 'STACK_ENV', {host: "contentstack.com", region: Contentstack::Region::AZURE_NA}) }
 
   it "has a version number" do
     expect(Contentstack::VERSION).not_to be nil
@@ -13,6 +17,8 @@
   it "has region data" do
     expect(Contentstack::Region::EU).not_to be 'eu'
     expect(Contentstack::Region::US).not_to be 'us'
+    expect(Contentstack::Region::AZURE_NA).not_to be 'azure-na'
+    expect(Contentstack::Region::AZURE_EU).not_to be 'azure-eu'
   end
 
   it "has default host and region" do
@@ -25,10 +31,29 @@
     expect(eu_client.host).to eq 'https://eu-cdn.contentstack.com'  
   end
 
-  it "has custom host" do
-    expect(custom_host_client.host).to eq 'https://custom-cdn.contentstack.com'  
+  it "has custom region with region host" do
+    expect(azure_na_client.region).to eq Contentstack::Region::AZURE_NA
+    expect(azure_na_client.host).to eq 'https://azure-na-cdn.contentstack.com'  
+  end
+
+  it "has custom region with region host" do
+    expect(azure_eu_client.region).to eq Contentstack::Region::AZURE_EU
+    expect(azure_eu_client.host).to eq 'https://azure-eu-cdn.contentstack.com'  
+  end
+
+  it "has custom host and eu region" do
+    expect(custom_host_eu_client.host).to eq 'https://eu-cdn.contentstack.com'  
   end
 
+  it "has custom host and azure-eu region" do
+    expect(custom_host_azure_eu_client.host).to eq 'https://azure-eu-cdn.contentstack.com'  
+  end
+
+  it "has custom host and azure-na region" do
+    expect(custom_host_azure_na_client.host).to eq 'https://azure-na-cdn.contentstack.com'  
+  end
+
+
   it "JSON to HTML" do
     expect(Contentstack::json_to_html({}, ContentstackUtils::Model::Options.new())).to eq ''  
   end

spec/entry_spec.rb

@@ -92,6 +92,16 @@
     data = category.include_metadata.fetch
     expect(data.content_type).not_to be nil
   end
+
+  it "should get data using `include_metadata` method with param false" do
+    data = category.include_metadata(false).fetch
+    expect(data.content_type).not_to be nil
+  end
+
+  it "should get data using `include_metadata` method with param true" do
+    data = category.include_metadata(true).fetch
+    expect(data.content_type).not_to be nil
+  end
 
   it "should get data using `include_reference` method" do
     data = product.include_reference('categories').fetch