netdnarws 0.2.8 → 0.3.0

data/Gemfile

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

data/README.md

@@ -1,3 +1,6 @@
+# We're Hiring!
+Do you like building cool stuff?  Do APIs keep you up at night? We're looking for our next superstar hacker and you could be it. Interested? Check out our job posting on [stackoverflow](http://careers.stackoverflow.com/jobs/37078/senior-web-engineer-for-fun-growing-la-startup-maxcdn&a=JdFbT4OY).
+
 # NetDNA REST Web Services Ruby Client
 
 ## Installation

data/lib/netdnarws/version.rb

@@ -1,3 +1,3 @@
 module NetDNARWS
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

data/lib/netdnarws.rb

@@ -1,132 +1,147 @@
 require 'signet/oauth_1/client'
-require 'addressable/uri'
 require 'curb-fu'
 require 'json'
 
 module NetDNARWS
   class NetDNA
-      attr_accessor :client
-      def initialize company_alias, key, secret,
-                     server='rws.netdna.com', secure_connection=true, *options
-        @company_alias = company_alias
-        @server = server
-        @secure_connection = secure_connection
-        @request_signer = Signet::OAuth1::Client.new(
-          :client_credential_key => key,
-          :client_credential_secret => secret,
-          :two_legged => true
-        )
+    include NetDNARWS::Utils
+
+    attr_accessor :client
+    def initialize company_alias, key, secret,
+      server='rws.netdna.com', secure_connection=true, *options
+      @company_alias = company_alias
+      @server = server
+      @secure_connection = secure_connection
+      @request_signer = Signet::OAuth1::Client.new(
+        :client_credential_key => key,
+        :client_credential_secret => secret,
+        :two_legged => true
+      )
+    end
+
+    def _connection_type
+      return "http" unless @secure_connection
+      "https"
+    end
+
+    def _encode_params params={}
+      encode_params(params).map { |k, v|
+        "#{k}=#{v}"
+      }.join "&"
+    end
+
+    def _get_url uri, params={}
+      url = "#{_connection_type}://#{@server}/#{@company_alias}#{uri}"
+      if not attributes.empty?
+        url += "?#{_encode_params(params)}"
       end
 
-      def _connection_type
-        return "http" unless @secure_connection
-        "https"
-      end
+      url
+    end
 
-      def _encode_params values
-        uri = Addressable::URI.new
-        uri.query_values = values
-        uri.query
+    def _response_as_json method, uri, options={}, *attributes
+      if options.delete(:debug)
+        puts "Making #{method.upcase} request to #{_get_url uri}"
       end
 
-      def _get_url uri, attributes
-        url = "#{_connection_type}://#{@server}/#{@company_alias}#{uri}"
-        if not attributes.empty?
-          url += "?#{_encode_params(attributes[0])}"
-        end
+      request_options = {
+        :uri => _get_url(uri, options[:body] ? attributes[0] : {}),
+        :method => method
+      }
 
-        url
-      end
+      request_options[:body] = _encode_params(attributes[0]) if options[:body]
+      request = @request_signer.generate_authenticated_request(request_options)
+      request.headers["User-Agent"] = "Ruby NetDNA API Client"
 
-      def _response_as_json method, uri, options={}, *attributes
-        if options.delete(:debug)
-          puts "Making #{method.upcase} request to #{_get_url uri}"
+      begin
+        curb_options = {}
+        curb_options[:url] = _get_url(uri, attributes)
+        curb_options[:headers] = request.headers
+
+        if not options[:body]
+          response = CurbFu.send method, curb_options
+        else
+          response = CurbFu.send method, curb_options, request.body
         end
 
-        request_options = {
-          :uri => _get_url(uri, attributes),
-          :method => method
-        }
+        return response if options[:debug_request]
 
-        request_options[:body] = _encode_params(attributes[0]) if options[:body]
-        request = @request_signer.generate_authenticated_request(request_options)
-        request.headers["User-Agent"] = "Ruby NetDNA API Client"
+        response_json = JSON.load(response.body)
 
-        begin
-          curb_options = {}
-          curb_options[:url] = _get_url(uri, attributes)
-          curb_options[:headers] = request.headers
+        return response_json if options[:debug_json]
 
-          if not options[:body]
-            response = CurbFu.send method, curb_options
-          else
-            response = CurbFu.send method, curb_options, request.body
-          end
+        if not (response.success? or response.redirect?)
+          error_message = response_json['error']['message']
+          raise Exception.new("#{response.status}: #{error_message}")
+        end
+      rescue TypeError
+        raise Exception.new(
+          "#{response.status}: No information supplied by the server"
+        )
+      end
 
-          return response if options[:debug_request]
+      response_json
+    end
 
-          response_json = JSON.load(response.body)
+    def get uri, data={}, options={}
+      options[:body] = false
+      self._response_as_json 'get', uri, options, data
+    end
 
-          return response_json if options[:debug_json]
+    def post uri, data={}, options={}
+      options[:body] = true
+      self._response_as_json 'post', uri, options, data
+    end
 
-          if not (response.success? or response.redirect?)
-            error_message = response_json['error']['message']
-            raise Exception.new("#{response.status}: #{error_message}")
-          end
-        rescue TypeError
-          raise Exception.new(
-            "#{response.status}: No information supplied by the server"
-          )
-        end
+    def put uri, data={}, options={}
+      options[:body] = true
+      self._response_as_json 'put', uri, options, data
+    end
 
-        response_json
-      end
+    def delete uri, data={}, options={}
+      options[:body] = false
+      self._response_as_json 'delete', uri, options, data
+    end
 
-      def get uri, data={}, options={}
-        options[:body] = false
-        self._response_as_json 'get', uri, options, data
-      end
+    def purge zone_id, file_or_files=nil, options={}
+      if file_or_files.respond_to? :each
+        options[:debug_json] = true if options[:debug_json].nil?
+        responses = Hash.new
 
-      def post uri, data={}, options={}
-        options[:body] = true
-        self._response_as_json 'post', uri, options, data
+        file_or_files.each { |e|
+          responses[e] = self.delete(
+            "/zones/pull.json/#{zone_id}/cache",
+            {'file' => e},
+              options
+          )
+        }
+        return responses
       end
 
-      def put uri, data={}, options={}
-        options[:body] = true
-        self._response_as_json 'put', uri, options, data
-      end
 
-      def delete uri, data={}, options={}
-        options[:body] = false
-        self._response_as_json 'delete', uri, options, data
+      unless file_or_files.nil?
+        return self.delete(
+          "/zones/pull.json/#{zone_id}/cache",
+          {'file' => file_or_files},
+            options
+        )
       end
 
-      def purge zone_id, file_or_files=nil, options={}
-        if file_or_files.respond_to? :each
-          options[:debug_json] = true if options[:debug_json].nil?
-          responses = Hash.new
-
-          file_or_files.each { |e|
-            responses[e] = self.delete(
-                             "/zones/pull.json/#{zone_id}/cache",
-                             {'file' => e},
-                             options
-                           )
-          }
-          return responses
-        end
+      self.delete("/zones/pull.json/#{zone_id}/cache", {}, options)
+    end
+  end
 
+  module Utils
+    RESERVED_CHARACTERS = /[^a-zA-Z0-9\-\.\_\~]/
 
-        unless file_or_files.nil?
-          return self.delete(
-            "/zones/pull.json/#{zone_id}/cache",
-            {'file' => file_or_files},
-            options
-          )
-        end
+    def escape(value)
+      URI::escape(value.to_s, NetDNARWS::Utils::RESERVED_CHARACTERS)
+    rescue ArgumentError
+      URI::escape(value.to_s.force_encoding(Encoding::UTF_8), NetDNARWS::Utils::RESERVED_CHARACTERS)
+    end
 
-        self.delete("/zones/pull.json/#{zone_id}/cache", {}, options)
-      end
+    def encode_params params={}
+      Hash[params.map { |k, v| [NetDNARWS::Utils::escape(k), NetDNARWS::Utils::escape(v)] }]
+    end
   end
 end

data/netdnarws.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |gem|
   gem.email = "devteam@netdna.com"
   gem.authors = ["NetDNA Developer Team"]
   gem.add_dependency 'json' if RUBY_VERSION.start_with? "1.8"
-  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.8
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-11-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  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