rhack 1.2.1 → 1.2.7

data/ext/curb-original/curb_postfield.h

@@ -1,40 +1,40 @@
-/* curb_postfield.h - Field class for POST method
- * Copyright (c)2006 Ross Bamford. 
- * Licensed under the Ruby License. See LICENSE for details.
- * 
- * $Id: curb_postfield.h 4 2006-11-17 18:35:31Z roscopeco $
- */
-#ifndef __CURB_POSTFIELD_H
-#define __CURB_POSTFIELD_H
-
-#include "curb.h"
-
-/* 
- * postfield doesn't actually wrap a curl_httppost - instead,
- * it just holds together some ruby objects and has a C-side 
- * method to add it to a given form list during the perform.
- */
-typedef struct {  
-  /* Objects we associate */
-  VALUE name;  
-  VALUE content;
-  VALUE content_type;
-  VALUE content_proc;
-  VALUE local_file;
-  VALUE remote_file;
-  
-  /* this will sometimes hold a string, which is the result
-   * of the content_proc invocation. We need it to hang around.
-   */
-  VALUE buffer_str;
-} ruby_curl_postfield;
-
-extern VALUE cCurlPostField;
-
-void append_to_form(VALUE self, 
-                    struct curl_httppost **first, 
-                    struct curl_httppost **last);
-
-void init_curb_postfield();
-
-#endif
+/* curb_postfield.h - Field class for POST method
+ * Copyright (c)2006 Ross Bamford. 
+ * Licensed under the Ruby License. See LICENSE for details.
+ * 
+ * $Id: curb_postfield.h 4 2006-11-17 18:35:31Z roscopeco $
+ */
+#ifndef __CURB_POSTFIELD_H
+#define __CURB_POSTFIELD_H
+
+#include "curb.h"
+
+/* 
+ * postfield doesn't actually wrap a curl_httppost - instead,
+ * it just holds together some ruby objects and has a C-side 
+ * method to add it to a given form list during the perform.
+ */
+typedef struct {  
+  /* Objects we associate */
+  VALUE name;  
+  VALUE content;
+  VALUE content_type;
+  VALUE content_proc;
+  VALUE local_file;
+  VALUE remote_file;
+  
+  /* this will sometimes hold a string, which is the result
+   * of the content_proc invocation. We need it to hang around.
+   */
+  VALUE buffer_str;
+} ruby_curl_postfield;
+
+extern VALUE cCurlPostField;
+
+void append_to_form(VALUE self, 
+                    struct curl_httppost **first, 
+                    struct curl_httppost **last);
+
+void init_curb_postfield();
+
+#endif

data/ext/curb-original/curb_upload.c

@@ -1,80 +1,80 @@
-/* curb_upload.c - Curl upload handle
- * Copyright (c)2009 Todd A Fisher. 
- * Licensed under the Ruby License. See LICENSE for details.
- */
-#include "curb_upload.h"
-extern VALUE mCurl;
-VALUE cCurlUpload;
-
-#ifdef RDOC_NEVER_DEFINED
-  mCurl = rb_define_module("Curl");
-#endif
-
-static void curl_upload_mark(ruby_curl_upload *rbcu) {
-  if (rbcu->stream && !NIL_P(rbcu->stream)) rb_gc_mark(rbcu->stream);
-}
-static void curl_upload_free(ruby_curl_upload *rbcu) {
-  free(rbcu);
-}
-
-/*
- * call-seq:
- *   internal class for sending large file uploads
- */
-VALUE ruby_curl_upload_new(VALUE klass) {
-  VALUE upload;
-  ruby_curl_upload *rbcu = ALLOC(ruby_curl_upload);
-  rbcu->stream = Qnil;
-  rbcu->offset = 0;
-  upload = Data_Wrap_Struct(klass, curl_upload_mark, curl_upload_free, rbcu);
-  return upload;
-}
-
-/*
- * call-seq:
- *   internal class for sending large file uploads
- */
-VALUE ruby_curl_upload_stream_set(VALUE self, VALUE stream) {
-  ruby_curl_upload *rbcu;
-  Data_Get_Struct(self, ruby_curl_upload, rbcu);
-  rbcu->stream = stream;
-  return stream;
-}
-/*
- * call-seq:
- *   internal class for sending large file uploads
- */
-VALUE ruby_curl_upload_stream_get(VALUE self) {
-  ruby_curl_upload *rbcu;
-  Data_Get_Struct(self, ruby_curl_upload, rbcu);
-  return rbcu->stream;
-}
-/*
- * call-seq:
- *   internal class for sending large file uploads
- */
-VALUE ruby_curl_upload_offset_set(VALUE self, VALUE offset) {
-  ruby_curl_upload *rbcu;
-  Data_Get_Struct(self, ruby_curl_upload, rbcu);
-  rbcu->offset = FIX2LONG(offset);
-  return offset;
-}
-/*
- * call-seq:
- *   internal class for sending large file uploads
- */
-VALUE ruby_curl_upload_offset_get(VALUE self) {
-  ruby_curl_upload *rbcu;
-  Data_Get_Struct(self, ruby_curl_upload, rbcu);
-  return INT2FIX(rbcu->offset);
-}
-
-/* =================== INIT LIB =====================*/
-void init_curb_upload() {
-  cCurlUpload = rb_define_class_under(mCurl, "Upload", rb_cObject);
-  rb_define_singleton_method(cCurlUpload, "new", ruby_curl_upload_new, 0);
-  rb_define_method(cCurlUpload, "stream=", ruby_curl_upload_stream_set, 1);
-  rb_define_method(cCurlUpload, "stream", ruby_curl_upload_stream_get, 0);
-  rb_define_method(cCurlUpload, "offset=", ruby_curl_upload_offset_set, 1);
-  rb_define_method(cCurlUpload, "offset", ruby_curl_upload_offset_get, 0);
-}
+/* curb_upload.c - Curl upload handle
+ * Copyright (c)2009 Todd A Fisher. 
+ * Licensed under the Ruby License. See LICENSE for details.
+ */
+#include "curb_upload.h"
+extern VALUE mCurl;
+VALUE cCurlUpload;
+
+#ifdef RDOC_NEVER_DEFINED
+  mCurl = rb_define_module("Curl");
+#endif
+
+static void curl_upload_mark(ruby_curl_upload *rbcu) {
+  if (rbcu->stream && !NIL_P(rbcu->stream)) rb_gc_mark(rbcu->stream);
+}
+static void curl_upload_free(ruby_curl_upload *rbcu) {
+  free(rbcu);
+}
+
+/*
+ * call-seq:
+ *   internal class for sending large file uploads
+ */
+VALUE ruby_curl_upload_new(VALUE klass) {
+  VALUE upload;
+  ruby_curl_upload *rbcu = ALLOC(ruby_curl_upload);
+  rbcu->stream = Qnil;
+  rbcu->offset = 0;
+  upload = Data_Wrap_Struct(klass, curl_upload_mark, curl_upload_free, rbcu);
+  return upload;
+}
+
+/*
+ * call-seq:
+ *   internal class for sending large file uploads
+ */
+VALUE ruby_curl_upload_stream_set(VALUE self, VALUE stream) {
+  ruby_curl_upload *rbcu;
+  Data_Get_Struct(self, ruby_curl_upload, rbcu);
+  rbcu->stream = stream;
+  return stream;
+}
+/*
+ * call-seq:
+ *   internal class for sending large file uploads
+ */
+VALUE ruby_curl_upload_stream_get(VALUE self) {
+  ruby_curl_upload *rbcu;
+  Data_Get_Struct(self, ruby_curl_upload, rbcu);
+  return rbcu->stream;
+}
+/*
+ * call-seq:
+ *   internal class for sending large file uploads
+ */
+VALUE ruby_curl_upload_offset_set(VALUE self, VALUE offset) {
+  ruby_curl_upload *rbcu;
+  Data_Get_Struct(self, ruby_curl_upload, rbcu);
+  rbcu->offset = FIX2LONG(offset);
+  return offset;
+}
+/*
+ * call-seq:
+ *   internal class for sending large file uploads
+ */
+VALUE ruby_curl_upload_offset_get(VALUE self) {
+  ruby_curl_upload *rbcu;
+  Data_Get_Struct(self, ruby_curl_upload, rbcu);
+  return INT2FIX(rbcu->offset);
+}
+
+/* =================== INIT LIB =====================*/
+void init_curb_upload() {
+  cCurlUpload = rb_define_class_under(mCurl, "Upload", rb_cObject);
+  rb_define_singleton_method(cCurlUpload, "new", ruby_curl_upload_new, 0);
+  rb_define_method(cCurlUpload, "stream=", ruby_curl_upload_stream_set, 1);
+  rb_define_method(cCurlUpload, "stream", ruby_curl_upload_stream_get, 0);
+  rb_define_method(cCurlUpload, "offset=", ruby_curl_upload_offset_set, 1);
+  rb_define_method(cCurlUpload, "offset", ruby_curl_upload_offset_get, 0);
+}

data/ext/curb-original/curb_upload.h

@@ -1,30 +1,30 @@
-/* curb_upload.h - Curl upload handle
- * Copyright (c)2009 Todd A Fisher. 
- * Licensed under the Ruby License. See LICENSE for details.
- */
-#ifndef __CURB_UPLOAD_H
-#define __CURB_UPLOAD_H
-
-#include "curb.h"
-
-#include <curl/easy.h>
-
-/*
- * Maintain the state of an upload e.g. for putting large streams with very little memory
- * out to a server. via PUT requests
- */
-typedef struct {
-  VALUE stream;
-  size_t offset;
-} ruby_curl_upload;
-
-extern VALUE cCurlUpload;
-void init_curb_upload();
-
-VALUE ruby_curl_upload_new(VALUE klass);
-VALUE ruby_curl_upload_stream_set(VALUE self, VALUE stream);
-VALUE ruby_curl_upload_stream_get(VALUE self);
-VALUE ruby_curl_upload_offset_set(VALUE self, VALUE offset);
-VALUE ruby_curl_upload_offset_get(VALUE self);
-
-#endif
+/* curb_upload.h - Curl upload handle
+ * Copyright (c)2009 Todd A Fisher. 
+ * Licensed under the Ruby License. See LICENSE for details.
+ */
+#ifndef __CURB_UPLOAD_H
+#define __CURB_UPLOAD_H
+
+#include "curb.h"
+
+#include <curl/easy.h>
+
+/*
+ * Maintain the state of an upload e.g. for putting large streams with very little memory
+ * out to a server. via PUT requests
+ */
+typedef struct {
+  VALUE stream;
+  size_t offset;
+} ruby_curl_upload;
+
+extern VALUE cCurlUpload;
+void init_curb_upload();
+
+VALUE ruby_curl_upload_new(VALUE klass);
+VALUE ruby_curl_upload_stream_set(VALUE self, VALUE stream);
+VALUE ruby_curl_upload_stream_get(VALUE self);
+VALUE ruby_curl_upload_offset_set(VALUE self, VALUE offset);
+VALUE ruby_curl_upload_offset_get(VALUE self);
+
+#endif

data/lib/rhack/clients/base.rb

@@ -6,29 +6,65 @@
 module RHACK
 
   class Client
+    attr_reader :service
     attr_accessor :f
-    alias_constant :URI
+    class_attribute :frame_defaults
+    class_attribute :accounts
+    class_attribute :routes
     
-    def self.inherited(child)
-      child.class_eval {
-        include RHACK
-        __init__
-      }
+    @@frame_defaults = {}
+    @@accounts = {}
+    @@routes = {}
+    
+    class << self
+    
+      def inherited(child)
+        child.class_eval {
+          include RHACK
+          __init__
+        }
+      end
+      
+    private
+      
+      # Set routes map
+      def map(dict)
+        # URI is deprecated # backward compatibility
+        if defined? URI and URI.is Hash
+          URI.merge! dict.map_hash {|k, v| [k.to_sym, v.freeze]}
+        end
+        @@routes.merge! dict.map_hash {|k, v| [k.to_sym, v.freeze]}
+      end
+      
+      # Set default Frame options
+      def frame(dict)
+        @@frame_defaults.merge! dict
+      end
+      
+      # Set usable accounts
+      # @ dict : {symbol => {symbol => string, ...}}
+      def accounts(dict)
+        @@accounts.merge! dict
+      end
+      
     end
     
-    def initialize(service=:api, frame=nil, *args)
+    def initialize(service=:api, opts={})
       @service = service
       # first argument should be a string so that frame won't be static
-      @f = frame || Frame(URI(service) || URI(:login), *args)
+      @f = opts.is_a?(Frame) ? 
+        opts : 
+        Frame(route(service) || route(:login), @@frame_defaults.merge(opts))
     end
     
+    
     # Usable only for sync requests
     def login(*)
       Curl.run
       @f[0].cookies.clear
       json, wait, @f.opts[:json], @f.opts[:wait] = @f.opts[:json], @f.opts[:wait], false, true
-      yield @f.get(URI :login)
-      @f.get(URI :home) if URI :home
+      yield @f.get(route :login)
+      @f.get(route :home) if route :home
       @f.opts[:json], @f.opts[:wait] = json, wait
       @f.copy_cookies!
     end
@@ -40,6 +76,8 @@ module RHACK
       Curl.reload
     end
     
+    
+    
     def scrape!(page)
       __send__(:"scrape_#{@service}", page)
       if url = next_url(page)
