rhack 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59733c3e455fc7bc060d4d5aaa5c72d867902175
-  data.tar.gz: 0b5ba10c17f10d1a61abdd54b2825b997aa33ae5
+  metadata.gz: c9a23976006b8b0d6d4f852d88ee3a22c53ae383
+  data.tar.gz: 0845633001556509c181211fbe2f08246a66d3d4
 SHA512:
-  metadata.gz: 6e2ac91fcc005974dbf5ede8276398197b60bee078a00f058f2d96f50e6cc22106bf9a18593aaaadddb8fd21555cdce05eb556563a5add4f86bfc1c94a01a897
-  data.tar.gz: 8d02020626a8cc572dc700208b885f0c29e1dade67d62a2f80decffc28a07ecd359e56741b4acc086f37a3204ba657125d7dff348732f520cd5766316b0bea3d
+  metadata.gz: d01df2fffd1955bdfc118529a86ab8937225a5c5f8d528738fc823f2a2bb347b4a364c3c610bca079f63bccca6a2d1eb8a5988b3cd7ecb9cbc45e8fd347e0804
+  data.tar.gz: 3e2ee98e26b2a6e2d47e45375ab337284a495ccf9cc4e2c7a643c9c45fecfb6b732ad794ce145a13fe94d635847b682f851fd46be098d8df4efae58b65e33184

data/lib/rhack/frame.rb

@@ -31,7 +31,7 @@ module RHACK
       #if scouts = (opts[:scouts] || opts[:threads])
       #  args[-1] = scouts
       #end
-      opts = args.find_by_class Hash
+      opts = args.find_by_class(Hash) || {}
       scouts_count = opts[:scouts] || opts[:threads] || 10
       @opts = {:eval => Johnson::Enabled, :redir => true, :cp => true, :result => Page}.merge!(opts)
       if args[0].is String
@@ -123,7 +123,8 @@ module RHACK
       L.log [body, mp, url, opts]
       zip = opts.delete :zip
       verb = opts.delete :verb
-      post = put = verb == :put
+      put = verb == :put
+      post = put || verb == :post
       many = order = orders = false
       
       if put
@@ -142,9 +143,13 @@ module RHACK
         # L.debug "URL #{url.inspect} has been passed as second argument instead of third"
         # But if we have only one argument actually passed 
         # except for options hash then believe it's GET
-        elsif body.is String or body.kinda [String]
-          L.debug "first parameter (#{body.inspect}) was implicitly taken as url#{' '+body.class if body.kinda Array}, but last paramter is of type #{url.class}, too" if url
-          url = body.dup
+        elsif body.is String or body.kinda [String] # mp is boolean
+          if post
+            url = url.dup if url
+          else
+            L.debug "first parameter (#{body.inspect}) was implicitly taken as url#{' '+body.class if body.kinda Array}, but last paramter is of type #{url.class}, too" if url
+            url = body.dup
+          end
         elsif !body
           url = nil
         else
@@ -181,8 +186,8 @@ module RHACK
          (#{args.inspect[1..-2]})"
             end
           else
-            unless body.is Hash
-              raise TypeError, "body of POST request must be a hash, params was
+            unless body.is Hash or body.is String
+              raise TypeError, "body of POST request must be a hash or a string params was
          (#{args.inspect[1..-2]})"
             end
           end
@@ -216,11 +221,15 @@ module RHACK
       
       (opts[:headers] ||= {})['X-Requested-With'] = 'XMLHttpRequest' if opts[:xhr]
       if opts[:content_type]
-        if mime_type = Mime::Type.lookup_by_extension(opts[:content_type])
-          (opts[:headers] ||= {})['Content-Type'] = mime_type
+        if opts[:content_type].is Symbol
+          if mime_type = Mime::Types.of(opts[:content_type])[0]
+            (opts[:headers] ||= {})['Content-Type'] = mime_type.content_type
+          else
+            raise ArgumentError, "failed to detect Mime::Type by extension: #{opts[:content_type]}
+        (#{args.inspect[1..-2]})"
+          end
         else
-          raise ArgumentError, "failed to detect Mime::Type by extension: #{opts[:content_type]}
-      (#{args.inspect[1..-2]})"
+          (opts[:headers] ||= {})['Content-Type'] = opts[:content_type]
         end
       end
       

data/lib/rhack/scout.rb

@@ -133,22 +133,37 @@ module RHACK
       uri
     end
 
-    def mkBody(params, multipart=nil)
+    def mkBody(params, multipart=false)
       if multipart
         @http.multipart_post_body = @body = params.map {|k, v|
           v = v.call if v.is Proc
-          if k =~ /^f:/
-            Curl::PostField.file(k[2..-1], "application/octet-stream", 
-                                     "#{randstr(16, :hex)}.jpg", v+randstr )
-          elsif k =~ /^p:/
-            Curl::PostField.file(k[2..-1], "application/octet-stream", 
-                                     File.basename(f), read(v)                   )
+          if v[%r(^file://(.+))] or v.is Hash
+            path = $1 || v[:path]
+            name = v.is(Hash) && v[:name] ||
+              File.basename(path)
+            content_type = v.is(Hash) && v[:content_type].to_s ||
+              (Mime::Types.of(path)[0] || {}).content_type ||
+              "application/octet-stream"
+            Curl::PostField.file(k, type, name, read(path))
           else
             Curl::PostField.content(k.to_s, v.to_s)
           end
         }
       else
-        @http.post_body = @body = params.urlencode
+        @http.post_body = case params
+        when IO
+          @body = params.read
+          params.close
+          @body
+        when String
+          @body = if params[%r(^file://(.+))]
+            read $1
+          else
+            params
+          end
+        else
+          @body = params.urlencode
+        end
       end
     end
     
@@ -312,6 +327,9 @@ module RHACK
     def loadPost(*argv, &callback)
       hash, multipart, uri, opts = argv.get_opts [@body, @http.multipart_form_post?, @path], :headers => {}, :redir => false, :relvl => 2
       @http.delete = false
+      unless hash.is Hash # not parameterized
+        opts[:headers] = opts[:headers].reverse_merge 'Content-Type' => 'application/octet-stream'
+      end
       mkBody hash, multipart.b
       @last_method	= :post
       if block_given?

data/lib/rhack/version.rb

@@ -1,3 +1,3 @@
 module RHACK
-  VERSION = '1.2.8'
+  VERSION = '1.2.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhack
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Curl-based web-client framework created for developing web-scrapers/bots