netdnarws 0.2.1 → 0.2.2

data/Gemfile

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
 gem "addressable"
-gem "signet"
+gem "curb-fu"
 gemspec

data/lib/netdnarws/version.rb

@@ -1,3 +1,3 @@
 module NetDNARWS
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/netdnarws.rb

@@ -1,16 +1,8 @@
 require 'signet/oauth_1/client'
 require 'addressable/uri'
-require 'faraday/connection'
+require 'curb-fu'
 require 'json'
 
-module Faraday
-  class Request
-    def url path, params=nil
-      self.path = path
-    end
-  end
-end
-
 module NetDNARWS
   class NetDNA
       attr_accessor :client
@@ -58,33 +50,35 @@ module NetDNARWS
 
         request_options[:body] = _encode_params(attributes[0]) if options[:body]
         request = @request_signer.generate_authenticated_request(request_options)
-        connection = Faraday::Connection.new
 
         begin
-          response = connection.send method do |req|
-            req.url _get_url(uri, attributes)
-            req.headers = request.headers
-            req.body = request.body if options[:body]
-          end
+          response = CurbFu.send method,
+            url: _get_url(uri, attributes),
+            headers: request.headers,
+            data: (request.body if options[:body])
+
+          return response if options[:debug_request]
+
+          response_json = JSON.load(response.body)
 
-          response_json = JSON.load(response.env[:body])
+          return response_json if options[:debug_json]
 
-          if not (100..399).include? response.env[:status]
+          if not (response.success? or response.redirect?)
             error_message = response_json['error']['message']
-            raise Exception.new("#{response.env[:status]}: #{error_message}")
+            raise Exception.new("#{response.status}: #{error_message}")
           end
         rescue TypeError
           raise Exception.new(
-            "#{response.env[:status]}: No information supplied by the server"
+            "#{response.status}: No information supplied by the server"
           )
         end
 
         response_json
       end
 
-      def get uri, options={}
+      def get uri, data={}, options={}
         options[:body] = false
-        self._response_as_json 'get', uri, options
+        self._response_as_json 'get', uri, options, data
       end
 
       def post uri, data={}, options={}
@@ -97,9 +91,9 @@ module NetDNARWS
         self._response_as_json 'put', uri, options, data
       end
 
-      def delete uri, options={}
+      def delete uri, data={}, options={}
         options[:body] = false
-        self._response_as_json 'delete', uri, options
+        self._response_as_json 'delete', uri, options, data
       end
   end
 end

data/netdnarws.gemspec

@@ -14,4 +14,5 @@ Gem::Specification.new do |gem|
   gem.authors = ["NetDNA Developer Team"]
   gem.add_dependency 'addressable'
   gem.add_dependency 'signet'
+  gem.add_dependency 'curb-fu'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netdnarws
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: curb-fu
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Rest Client For NetDNA Rest Web Services
 email: devteam@netdna.com
 executables: []