rhack 1.0.0.rc4 → 1.0.0

data/README.md

@@ -11,7 +11,7 @@ RHACK is Ruby Http ACcess Kit: curl-based web-client framework created for devel
   * ::Scout (Curl::Easy wrapper with transparent cookies and extendable anonimization processing, detailed request/response info, callbacks and retry configuration)
   * ::Frame (Scout array wrapper with smart request interpretor, load balancing and extendable response processor)
 * Support of javascript processing on loaded html pages is included (johnson gem)
-* Web-service abstraction implementing some examples of how to use this library
+* Web-service-client abstraction implementing some examples of how to use this library
 
 ---
 
@@ -19,7 +19,7 @@ It's still randomly documented since it's just my working tool.
 
 #### Main goals for 1.x
 
-* Service subclass for OAuth2 with a full set of abstract authorizaztion and API methods. Main idea is a per-user key-value token storage with a respect of expiration timing.
+* Client subclass for OAuth2 with a full set of abstract authorizaztion and API methods. Main idea is a per-user key-value token storage with a handling of tokens expiration.
 * Redis-based cache storage for scrapers data.
 * More agile response postprocessing configuration. Instead of using :json, :hash etc as a flag, define some "before filters" in the Page and chain them.
 * Route :xhr option to the Scout; add some transparent control on user-agents: desktop, mobile, randomly predefined...
@@ -46,6 +46,9 @@ It's still randomly documented since it's just my working tool.
   
 * ::ScoutSquad
   * Automatically Curl.execute on #next and #rand if Carier Thread is exited without an exception
+  
+* ::Service
+  * Is renamed to Client what is more sensible. RHACK::Service is still usable as alias
 
 * Structural changes
   * Updated and documented rhack.yml.template that now lies in <gemdir>/config

data/lib/rhack/curl/easy.rb

@@ -5,15 +5,24 @@ module Curl
     __init__
     attr_accessor :base
     
+    def outdate!
+      @outdated = true
+    end
+    
     def res
-      Response(self)
+      if @res && !@outdated
+        @res
+      else 
+        @outdated = false
+        @res = Response(self)
+      end
     end
-    alias response res
+    alias :response :res
     
     def req
       res.req
     end
-    alias request req
+    alias :request :req
     
     def host
       url.parse(:uri).root

data/lib/rhack/scout.rb

@@ -92,20 +92,13 @@ module RHACK
     end
     alias :inspect :to_s
     
-    def update_res
-      @outdated = false
-      @res = @http.res
-      @headers = nil
-      @res
-    end
-    
     def res
-      if @res && !@outdated
-             @res
-      else update_res end
+      @http.res
     end
     
-    def req; res.req   end
+    def req 
+      res.req
+    end
     
     def dump
       str = "IP: #{@proxystr}\nRequest: "
@@ -222,7 +215,7 @@ module RHACK
 
       @http.on_complete {|c|
         @error = nil
-        @outdated = true
+        c.outdate!
         ProcCookies c.res if @cookieProc
         # We cannot just cancel on_complete in on_redirect block
         # because loadGet will immediately reset on_complete back
@@ -239,7 +232,7 @@ module RHACK
           L.log << "Got Curl::Err::CurlOK, response was: #{c.res}"
         else
           @http.on_complete &Proc::NULL
-          @outdated = true
+          c.outdate!
           if retry? e
             L.debug "#{e[0]} -> reloading scout"
             #load uri, headers, not_redir, relvl, &callback

data/lib/rhack/services.rb

@@ -1,2 +1,8 @@
 require 'rhack'
-require 'rhack/services/base'
+require 'rhack/services/base'
+
+module RHACK
+  for name in [:Service, :ServiceError]
+    autoload name, 'rhack/services/compatibility'
+  end
+end

data/lib/rhack/services/base.rb

@@ -1,19 +1,11 @@
 # encoding: utf-8
 
-class Class
-  def alias_constant(name)
-    class_eval %{
-    def #{name}(key=nil)
-      key ? self.class::#{name}[key] : self.class::#{name}
-    end}
-  end unless defined? alias_constant
-end
-
-# Вызовы сервисов всегда ждут и возвращают обработанный ответ, если вызвваны без блока. 
-# В противном случае используется событийная модель и обработанный ответ передаётся в блок.
+# TODO 1.0+: опция для клиента, чтобы это описание имело смысл, т.к. сейчас это ложь:
+#   Вызовам клиентов всегда следует ждут и возвращают обработанный ответ, если вызвваны без блока. 
+#   В противном случае используется событийная модель и обработанный ответ передаётся в блок.
 module RHACK
 
-  class Service
+  class Client
     attr_accessor :f
     alias_constant :URI
     
@@ -54,6 +46,5 @@ module RHACK
     
   end
   
-  class ServiceError < Exception; end
-  
-end
+  class ClientError < Exception; end
+end

data/lib/rhack/services/compatibility.rb

@@ -0,0 +1,4 @@
+module RHACK
+  Service = Client
+  ServiceError = ClientError
+end

data/lib/rhack/version.rb

@@ -1,3 +1,3 @@
 module RHACK
-  VERSION = '1.0.0.rc4'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rhack
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc4
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -180,6 +180,7 @@ files:
 - lib/rhack/scout_squad.rb
 - lib/rhack/services.rb
 - lib/rhack/services/base.rb
+- lib/rhack/services/compatibility.rb
 - lib/rhack/services/examples.rb
 - lib/rhack/version.rb
 - lib/rhack_in.rb
@@ -203,9 +204,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24