Endpoint now works with both query and params

Endpoint now works with:
- both query and params
- no query or params
- only params but no query
- only query but no params

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', 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' }
entries = client.entries(content_type: 'shirts', query: { title: "Mayra Women's Denim Shirt", "price": 449 }
entries = client.entries(content_type: 'shirts', params: { include: 'brands, shirt_sizes', limit: 5 }, query: { title: "Mayra Women's Denim Shirt", "price": 449 } )

entries.each do |entry|
  puts "#{entry.title} #{entry.price}"
end

Author: amite

lib/contentstack/request.rb

@@ -1,28 +1,55 @@
 require "byebug"
+require "json"
 require 'typhoeus'
+require "uri"
 require "active_support/core_ext/hash"
 
 module Contentstack
   class Request
 
-    attr_reader :client, :query, :endpoint_with_params
-    attr_accessor :endpoint, :params
+    attr_reader :client
+    attr_accessor :endpoint, :params, :query
 
-    def initialize(client, endpoint, params={})
-      # puts endpoint
+    def initialize(client, endpoint, params={}, query={})
       @client = client
-      @endpoint = endpoint
-      @endpoint = build_query(params, endpoint + "?") unless params.empty?
+      @params = params
+      @query = query
+      @endpoint = build_endpoint(endpoint)
     end
 
     # Delegates the actual HTTP work to the client
     def fetch
       client.fetch(self)
     end
 
+    def build_endpoint(initial_endpoint)
+      return initial_endpoint if no_params_or_query
+      return initial_endpoint += '?' + build_query(query) if query_but_no_params
+      return initial_endpoint += '?' + build_params(params) if params_but_no_query
+      # go ahead and build endpoint with both params and query
+      initial_endpoint += '?' + build_params(params) + '&' + build_query(query)
+    end
+
     private
 
-    def build_query(params, endpoint)
+    def no_params_or_query
+      params.empty? && query.empty?
+    end
+
+    def query_but_no_params
+      !! query && params.empty?
+    end
+
+    def params_but_no_query
+      !! params && query.empty?
+    end
+
+    def build_query(query)
+      encoded = URI.encode(query.to_json)
+      "query=#{encoded}"
+    end
+
+    def build_params(params)
       limit      = Hash[limit:      params[:limit]   ||  0]
       skip       = Hash[skip:       params[:skip]    ||  0]
       asc        = Hash[asc:        params[:asc]     || ""]
@@ -33,24 +60,12 @@ def build_query(params, endpoint)
 
       references = build_references(params[:include]) || ""
 
-      query_string = references.empty? ? "#{endpoint}#{encoded}" : "#{endpoint}#{references}&#{encoded}"
+      query_string = references.empty? ? "#{encoded}" : "#{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|
-          [
-            key.to_sym,
-            value.is_a?(::Array) ? value.join(',') : value
-          ]
-        end
-      ]
-    end
-
   end
 end