@@ -51,6 +89,19 @@ module RHACK
       "<##{self.class.self_name}:#{@service.to_s.camelize} service via #{@f.inspect}>"
     end
     
+    # shortcuts to class variables #
+    
+    def route(name)
+      @@routes[name]
+    end
+    alias :url :route
+    # URI is deprecated # backward compatibility
+    alias :URI :route
+    
+    def account(name)
+      @@accounts[name]
+    end
+    
   end
   
   class ClientError < Exception; end

data/lib/rhack/clients/oauth.rb

@@ -91,7 +91,7 @@ module RHACK
         url_params[:redirect_uri].sub!(/^\w+/, redirect_protocol)
       end
       L.debug url_params
-      @oauth_url = URI(:oauth)[:auth] + {
+      @oauth_url = route(:oauth)[:auth] + {
         response_type: 'code', 
         client_id: OAUTH(:id),
         state: state
@@ -117,7 +117,7 @@ module RHACK
         url_params[:redirect_uri].sub!(/^\w+/, redirect_protocol)
       end
       L.debug url_params
-      @f.run({}, URI(:oauth)[:token] + {
+      @f.run({}, route(:oauth)[:token] + {
         grant_type: 'authorization_code',
         client_id: OAUTH(:id), 
         client_secret: OAUTH(:secret)
@@ -141,7 +141,7 @@ module RHACK
     end
     
     def get_application_oauth_token(&block)
-      @f.run(URI(:oauth)[:token] + {
+      @f.run(route(:oauth)[:token] + {
         grant_type: 'client_credentials',
         client_id: OAUTH(:id), 
         client_secret: OAUTH(:secret)
@@ -198,7 +198,7 @@ module RHACK
       L.debug [action_data, action, token]
       opts = {proc_result: block, headers: {'Referer' => nil}, result: CodeIndiffirentPage}.merge(opts)
       # TODO: option to 
-      @f.run(URI(:api) % {action: action} + token, opts) {|page|
+      @f.run(route(:api) % {action: action} + token, opts) {|page|
         if page.hash and page.hash != true and error = page.hash.error
           L.debug state_params
           if error.code.in([190, 100]) and state_params

data/lib/rhack/curl/easy.rb

@@ -34,6 +34,7 @@ module Curl
     
     def retry!
       @base.retry!
+      # <self> is forgotten now
     end
     
     # curb changed getters interface, so i get some shortcuts from curb/lib/curl/easy.rb

data/lib/rhack/curl/global.rb

@@ -107,6 +107,7 @@ module Curl
       L.debug caller
       if @@carier_thread
         L.log "Recalling Carier thread"
+        L.debug {caller[1..10]}
         @@carier_thread.kill
         sleep 1
       else
@@ -118,6 +119,7 @@ module Curl
     def recall!
       if @@carier_thread
         L.warn "Recalling thread and resetting Carier!!!"
+        L.debug {caller[1..10]}
         @@carier_thread.kill
         @@carier_thread = nil
         reset_carier!

data/lib/rhack/curl/response.rb

@@ -66,9 +66,11 @@ module Curl
         @req.range   = $1.to_i .. $2.to_i
       end
       if easy.base and @req.meth = easy.base.last_method and @req.meth.in [:post, :put]
-        @req.body	  = easy.post_body.dup
         if @req.meth == :post
-          @req.mp	  = easy.multipart_form_post?
+          @req.body	= easy.post_body.dup
+          @req.mp	    = easy.multipart_form_post?
+        else
+          @req.body	= easy.base.body.dup
         end
       end
     end

data/lib/rhack/frame.rb

@@ -25,23 +25,24 @@ module RHACK
     @@cache = {}
     
     def initialize *args
-      args << 10 unless args[-1].is Fixnum
-      args.insert -2, {} unless args[-2].is Hash
-      opts = args[-2]
-      if scouts = (opts[:scouts] || opts[:threads])
-        args[-1] = scouts
-      end
+      #args << 10 unless args[-1].is Fixnum
+      #args.insert -2, {} unless args[-2].is Hash
+      #opts = args[-2]
+      #if scouts = (opts[:scouts] || opts[:threads])
+      #  args[-1] = scouts
+      #end
+      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)
-      args[-2] = @opts
       if args[0].is String
-        url = args[0]
+        url = args[0].dup
         'http://' >> url if url !~ /^\w+:\/\//
         update_loc url
       else
         @loc = {}
         @static = false
       end
-      @ss  = ScoutSquad *args
+      @ss  = ScoutSquad @loc.href, @opts, scouts_count
     end
     
     def update_loc url
@@ -91,8 +92,14 @@ module RHACK
       "<#Frame @ #{@ss.untargeted ? 'no target' : @loc.root}: #{sssize} #{sssize == 1 ? 'scout' : 'scouts'}#{', static'+(' => '+@static.protocol if @static.is(Hash)) if @static}, cookies #{@ss[0].cookieProc ? 'on' : 'off'}>"
     end
     
-    # opts are :eval, :json, :hash, :wait, :proc_result, :save_result, :load_scripts, 
-    # :zip, :thread_safe, :result, :stream, :raw, :xhr + any opts for Scouts in one hash
+    # All opts going in one hash.
+    # Opts for Frame:
+    #   :wait, :proc_result, :save_result, :zip, :thread_safe, :result, :stream, :raw, :xhr, :content_type
+    # Opts passed to Page:
+    #   :xml, :html, :json, :hash, :eval, :load_scripts
+    # Opts for Scout:
+    #   :headers, :redir, :relvl
+    # TODO: describe options
     def exec *args, &callback
       many, order, orders, with_opts = interpret_request *args
       L.log({:many => many, :order => order, :orders => orders, :with_opts => with_opts})
@@ -116,31 +123,42 @@ module RHACK
       L.log [body, mp, url, opts]
       zip = opts.delete :zip
       verb = opts.delete :verb
-      many = order = orders = post = false
-      # Default options set is for POST
-      if mp.is String or mp.kinda Array and !(url.is String or url.kinda Array)
-      # if second arg is String, then that's url
-        url, mp, post = mp.dup, false, true
-      #  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
-        url = nil
+      post = put = verb == :put
+      many = order = orders = false
+      
+      if put
+        # If request is PUT then first argument is always body
+        if mp.is String
+          # and second is URL if specified
+          url = mp.dup
+        else
+          url = nil
+        end
       else
-        url = url.dup if url
-        mp, post = !!mp, true
+        # Default options set is for POST
+        if mp.is String or mp.kinda Array and !(url.is String or url.kinda Array)
+        # if second arg is String then it's URL
+          url, mp, post = mp.dup, false, true
+        # 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
+          url = nil
+        else
+          url = url.dup if url
+          mp, post = !!mp, true
+        end
       end
       
       if post
-        put = verb == :put
         validate_zip url, body if zip
         if zip or url.kinda Array or body.kinda Array
           many    = true
           unless put or body.kinda [Hash]
-            raise TypeError, "body of post request must be a hash array, params was
+            raise TypeError, "body of POST request must be a hash array, params was
        (#{args.inspect[1..-2]})"
           end
      
@@ -157,9 +175,16 @@ module RHACK
             orders.each {|o| o.unshift :loadPost and o.insert 2, mp}
           end
         else
-          unless put or body.is Hash
-            raise TypeError, "body of post request must be a hash, params was
-       (#{args.inspect[1..-2]})"
+          if put
+            unless body.is String
+              raise TypeError, "body of PUT request must be a string, params was
+         (#{args.inspect[1..-2]})"
+            end
+          else
+            unless body.is Hash
+              raise TypeError, "body of POST request must be a hash, params was
+         (#{args.inspect[1..-2]})"
+            end
           end
      
           url = validate url
@@ -184,10 +209,21 @@ module RHACK
       opts[:wait] = opts[:sync] if :sync.in opts
       opts[:wait] = true if !:wait.in(opts) and 
                     :proc_result.in(opts) ? !opts[:proc_result] : opts[:save_result]
+                    
       opts[:eval] = false if opts[:json] or opts[:hash] or opts[:raw]
       opts[:load_scripts] = self if opts[:load_scripts]
       opts[:stream] = true if opts[:raw]
+      
       (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
+        else
+          raise ArgumentError, "failed to detect Mime::Type by extension: #{opts[:content_type]}
+      (#{args.inspect[1..-2]})"
+        end
+      end
+      
       [many, order, orders, opts]
     end
     
@@ -292,11 +328,13 @@ module RHACK
           RMTools.rw @write_to+'/'+order[-2].sub(/^[a-z]+:\/\//, ''), curl.res.body.xml_to_utf
         end
         if opts[:raw]
-          page.res = yield curl
+          page.res = block_given? ? yield(curl) : curl.body_str
       #   here +curl.res.body+ becomes empty
+      #   curl.res.body.+xml_to_utf+ -- maybe this is problem?
         elsif page.process(curl, opts)
           @@cache[page.href] = page if order[0] == :loadGet and @use_cache
           run_callbacks! page, opts, &callback
+        # nothing to do here if process returns nil or false
         end
       }
       # > Carier.requests++