policymap_wrap 0.6.1 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/policymap_wrap/connection.rb

@@ -17,11 +17,7 @@ module PolicyMap
       request :get, endpoint, data
     end
 
-    class Response
-
-      attr_reader :code, :header, :body, :message
-
-      HTTP_RESPONSES = { '100' => 'Continue', '101' => 'SwitchProtocol', '200' => 'OK', '201' => 'Created', '202' => 'Accepted', '203' => 'NonAuthoritativeInformation',
+    HTTP_RESPONSES = { '100' => 'Continue', '101' => 'SwitchProtocol', '200' => 'OK', '201' => 'Created', '202' => 'Accepted', '203' => 'NonAuthoritativeInformation',
                          '204' => 'NoContent', '205' => 'ResetContent', '206' => 'PartialContent', '300' => 'MultipleChoice', '301' => 'MovedPermanently',
                          '302' => 'Found', '303' => 'SeeOther', '304' => 'NotModified', '305' => 'UseProxy', '307' => 'TemporaryRedirect', '400' => 'BadRequest',
                          '401' => 'Unauthorized', '402' => 'PaymentRequired', '403' => 'Forbidden', '404' => 'NotFound', '405' => 'MethodNotAllowed',
@@ -30,27 +26,6 @@ module PolicyMap
                          '415' => 'UnsupportedMediaType', '416' => 'RequestedRangeNotSatisfiable', '417' => 'ExpectationFailed', '500' => 'InternalServerError',
                          '501' => 'NotImplemented', '502' => 'BadGateway', '503' => 'ServiceUnavailable', '504' => 'GatewayTimeOut', '505' => 'VersionNotSupported' }
 
-      def initialize(http_client)
-        @code = http_client.response_code
-        @header = http_client.header_str.is_a?(String) ? parse_headers(http_client.header_str) : http_client.header_str
-        @body = http_client.body_str
-        @message = HTTP_RESPONSES[@code.to_s]
-      end
-
-    private
-
-      def parse_headers(header_string)
-        header_lines = header_string.split($/)
-        header_lines.shift
-        header_lines.inject({}) do |hsh, line|
-          whole_enchillada, key, value = /^(.*?):\s*(.*)$/.match(line.chomp).to_a
-          hsh[key] = value unless whole_enchillada.nil?
-          hsh
-        end
-      end
-
-    end
-
   private
 
     def request(method, endpoint, data)
@@ -68,7 +43,7 @@ module PolicyMap
         end
       end
 
-      response = send_request(method, endpoint, headers)
+      response = send_request(method, endpoint, headers, data)
 
       if debug
         puts "\nresponse: #{response.code}"
@@ -102,23 +77,23 @@ module PolicyMap
       end.join('&')
     end
 
-    def send_request(method, endpoint, headers)
-      if method == :get
-        @http_client = Curl::Easy.new(endpoint) do |c|
-          c.headers = headers
-        end
+    def send_request(method, endpoint, headers, data)
+      RestClient.proxy = @proxy_url unless @proxy_url.nil?
+      begin
+        response = RestClient::Request.execute(:method => method,
+                                               :url => endpoint,
+                                               :headers => headers,
+                                               :user => @username,
+                                               :password => @password)
+      rescue => e
+        raise_errors(e.response)
       end
 
-      @http_client.userpwd = [@username, @password].join(':')
-      @http_client.proxy_url = @proxy_url unless @proxy_url.nil?
-
-      @http_client.perform
-
-      Response.new(@http_client)
+      response
     end
 
     def raise_errors(response)
-      response_description = "(#{response.code}): #{response.message}"
+      response_description = "(#{response.code}): #{HTTP_RESPONSES[response.code.to_s]}"
       response_description += " - #{response.body}" unless response.body.empty?
 
       case response.code.to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: policymap_wrap
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-08-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70213337199520 !ruby/object:Gem::Requirement
+  requirement: &70278446457560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 0.7.7
   type: :runtime
   prerelease: false
-  version_requirements: *70213337199520
+  version_requirements: *70278446457560
 - !ruby/object:Gem::Dependency
-  name: curb
-  requirement: &70213337198580 !ruby/object:Gem::Requirement
+  name: rest-client
+  requirement: &70278446456760 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7.1
+        version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70213337198580
+  version_requirements: *70278446456760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70213337024520 !ruby/object:Gem::Requirement
+  requirement: &70278446455540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70213337024520
+  version_requirements: *70278446455540
 description: Ruby wrapper around the PolicyMap API. Your API may vary.
 email: mauricio@geminisbs.com
 executables: []