rhack 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccd52c86276421476a67a4b379fcb6275bd6f85e
-  data.tar.gz: 46efe342223575cb26eceddca4970173b7f32cdf
+  metadata.gz: 8f5a539c0ca1c92416d50ffd4609d08a69d900fe
+  data.tar.gz: fee2e42ae02b21af929a1b0b417360adc043562d
 SHA512:
-  metadata.gz: af9bbd50acdc9ee228bc3ccede8fc31da56dd762d39a96f85c847e3c223167f2aff0fff6f4ef30ee68e7d7b3fa91e51d74cf670c7b7968bd9d4ec70861ca3ae9
-  data.tar.gz: 7d0f7418a4af8d3ff2bcbfab5ec26fbca85ad0664570242255fee2822ffbf3c528ab8e4ba9979d2a545b6599a77bd80f15ab6aa2f24297bb947fdc134a7457b0
+  metadata.gz: bfda297b6b465393b6749bac236e32bd967216dbad68c4383fc3bdd1e9cbc5602efcb57513ce9c01b9b6c6416ad312b10e150a802b717932e471594744e8765b
+  data.tar.gz: e4e762cd0e9e858cd20e9bef50c0a9fb4d97b506361879b5efc49cad3d939ebb35b2e3245144fd2e9f01a7ddc033200b656d71a5e4ffa53172e84d468376d3c4

data/lib/rhack/clients/base.rb

@@ -8,13 +8,13 @@ module RHACK
   class Client
     attr_reader :service
     attr_accessor :f
-    class_attribute :frame_defaults
-    class_attribute :accounts
-    class_attribute :routes
+    class_attribute :frame_defaults, :instance_writer => false
+    class_attribute :accounts, :instance_writer => false
+    class_attribute :routes, :instance_writer => false
     
-    @@frame_defaults = {}
-    @@accounts = {}
-    @@routes = {}
+    self.frame_defaults = {}
+    self.accounts = {}
+    self.routes = {}
     
     class << self
     
@@ -33,28 +33,35 @@ module RHACK
         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]}
+        routes.merge! dict.map_hash {|k, v| [k.to_sym, v.freeze]}
       end
       
       # Set default Frame options
       def frame(dict)
-        @@frame_defaults.merge! dict
+        frame_defaults.merge! dict
       end
       
       # Set usable accounts
       # @ dict : {symbol => {symbol => string, ...}}
       def accounts(dict)
-        @@accounts.merge! dict
+        accounts.merge! dict
       end
       
     end
     
-    def initialize(service=:api, opts={})
+    def initialize(*args)
+      service, opts = args.get_opts [:api]
       @service = service
       # first argument should be a string so that frame won't be static
-      @f = opts.is_a?(Frame) ? 
-        opts : 
-        Frame(route(service) || route(:login), @@frame_defaults.merge(opts))
+      if opts.is_a?(Frame)
+        @f = opts
+      else
+        opts = frame_defaults.merge(opts)
+        if self.class.const_defined? :Result
+          opts[:result] = self.class::Result
+        end
+        @f = Frame(route(service) || route(:login), opts)
+      end
     end
     
     
@@ -79,7 +86,7 @@ module RHACK
     
     
     def scrape!(page)
-      __send__(:"scrape_#{@service}", page)
+      __send__(:"scrape_#@service", page)
       if url = next_url(page)
         @f.get(url) {|next_page| scrape!(next_page)}
       end
@@ -92,14 +99,14 @@ module RHACK
     # shortcuts to class variables #
     
     def route(name)
-      @@routes[name]
+      routes[name]
     end
     alias :url :route
     # URI is deprecated # backward compatibility
     alias :URI :route
     
     def account(name)
-      @@accounts[name]
+      accounts[name]
     end
     
   end

data/lib/rhack/frame.rb

@@ -331,12 +331,14 @@ module RHACK
       # if no spare scouts can be found, squad simply waits for first callbacks to complete
       s = @ss.next
       s.http.on_failure {|curl, error|
-        s.process_failure(*error)
-        if opts[:raw]
-          page.res = s.error
-        elsif page.process(curl, opts)
-          run_callbacks! page, opts, &callback
-          # nothing to do here if process returns nil or false
+        if s.process_failure(*error)
+          # curl itself has decided not to retry a request
+          if opts[:raw]
+            page.res = s.error
+          elsif page.process(curl, opts)
+            run_callbacks! page, opts, &callback
+            # nothing to do here if process returns nil or false
+          end
         end
       }
       s.send(*(order << opts)) {|curl|

data/lib/rhack/scout.rb

@@ -208,11 +208,11 @@ module RHACK
         cks.map2 {|k, v| Cookie(k, v)}   
     end
     
-    def retry?(eclass)
+    def retry?(curl_err)
       # sites = ['0chan.ru', '2-ch.ru', 'www.nomer.org', 'nomer.org'].select_in('http://www.nomer.org') = ['www.nomer.org', 'nomer.org']
       sites = (@@retry.keys + @retry.keys).select_in @root
       return false if sites.empty?
-      errname = eclass.self_name
+      errname = curl_err.self_name
       # retry = ['www.nomer.org', 'nomer.org'].any? {|www| {'nomer.org' => ['TimeoutError']}[www].include? 'TimeoutError'}
       sites.any? {|site|
         (@@retry[site] || []).include? errname or 
@@ -235,6 +235,8 @@ module RHACK
       !loaded?
     end
     
+    # - if curl should retry request based on Curl::Err class only
+    #   => false
     def process_failure(curl_err, message)
       @error = curl_err.new message
       #@error = [curl_err, message] # old
@@ -245,10 +247,12 @@ module RHACK
       if retry? curl_err
         L.debug "#{curl_err} -> reloading scout"
         retry!
+        false
       else
         L.debug "#{curl_err} -> not reloading scout"
         raise @error if @raise_err
         #raise *@error if @raise_err # old
+        true
       end
     end
     

data/lib/rhack/version.rb

@@ -1,3 +1,3 @@
 module RHACK
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhack
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmtools