netdnarws 0.3.0 → 0.3.1

data/lib/netdnarws.rb

@@ -3,6 +3,20 @@ require 'curb-fu'
 require 'json'
 
 module NetDNARWS
+  module Utils
+    RESERVED_CHARACTERS = /[^a-zA-Z0-9\-\.\_\~]/
+
+    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
+
+    def encode_params params={}
+      Hash[params.map { |k, v| [escape(k), escape(v)] }]
+    end
+  end
+
   class NetDNA
     include NetDNARWS::Utils
 
@@ -32,7 +46,7 @@ module NetDNARWS
 
     def _get_url uri, params={}
       url = "#{_connection_type}://#{@server}/#{@company_alias}#{uri}"
-      if not attributes.empty?
+      if not params.empty?
         url += "?#{_encode_params(params)}"
       end
 
@@ -55,7 +69,7 @@ module NetDNARWS
 
       begin
         curb_options = {}
-        curb_options[:url] = _get_url(uri, attributes)
+        curb_options[:url] = request_options[:uri]
         curb_options[:headers] = request.headers
 
         if not options[:body]
@@ -130,18 +144,4 @@ module NetDNARWS
       self.delete("/zones/pull.json/#{zone_id}/cache", {}, options)
     end
   end
-
-  module Utils
-    RESERVED_CHARACTERS = /[^a-zA-Z0-9\-\.\_\~]/
-
-    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
-
-    def encode_params params={}
-      Hash[params.map { |k, v| [NetDNARWS::Utils::escape(k), NetDNARWS::Utils::escape(v)] }]
-    end
-  end
 end

data/lib/netdnarws/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netdnarws
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors: