request.rb in etsy-0.2.0

- old
+ new
@@ -1,48 +1,71 @@
 module Etsy
-  
+
   # = Request
-  # 
+  #
   # A basic wrapper around GET requests to the Etsy JSON API
   #
   class Request
-    
-    # The base URL for API requests
-    def self.base_url
-      "http://beta-api.etsy.com/v1"
+
+    def self.host # :nodoc:
+      'openapi.etsy.com'
     end
-    
+
     # Perform a GET request for the resource with optional parameters - returns
     # A Response object with the payload data
     def self.get(resource_path, parameters = {})
       request = Request.new(resource_path, parameters)
       Response.new(request.get)
     end
-    
+
     # Create a new request for the resource with optional parameters
     def initialize(resource_path, parameters = {})
       @resource_path = resource_path
       @parameters    = parameters
     end
 
+    def base_path # :nodoc:
+      parts = ['v2']
+      parts << 'sandbox' if Etsy.environment == :sandbox
+      parts << (secure? ? 'private' : 'public')
+
+      "/#{parts.join('/')}"
+    end
+
     # Perform a GET request against the API endpoint and return the raw
     # response data
     def get
-      Net::HTTP.get(endpoint_uri)
+      client.get(endpoint_url)
     end
-    
+
+    def client # :nodoc:
+      @client ||= secure? ? secure_client : basic_client
+    end
+
     def parameters # :nodoc:
       @parameters.merge(:api_key => Etsy.api_key, :detail_level => 'high')
     end
-    
+
     def query # :nodoc:
       parameters.map {|k,v| "#{k}=#{v}"}.join('&')
     end
-    
-    def endpoint_uri # :nodoc:
-      uri = URI.parse("#{self.class.base_url}#{@resource_path}")
-      uri.query = query
-      uri
+
+    def endpoint_url # :nodoc:
+      "#{base_path}#{@resource_path}?#{query}"
     end
-    
+
+    private
+
+    def secure_client
+      SecureClient.new(:access_token => @parameters[:access_token], :access_secret => @parameters[:access_secret])
+    end
+
+    def basic_client
+      BasicClient.new(self.class.host)
+    end
+
+    def secure?
+      Etsy.access_mode == :read_write && !@parameters[:access_token].nil? && !@parameters[:access_secret].nil?
+    end
+
   end
-end
\ No newline at end of file
+end