netdnarws 0.1.0 → 0.2.1

data/Gemfile

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

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.1

data/lib/netdnarws/version.rb

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

data/lib/netdnarws.rb

@@ -1,6 +1,16 @@
-require 'oauth'
+require 'signet/oauth_1/client'
+require 'addressable/uri'
+require 'faraday/connection'
 require 'json'
 
+module Faraday
+  class Request
+    def url path, params=nil
+      self.path = path
+    end
+  end
+end
+
 module NetDNARWS
   class NetDNA
       attr_accessor :client
@@ -9,8 +19,11 @@ module NetDNARWS
         @company_alias = company_alias
         @server = server
         @secure_connection = secure_connection
-        @client = OAuth::Consumer.new(key, secret,
-                   :site => "#{_connection_type}://#{server}")
+        @request_signer = Signet::OAuth1::Client.new(
+          :client_credential_key => key,
+          :client_credential_secret => secret,
+          :two_legged => true
+        )
       end
 
       def _connection_type
@@ -18,8 +31,19 @@ module NetDNARWS
         "https"
       end
 
-      def _get_url uri
-        "#{_connection_type}://#{@server}/#{@company_alias}#{uri}"
+      def _encode_params values
+        uri = Addressable::URI.new
+        uri.query_values = values
+        uri.query
+      end
+
+      def _get_url uri, attributes
+        url = "#{_connection_type}://#{@server}/#{@company_alias}#{uri}"
+        if not attributes.empty?
+          url += "?#{_encode_params(attributes[0])}"
+        end
+
+        url
       end
 
       def _response_as_json method, uri, options={}, *attributes
@@ -27,17 +51,31 @@ module NetDNARWS
           puts "Making #{method.upcase} request to #{_get_url uri}"
         end
 
-        response = @client.request method, _get_url(uri), nil, options, attributes
+        request_options = {
+          :uri => _get_url(uri, attributes),
+          :method => method
+        }
+
+        request_options[:body] = _encode_params(attributes[0]) if options[:body]
+        request = @request_signer.generate_authenticated_request(request_options)
+        connection = Faraday::Connection.new
+
         begin
-          response_json = JSON.parse(response.body)
-          if not ((100..399).map { |e| e.to_s }).include? response.code
-            puts response.code
+          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_json = JSON.load(response.env[:body])
+
+          if not (100..399).include? response.env[:status]
             error_message = response_json['error']['message']
-            raise Exception.new("#{response.code}: #{error_message}")
+            raise Exception.new("#{response.env[:status]}: #{error_message}")
           end
         rescue TypeError
           raise Exception.new(
-            "#{response.code}: No information supplied by the server"
+            "#{response.env[:status]}: No information supplied by the server"
           )
         end
 
@@ -45,18 +83,22 @@ module NetDNARWS
       end
 
       def get uri, options={}
+        options[:body] = false
         self._response_as_json 'get', uri, options
       end
 
       def post uri, data={}, options={}
-        self._response_as_json 'post', uri, options, [data]
+        options[:body] = true
+        self._response_as_json 'post', uri, options, data
       end
 
       def put uri, data={}, options={}
-        self._response_as_json 'put', uri, options, [data]
+        options[:body] = true
+        self._response_as_json 'put', uri, options, data
       end
 
       def delete uri, options={}
+        options[:body] = false
         self._response_as_json 'delete', uri, options
       end
   end

data/netdnarws.gemspec

@@ -12,5 +12,6 @@ Gem::Specification.new do |gem|
   gem.description = %Q{A Rest Client For NetDNA Rest Web Services}
   gem.email = "devteam@netdna.com"
   gem.authors = ["NetDNA Developer Team"]
-  gem.add_dependency 'oauth'
+  gem.add_dependency 'addressable'
+  gem.add_dependency 'signet'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netdnarws
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: oauth
+  name: addressable
+  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'
+- !ruby/object:Gem::Dependency
+  name: signet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: