simple_uri 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWIwZWRhYTFiM2I3YmIwNThhMDkzMzQ4ZTNhYmU1NDYwMGFmYzA5NQ==
-  data.tar.gz: !binary |-
-    YTRjNTM1ZDg5OTc4ZTUwOWU2Njk2OWIzYmFmN2JhN2FjNTViNTI3Nw==
+SHA1:
+  metadata.gz: 74f5e10edc2a5053bb124fd877a74c3278908b08
+  data.tar.gz: 45c5254e30dc959b0323b079907582ef22f5981c
 SHA512:
-  metadata.gz: !binary |-
-    NjBkOWRjY2M1MzNhNWM1ODc1MmJiNDg5YTRmYmY2ZWU5NTM3ODY1MGM2NDNk
-    YTFkYThjN2Q2ZTI0YzAyODM1YmNiYTFlYTY3ZGJjZmM2OTM5ZDE1MjI0OTE3
-    ZGM1YzI0ZGM2YmVhZTVjZTRlN2E1YjFmZjk0MmU1MTBkOTFlOWM=
-  data.tar.gz: !binary |-
-    MjkyOTljNGFlZDE4M2I3Nzk3ZDY0ZGQyYWZjYzEyYmVlM2U2MmVlMzAwMTdh
-    ZGU4MjgxMDI0Y2U5ZjY5MmJkMmY5YTQ4MWE1NzQzYTg3OTg1MTlhOWFlNjgy
-    MWIxODA1Zjc2NGEwMTllZTk0N2U0NDY1OWU2OTdlMTE2ZDI3ZTU=
+  metadata.gz: b97f485ac75ebfd908be7fe69a5b8a2587f244f573abf12b9f3eed3c4cd0278a1838e784b2c3348e7398d7add4464ba4ab77bf5e67638502c2ae7c2a9f316e88
+  data.tar.gz: 962655fd86de8a4f5cda78e4e05e17ae38ea4fc30986bb4e942b0aa4e0c6f7e75ec7bbb2a29c544f9977b716538f858a422590df9b33af847035cd94621efb3b

data/lib/simple_uri/version.rb

@@ -1,3 +1,3 @@
 module SimpleUri
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/simple_uri.rb

@@ -22,13 +22,17 @@ module SimpleUri
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
       req = "Net::HTTP::#{method.to_s.capitalize}".constantize.new(uri.path+options[:params].to_s)
-      req.basic_auth options[:user], options[:password] if options[:user] && options[:password]
+      if options[:user] && options[:password]
+        req.basic_auth options[:user], options[:password]
+        debug_msg 'Basic auth'
+      end
       [req, http]
     end
     
     def send_request(url=nil, method=:get, options={ params: nil, req_body: nil, req_headers: nil, user: nil, password: nil, debug: @@debug_mode, cookies: false })
+      options[:params] = (method==:post) ? nil : '?'+prepare_req_body(options[:req_body])
       req, http = connect(url, method, { params: options[:params], user: options[:user], password: options[:password], debug: options[:debug] })
-      req.body = prepare_req_body(options[:req_body])
+      req.body = prepare_req_body(options[:req_body]) if method == :post
       options[:req_headers].each { |k, v| req[k] = v } if options[:req_headers]
       res = http.request(req)
       res.body
@@ -45,15 +49,12 @@ module SimpleUri
     private
       
       def prepare_req_body(body)
-        (body.is_a?(Hash))? body_to_str_params(body) : body
-      end
-
-      def body_to_str_params(body)
-        body.map { |k, v| "#{k.to_s}=#{v.to_s}" }.join('&')
+        (body.is_a?(Hash))? URI.encode_www_form(body) : body
       end
       
       def prepare_url(url)
-        unless url.match(/http(s)?:\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.\w{2,5}\/.+/) && url[-1]=='/'
+        m = url.match(/http(s)?:\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.\w{2,5}(:\d+)?\/([1-9.\w])+(.{0})/)
+        if m && m[0]==url && url[-1] != '/'
           url += '/'
           debug_msg 'Append \'/\' to url.'
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_uri
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Nikulin Aleksander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies: []
 description: To simplify working with url
 email: nikulinaleksandr@gmail.com
@@ -28,12 +28,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -43,4 +43,3 @@ signing_key:
 specification_version: 4
 summary: To simplify working with url
 test_files: []
-has_rdoc: