tiny_grabber 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab45d7456aafa8950adab83118a361262dedbe36
-  data.tar.gz: 53d8c891ba604d1cbc36902e26936aff799caaac
+  metadata.gz: 9125f8132b04b1a08e64a47abf7ccb5085688b55
+  data.tar.gz: 050aad4742cdeeba67cfc64dad8c6d9c0a02ec97
 SHA512:
-  metadata.gz: a4c98e942cd4e60e107d5855752b5feea73394f74efb189e3e8d126f687add4f41fb44a4401190a28b43648618cce413ceb2d44711b44da291db6c8aacb0d684
-  data.tar.gz: 264df5fb5380e658f1f4c508c973d385a90a61fe08afd9c13baa9c51cab9eb5ba1d306b138ec9800bd2cfe508b627b88fd45249ff5ea5240f9f8a8fc29dce6cc
+  metadata.gz: d1ff3deb449bc1aedf86b2886156043decf28cf327ec25e30cd4725f07f5dc82faa01c803aa161bf573e3799f747a15673919fb470db75546810a932ee513093
+  data.tar.gz: c977e50867454e3af09e00e6b9f69f5b8efc7b22aaa0127b3c54c8aee206692359322a0c4418b81ab23bbc4a54a562f197f9fc98088225d97a70d1d1699d83f2

data/README.md

@@ -44,8 +44,11 @@ auth = { username: '', password: '' }
 # Request HTTP type by default is GET. You can send POST request with setting post params. Also you cat send empty POST request.
 post = { some_data: '' }
 
-# Get response
-response = TinyGrabber.get url, headers: headers, proxy: proxy, auth: auth, post: post
+# HTTP GET request
+response = TinyGrabber.get url, headers: headers, proxy: proxy, auth: auth
+
+# HTTP GET request
+response = TinyGrabber.post url, post, headers: headers, proxy: proxy, auth: auth
 
 # HTTP answer code
 p response.code
@@ -62,6 +65,8 @@ p response.cookies
 
 ## Changelog
 
+* *v 0.1.0*
+    * Add TinyGrabber.post method for HTTP POST request
 * *v 0.0.7*
     * Add POST request
     * Add Basic Authentication

data/lib/tiny_grabber/version.rb

@@ -1,4 +1,4 @@
 class TinyGrabber
   # Version number
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/lib/tiny_grabber.rb

@@ -8,10 +8,15 @@ require 'tiny_grabber/http'
 # Main class for TinyGrabber
 class TinyGrabber
 
+  @uri
+  @params
+  @http
+  @request
+
   ##
   # Get Net::HTTP object for content from remote single page
-  # [url (string)] Link on content
-  # [params (hash)] Addition setting
+  # [url (string)] Link to resource
+  # [params (hash)] Request params
   # * [proxy (hash)] Configuration of remote proxy server
   #   * *ip* address of remote proxy server
   #   * *port* of remote proxy server
@@ -22,58 +27,121 @@ class TinyGrabber
   # * [auth (hash)] Basic Authentication
   #   * *username* Authenticate username
   #   * *password* Authenticate password
-  # * [post (hash)] POST data
   #
   # = Example
   #   TinyGrabber.get url, headers: { 'Content-Type' => 'application/json' }, proxy: { ip: 'xx.xx.xx.xx', port: xx, proxy_type: :socks }
   #
-  # @param url Link for content
-  # @param params Addition setting
+  # @param url Link to resource
+  # @param params Request params
   #
   def self.get url, params = {}
