client accepts common parameters including references

These queries will now work:

client = Contentstack::Client.new(access_token: ENV['ACCESS_TOKEN'], api_key: ENV['API_KEY'], environment: ENV['STACK_ENV'])

entries = client.entries(content_type: 'shirts', params: { limit: 5 } )
entries = client.entries(content_type: 'shirts', params: { include: 'brands' })
entries = client.entries(content_type: 'shirts', params: { include: 'brands, shirt_sizes' })
entries = client.entries(content_type: 'shirts', params: { include: 'brands, shirt_sizes', limit: 5 } )
entries = client.entries(content_type: 'shirts', params: { include: 'brands', limit: 5 } )
entries = client.entries(content_type: 'shirts')
entries = client.entries(content_type: 'shirts', params: { include: 'brands, shirt_sizes', limit: 5, skip: 2 } )
entries = client.entries(content_type: 'shirts', params: { include: 'brands', asc: 'price' } )
entries = client.entries(content_type: 'shirts', params: { include: 'brands', desc: 'price' } )

Author: amite

contentstack.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'typhoeus', '~> 1.1', '>= 1.1.2'
   spec.add_dependency 'multi_json', '~> 1.12', '>= 1.12.1'
+  spec.add_dependency 'activesupport'
 
   spec.add_development_dependency 'bundler', '~> 1.13', '>= 1.13.6'
   spec.add_development_dependency 'rake', '~> 12.0'

lib/contentstack/request.rb

@@ -1,17 +1,18 @@
-
+require "byebug"
 require 'typhoeus'
+require "active_support/core_ext/hash"
 
 module Contentstack
   class Request
 
-    attr_reader :endpoint, :client
+    attr_reader :client, :query, :endpoint_with_params
+    attr_accessor :endpoint, :params
 
-    def initialize(client, endpoint, query={})
+    def initialize(client, endpoint, params={})
       # puts endpoint
       @client = client
       @endpoint = endpoint
-
-      @query = (normalize_query(query) if query && !query.empty?)
+      @endpoint = build_query(params, endpoint + "?") unless params.empty?
     end
 
     # Delegates the actual HTTP work to the client
@@ -21,6 +22,25 @@ def fetch
 
     private
 
+    def build_query(params, endpoint)
+      limit      = Hash[limit:      params[:limit]   ||  0]
+      skip       = Hash[skip:       params[:skip]    ||  0]
+      asc        = Hash[asc:        params[:asc]     || ""]
+      desc       = Hash[desc:       params[:desc]    || ""]
+
+      query = [limit, skip, asc, desc].select { |hash| hash.values.none? { |val| val == '' || val == 0 } }
+      encoded = query.map{ |q| q.to_query }.join("&")
+
+      references = build_references(params[:include]) || ""
+
+      query_string = references.empty? ? "#{endpoint}#{encoded}" : "#{endpoint}#{references}&#{encoded}"
+    end
+
+    def build_references(references)
+      [references].join(",").split(",").map{ |ref| "include[]=#{ref}" }.join("&").gsub(/\s+/, "")
+    end
+
+
     def normalize_query(query)
       Hash[
         query.map do |key, value|
@@ -31,6 +51,6 @@ def normalize_query(query)
         end
       ]
     end
-    
+
   end
 end