simple_uri 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3775df648d936f8ed5afd15e965fcd202ac0f7f4
-  data.tar.gz: 4980e5d942bd91a74af68f9897fcf3881f77dc42
+  metadata.gz: 2e05ec3ed68d47c4d1e5014a03fa778a2a15d82e
+  data.tar.gz: 2b4ff8f760a510a0cf03d85036992abb579b6749
 SHA512:
-  metadata.gz: 7c0b786265a6e375ad804b1f427805a360df0d20acbf0ab23f82a5f71e71f0084fdcc26368f0fd3e9a30ac253d482995de4b4274ea3ac37b3d323280a5101222
-  data.tar.gz: ad8eddf56d282ff8c35674b74084a0689e42c420ea7b2546a64a10363c2ef34db21af2b267140bf5712bd4bd2d92b2adc46934a9e733d289597a9d350d68f311
+  metadata.gz: a8bbab9e126f3de9de9581e02cc915766f4fab43a240e14122237cff291b776f7cef74416e7c53776a7ee4901e545fcc53bcb875376e5c928275b7fa3800bf49
+  data.tar.gz: 41447113367896c8f5a8e4b24d7cfc587c2c0725d59d8b8adaf3124e456f52a8c0d89e88f9ae336c7b75e3ee59783b1132d9424542850bcb1039760ae8cbdfcc

data/lib/simple_uri/version.rb

@@ -1,3 +1,3 @@
 module SimpleUri
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/simple_uri.rb

@@ -8,10 +8,9 @@ module SimpleUri
 
   class << self
 
-    @@debug_mode = false
+    MODES = { debug: false, autofix: false }
 
-    def connect(url='', method=nil, options={ params: nil, user: nil, password: nil, debug: @@debug_mode })
-      enable_debug_mode(options[:debug])
+    def connect(url='', method=nil, options={ params: nil, user: nil, password: nil, debug: debug_mode })
       uri = URI.parse(URI.encode(prepare_url(url)))
       http = Net::HTTP.new(uri.host, uri.port)
       http.read_timeout = 1000
@@ -29,7 +28,9 @@ module SimpleUri
       [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 })
+    def send_request(url=nil, method=:get, options={ params: nil, req_body: nil, req_headers: nil, user: nil, password: nil, debug: debug_mode, autofix: autofix_mode, cookies: false })
+      enable_debug_mode(options[:debug])
+      enable_autofix_mode(options[:autofix])
       get_params = options[:req_body] ? '?'+prepare_req_body(options[:req_body]).to_s : ''
       options[:params] = method==:post ? nil : get_params
       req, http = connect(url, method, { params: options[:params], user: options[:user], password: options[:password], debug: options[:debug] })
@@ -54,34 +55,50 @@ module SimpleUri
       end
       
       def prepare_url(url)
-        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.'
+        if autofix_mode
+          m = url.match(/http(s)?:\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.\w{2,5}(:\d+)?\/([1-9.\w])+(.{0})/) #TODO
+          if m && m[0]==url && url[-1] != '/'
+            url += '/'
+            debug_msg 'Append \'/\' to url.'
+          end
         end
         url
       end
 
       def enable_debug_mode(enabled)
         if enabled
-          @@debug_mode = true
+          debug_mode(true)
           @log = Logger.new(debug_output)
           @log.level = Logger::DEBUG
         end
       end
 
+      def enable_autofix_mode(enabled)
+        autofix_mode(true) if enabled
+      end
+
       def debug_msg(msg)
-        @log.debug(msg) if @log && @@debug_mode
+        @log.debug(msg) if @log && debug_mode
       end
       
       def debug_http(http)
-        http.set_debug_output(debug_output) if @@debug_mode
+        http.set_debug_output(debug_output) if debug_mode
       end
 
       def debug_output
         STDOUT
       end
 
+      def debug_mode(mode=nil)
+        MODES[:debug]=mode unless mode.nil?
+        MODES[:debug]
+      end
+
+      def autofix_mode(mode=nil)
+        MODES[:autofix]=mode unless mode.nil?
+        MODES[:autofix]
+      end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_uri
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Nikulin Aleksander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies: []
 description: To simplify working with url
 email: nikulinaleksandr@gmail.com