Merge pull request #8 from contentstack/develop

Region support and remove timestamp for cdn request

Author: kevalvegeto

lib/contentstack.rb

@@ -2,6 +2,7 @@
 
 require "contentstack/version"
 require "contentstack/client"
+require "contentstack/region"
 require "util"
 
 
@@ -11,6 +12,10 @@
 #   gem install contentstack
 # == Initialize the Stack
 #   @stack = Contentstack::Client.new("site_api_key", "access_token", "enviroment_name")
+# == Initialize the Stack for EU region
+#   @stack = Contentstack::Client.new("site_api_key", "access_token", "enviroment_name", {"region": Contentstack::Region::EU })
+# == Initialize the Stack for custom host
+#   @stack = Contentstack::Client.new("site_api_key", "access_token", "enviroment_name", {"host": "https://custom-cdn.contentstack.com" })
 # == Usage
 # ==== Get single entry
 #   @stack.content_type('blog').entry('<entry_uid_here>').fetch

lib/contentstack/api.rb

@@ -6,8 +6,8 @@
 
 module Contentstack
   class API
-    def self.init_api(api_key, access_token, environment)
-      @host = "https://cdn.contentstack.io"
+    def self.init_api(api_key, access_token, environment,host)
+      @host = host
       @api_version = '/v3'
       @environment = environment
       @headers = {api_key: api_key, access_token: access_token, user_agent: "ruby-sdk/#{Contentstack::VERSION}", environment: @environment}
@@ -43,7 +43,6 @@ def self.send_request(path, q=nil)
       q ||= {}
 
       q.merge!(@headers)
-      q.merge!({timestamp: Time.now.to_i})
 
       query = "?" + q.to_query
       # puts "Request URL:- #{@host}#{@api_version}#{path}#{query} \n\n"

lib/contentstack/client.rb

@@ -4,9 +4,12 @@
 
 module Contentstack
   class Client
+    attr_reader :region, :host
     # Initialize "Built.io Contentstack" Client instance
-    def initialize(api_key, access_token, environment)
-      API.init_api(api_key, access_token, environment)
+    def initialize(api_key, access_token, environment, options={})
+      @region = options[:region].nil? ? Contentstack::Region::US : options[:region]
+      @host = options[:host].nil? ? get_default_region_hosts(@region) : options[:host]
+      API.init_api(api_key, access_token, environment,  @host)
     end
 
 
@@ -25,5 +28,16 @@ def assets
     def asset(uid)
       Asset.new(uid)
     end
+
+    private
+    def get_default_region_hosts(region='us')
+      case region
+      when "us"
+        host = "https://cdn.contentstack.io"
+      when "eu"
+        host = "https://eu-cdn.contentstack.com"
+      end
+      host
+    end
   end
 end

lib/contentstack/region.rb

@@ -0,0 +1,6 @@
+module Contentstack
+  class Region
+    EU='eu'
+    US='us'
+  end
+end

lib/contentstack/version.rb

@@ -1,3 +1,3 @@
 module Contentstack
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end