lib/semantics3.rb in semantics3-0.04 vs lib/semantics3.rb in semantics3-0.10

@@ -20,25 +20,41 @@
             @api_secret = api_secret
 
             raise Error.new('API Credentials Missing','You did not supply an api_key. Please sign up at https://semantics3.com/ to obtain your api_key.','api_key') if api_key == ''
             raise Error.new('API Credentials Missing','You did not supply an api_secret. Please sign up at https://semantics3.com/ to obtain your api_secret.','api_secret') if api_secret == ''
 
-            consumer = OAuth::Consumer.new(@api_key, @api_secret)
-            @auth = OAuth::AccessToken.new(consumer)
+            @consumer = OAuth::Consumer.new(@api_key, @api_secret)
+            @auth = OAuth::AccessToken.new(@consumer)
         end
 
         private
-
+        
+        #def oauth(response)
         #returns a value
-        def _make_request(endpoint, params)
-            url = 'https://api.semantics3.com/v1/' + endpoint + '?q=' + CGI.escape(params)
+        def _make_request(endpoint,method = "GET",params)
+            base_url = 'https://api-staging.semantics3.com/v1/' #+ endpoint + '?q=' + CGI.escape(params)
 
-            #puts "url = #{url}"
-            response = @auth.get(url)
-
-            #-- Response.code - TBD
-            JSON.parse response.body
+            if method == "GET"
+                request_data = CGI.escape(params)
+                encoded_url = base_url + endpoint + '?q=' + request_data
+                response = @auth.get(encoded_url)
+                JSON.parse response.body
+            elsif method == "DELETE"
+                url = base_url + endpoint
+                response = @auth.delete(url,params)
+                JSON.parse response.body
+            else    
+                url = URI(base_url+endpoint)
+                request = Net::HTTP::Post.new url.request_uri,params
+                http             = Net::HTTP.new url.host, url.port
+                http.use_ssl     = true
+                http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+                request.oauth! http, @consumer,@auth
+                http.start
+                response = http.request request
+                  JSON.parse response.body
+            end
         end
 
     end
 
     class Products < Base
@@ -202,34 +218,34 @@
         def clear
             @data_query={}
             @query_result={}
         end
 
-        def run_query(endpoint,*params)
+        def run_query(endpoint,method = "GET",*params)
 
             #-- If not defined endpoint, throw error
             if not ( endpoint.kind_of? String and endpoint != '')
                 raise Error.new('Undefined Endpoint','Query Endpoint was not defined. You need to provide one. Eg: products','endpoint')
             end
 
             data = params[0]
 
             if data == nil
-                @query_result = _make_request(endpoint,@data_query[endpoint].to_json)
+                @query_result = _make_request(endpoint,method,@data_query[endpoint].to_json)
             else
                 if not data.is_a?(Hash) and not data.is_a?(String)
                     #-- Throw error - neither string nor hash
                     raise Error.new('Invalid Input','You submitted an invalid input. Input has to be either JSON string or hash')
                 else
                     #-- Data is Hash ref. Great just send it.
                     if data.is_a?(Hash)
-                        @query_result = _make_request(endpoint,data.to_json)
+                        @query_result = _make_request(endpoint,method,data)
                     #-- Data is string
                     elsif data.is_a?(String)
                         #-- Check if it's valid JSON
                         if JSON.is_json?(data)
-                            @query_result = _make_request(endpoint,data)
+                            @query_result = _make_request(endpoint,method,data)
                         else
                             raise Error.new('Invalid Input','You submitted an invalid JSON query string')
                         end
                     end
                 end
@@ -259,8 +275,6 @@
             JSON.parse(foo).all?
         rescue JSON::ParserError
             false
         end 
     end
-end
-
-
+end
\ No newline at end of file