-    uri = URI(URI.escape(url))
+    @uri = set_url url
+    @params = convert_params_to_sym params
+    @http = set_http_connect
+    @request = Net::HTTP::Get.new(@uri.request_uri)
+    set_basic_auth
+    set_headers
+    get_request
+  end
+
+
+  ##
+  # Get Net::HTTP object for content from remote single page
+  # [url (string)] Link to resource
+  # [data (hash)] Post data
+  # [params (hash)] Request params
+  # * [proxy (hash)] Configuration of remote proxy server
+  #   * *ip* address of remote proxy server
+  #   * *port* of remote proxy server
+  #   * *proxy_type* of remote proxy server
+  #     * *http* for http(s) proxy servers (by default)
+  #     * *socks* for socks4/5 proxy servers
+  # * [headers (hash)] Headers
+  # * [auth (hash)] Basic Authentication
+  #   * *username* Authenticate username
+  #   * *password* Authenticate password
+  #
+  # = Example
+  #   TinyGrabber.post url, data, headers: { 'Content-Type' => 'application/json' }, proxy: { ip: 'xx.xx.xx.xx', port: xx, proxy_type: :socks }
+  #
+  # @param url Link to resource
+  # @param params Request params
+  #
+  def self.post url, data, params = {}
+    @uri = set_url url
+    data = convert_params_to_sym data
+    @params = convert_params_to_sym params
+    @http = set_http_connect
+    @request = Net::HTTP::Post.new(@uri.request_uri)
+    @request.set_form_data(data)
+    set_basic_auth
+    set_headers
+    get_request
+  end
+
+  private
 
-    params = convert_params_to_sym params
+  # Convert all params key to symbols
+  #
+  # @param params Request params
+  #
+  def self.convert_params_to_sym params
+    params.is_a?(Hash) ? params.inject({}) { |h, (k, v)| h[k.to_sym] = convert_params_to_sym v; h } : params
+  end
+
+  # Convert URL to URI
+  #
+  # @param url Link to resource
+  #
+  def self.set_url url
+    URI(URI.escape(url))
+  end
 
-    # Use proxy for request
-    if params[:proxy]
-      if ['socks', :socks].include?(params[:proxy][:proxy_type])
-        http = Net::HTTP.SOCKSProxy(params[:proxy][:ip], params[:proxy][:port])
+
+  # Use proxy for request
+  #
+  def self.set_http_connect
+    if @params[:proxy]
+      if ['socks', :socks].include?(@params[:proxy][:proxy_type])
+        Net::HTTP.SOCKSProxy(@params[:proxy][:ip], @params[:proxy][:port])
       else
-        http = Net::HTTP::Proxy(params[:proxy][:ip], params[:proxy][:port])
+        Net::HTTP::Proxy(@params[:proxy][:ip], @params[:proxy][:port])
       end
     else
-      http = Net::HTTP
+      Net::HTTP
     end
+  end
 
-    # Set HTTP request type
-    if params[:post] or params.key?(:post)
-      request = Net::HTTP::Post.new(uri.request_uri)
-      request.set_form_data(params[:post])
-    else
-      request = Net::HTTP::Get.new(uri.request_uri)
-    end
 
-    # Set Basic Auth
-    if params[:auth]
-      request.basic_auth params[:auth][:username], params[:auth][:password]
+  # Set Basic Auth
+  #
+  # @param request Request object
+  # @param params Request params
+  #
+  def self.set_basic_auth
+    if @params[:auth]
+      @request.basic_auth @params[:auth][:username], @params[:auth][:password]
     end
+  end
 
-    # Set headers
-    params[:headers].each { |k, v| request.add_field(String(k), v) } if params[:headers]
 
-    # Get response
-    http.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') { |http| http.request(request) }
+  # Headers
+  #
+  # @param request Request object
+  # @param params Request params
+  #
+  def self.set_headers
+    @params[:headers].each { |k, v| @request.add_field(String(k), v) } if @params[:headers]
   end
 
-  private
 
-  # Convert all params key to symbols
+  # Make request to remote resource
   #
-  # @param params Hash
+  # @param uri URI object
+  # @param http
   #
-  def self.convert_params_to_sym params
-    params = params.inject({}) { |h, (k, v)| h[k.to_sym] = convert_params_to_sym v; h } if params.is_a?(Hash)
-    params
+  def self.get_request
+    @http.start(@uri.host, @uri.port, use_ssl: @uri.scheme == 'https') { |http| http.request(@request) }
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiny_grabber
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Aleksandr Chernyshev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-06 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: socksify