contentstack 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ba9cac23e4e20c7af32bb25d788cd226f489bb9
-  data.tar.gz: '0903ec191fca15f8664db5c9de793453657b3636'
+  metadata.gz: 2c05a60239a20793be053c9afa3684e579f1b744
+  data.tar.gz: 002d29d76b307264a6353cb13b6a7d07a5372d35
 SHA512:
-  metadata.gz: '068954e3aac1861e09fe135fbcea77ac2fd528e8e295285bed5286026a1202fbd10f78f9418a7c1c5a8af14f8a9bfa107a7568567b9cb907c09374dae93415c3'
-  data.tar.gz: b38b4b0320cf45944edd04c6c0aed62578d9b029141f1b159f0dcf51e778a852623a4e06b270f11fdf5dd21613cdc41386614102c987426da2f9e02c2a202f1b
+  metadata.gz: 3fa5770932d3c6e4de5dbb6c90790f3ae889802863403c45a4aff7338d1ca591ec72e6920798fb81f85c3c745ef33e770898e852e3ad68bf9c490b356a957a17
+  data.tar.gz: 63b98d912dcbf97dc4b1e34f326ef125a53fcccdb1748211126ff4a3f311ab5d65d762216703a8fdda46cb8c3a2871d16d210c323561373bdad6cdf76cd76f31

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 amite
+Copyright (c) 2012-2019 Contentstack. All Rights Reserved
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,3 +1,4 @@
+
 # **Ruby SDK for Contentstack**
 
 Contentstack is a headless CMS with an API-first approach. It is a CMS that developers can use to build powerful cross-platform applications in their favorite languages. Build your application frontend, and Contentstack will take care of the rest. [Read More](https://www.contentstack.com/). 
@@ -20,7 +21,17 @@ Or you can run this command in your terminal (you might need administrator privi
 
 To start using the SDK in your application, you will need to initialize the stack by providing the values for the keys given in the code snippet below.
 
+    # with default region
     client = Contentstack::Client.new("site_api_key", "access_token", "enviroment_name")
+    
+    # with specific region
+    client = Contentstack::Client.new("site_api_key", "access_token", "enviroment_name",{"region": Contentstack::Region::EU})
+    
+    # with custom host
+    client = Contentstack::Client.new("site_api_key", "access_token", "enviroment_name",{"host": "https://custom-cdn.contentstack.com"})
+
+
+
 
 ## **Key Concepts for using Contentstack**
 
@@ -90,7 +101,7 @@ SDK functions for Image Delivery API coming soon.
 
 ## **The MIT License (MIT)**
 
-Copyright © 2012-2017 [Built.io](https://www.built.io/). All Rights Reserved
+Copyright © 2012-2019 [Contentstack](https://www.contentstack.com). All Rights Reserved
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/contentstack.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 
 require "contentstack/version"
 require "contentstack/client"
+require "contentstack/region"
 require "util"
 
 
@@ -11,6 +12,10 @@ require "util"
 #   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

data/lib/contentstack/api.rb

@@ -6,8 +6,8 @@ require 'open-uri'
 
 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 @@ module Contentstack
       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"

data/lib/contentstack/client.rb

@@ -4,9 +4,12 @@ require 'contentstack/asset_collection'
 
 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 @@ module Contentstack
     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

data/lib/contentstack/region.rb

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

data/lib/contentstack/version.rb

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

data/spec/content_type_spec.rb

@@ -3,6 +3,8 @@ require_relative '../lib/contentstack.rb'
 
 describe Contentstack::ContentType do
   let(:client) { create_client }
+  let(:eu_client) { create_client('ACCESS_TOKEN', 'API_KEY', 'STACK_ENV', {region: Contentstack::Region::EU}) }
+  let(:custom_host_client) { create_client('ACCESS_TOKEN', 'API_KEY', 'STACK_ENV', {host: "https://custom-cdn.contentstack.com"}) }
 
   describe "Fetch data from API" do
     it "has class as Contentstack::ContentType" do
@@ -14,6 +16,16 @@ describe Contentstack::ContentType do
       @data = client.content_types.first
       expect(@data.title).not_to be nil
     end
+    
+    it "has method called title with data from eu" do
+      @data = eu_client.content_types.first
+      expect(@data.title).not_to be nil
+    end
+
+    it "has method called title with data from custom client" do
+      @data = custom_host_client.content_types.first
+      expect(@data.title).not_to be nil
+    end
 
     it "has method called uid with data" do
       @data = client.content_types.first

data/spec/contentstack_spec.rb

@@ -3,8 +3,30 @@ require_relative '../lib/contentstack.rb'
 
 describe Contentstack do
   let(:client) { create_client }
+  let(:eu_client) { create_client('ACCESS_TOKEN', 'API_KEY', 'STACK_ENV', {region: Contentstack::Region::EU}) }
+  let(:custom_host_client) { create_client('ACCESS_TOKEN', 'API_KEY', 'STACK_ENV', {host: "https://custom-cdn.contentstack.com"}) }
 
   it "has a version number" do
     expect(Contentstack::VERSION).not_to be nil
   end
+
+  it "has region data" do
+    expect(Contentstack::Region::EU).not_to be 'eu'
+    expect(Contentstack::Region::US).not_to be 'us'
+  end
+
+  it "has default host and region" do
+    expect(client.region).to eq Contentstack::Region::US
+    expect(client.host).to eq 'https://cdn.contentstack.io'  
+  end
+
+  it "has custom region with region host" do
+    expect(eu_client.region).to eq Contentstack::Region::EU
+    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'  
+  end
+
 end

data/spec/query_spec.rb

@@ -54,7 +54,7 @@ describe Contentstack::Query do
   it "should get data using `include_count` method" do
     data = category_query.include_count.fetch
     expect(data.count).not_to be nil
-    expect(data.count.class).to be Integer
+    expect(data.count).to eq 5
   end
 
   it "should get data using `only` method with string parameter" do

data/spec/spec_helper.rb

@@ -107,6 +107,14 @@ RSpec.configure do |config|
 =end
 
   config.before(:each) do
+    stub_request(:get, /custom-cdn.contentstack.com\/v3\/content_types/).
+      with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+      to_return(:status => 200, :body => File.read(File.dirname(__FILE__) + '/fixtures/content_types.json'), :headers => {})
+
+    stub_request(:get, /eu-cdn.contentstack.com\/v3\/content_types/).
+      with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+      to_return(:status => 200, :body => File.read(File.dirname(__FILE__) + '/fixtures/content_types.json'), :headers => {})
+
     stub_request(:get, /cdn.contentstack.io\/v3\/content_types/).
       with(headers: {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
       to_return(:status => 200, :body => File.read(File.dirname(__FILE__) + '/fixtures/content_types.json'), :headers => {})
@@ -140,7 +148,7 @@ RSpec.configure do |config|
       to_return(:status => 200, :body => File.read(File.dirname(__FILE__) + '/fixtures/category_entry.json'), :headers => {})
   end
 
-  def create_client(access_token = ENV['ACCESS_TOKEN'], api_key = ENV['API_KEY'], environment = ENV['STACK_ENV'])
-    Contentstack::Client.new(access_token, api_key, environment)
+  def create_client(access_token = ENV['ACCESS_TOKEN'], api_key = ENV['API_KEY'], environment = ENV['STACK_ENV'], options = {})
+    Contentstack::Client.new(access_token, api_key, environment, options)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contentstack
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Contentstack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -117,6 +117,7 @@ files:
 - lib/contentstack/entry_collection.rb
 - lib/contentstack/error.rb
 - lib/contentstack/query.rb
+- lib/contentstack/region.rb
 - lib/contentstack/version.rb
 - lib/util.rb
 - rakefile.rb
@@ -156,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Contentstack Ruby client for the Content Delivery API