rhack 0.2.2 → 0.3.0

data/History.txt

@@ -1,4 +0,0 @@
-=== Version 1.0.0
-
-* Divided by classes and packed as gem
-

data/Manifest.txt

@@ -55,7 +55,6 @@ test/test_frame.rb
 ./Rakefile
 ./Manifest.txt
 ./CURB-LICENSE
-./License.txt
 ./README.txt
 ./Gemfile
 ./History.txt

data/README.txt

@@ -1,7 +1,7 @@
 ## RHACK
 
 Rhack is Ruby Http ACcess Kit -- curl-based web-client for developing web-clients 
-applications such as webscrappers.
+applications.
 
 ## License
 

data/Rakefile

@@ -8,13 +8,13 @@ rescue LoadError
 end
 
 compile_manifest
-RHACK_VERSION = '0.2.2'
+RHACK_VERSION = '0.3.0'
 begin
     require 'hoe'
     config = Hoe.spec "rhack" do |h|
         h.developer("Sergey Baev", "tinbka@gmail.com")
 
-        h.description = 'Webscrapping library based on curb gem extension and libxml-ruby (and optionally Johnson and ActiveRecord)'
+        h.description = 'Webscraping library based on curb gem extension and libxml-ruby (and optionally Johnson and ActiveRecord)'
        # h.summary = h.description
         h.url = 'http://github.com/tinbka'
        

data/ext/curb/curb_easy.c

@@ -212,6 +212,12 @@ static void ruby_curl_easy_free(ruby_curl_easy *rbce) {
   if (rbce->curl) {
     curl_easy_cleanup(rbce->curl);
   }
+  
+  if (rbce->first != NULL) {
+    curl_formfree(rbce->first);
+    rbce->first = NULL;
+    rbce->last = NULL;
+  }
 }
 
 void curl_easy_free(ruby_curl_easy *rbce) {
@@ -261,6 +267,8 @@ static void ruby_curl_easy_zero(ruby_curl_easy *rbce) {
   rbce->enable_cookies = 0;
   rbce->ignore_content_length = 0;
   rbce->callback_active = 0;
+  rbce->first = NULL;
+  rbce->last = NULL;
 }
 
 /*

data/lib/curl-global.rb

@@ -118,12 +118,14 @@ module Curl
     recall
     execute
   end
+  alias :reload :reset
   
   def reset!
     recall!
     execute
   end
-  module_function :reset!, :reset
+  alias :reload! :reset!
+  module_function :reset!, :reset, :reload!, :reload
   
   def status(raise_e=true)
     if $CarierThread and (s = $CarierThread.status)

data/lib/frame.rb

@@ -698,7 +698,7 @@ module HTTPAccessKit
       form = "[action=#{@loc.path.inspect}]" if form == :self
       if form.is String
              form_node = at form
-             raise XML::Error, "Can't find form by xpath `#{form}` on page #{inspect}" if !form_node
+             raise XML::Error, "Can't find form by xpath `#{form}` on page #{inspect}" if !form_node or form_node.name != 'form'
       else form_node = form
       end
       hash = form_node.inputs_all.merge!(hash)

data/lib/init.rb

@@ -1,27 +1,38 @@
 # encoding: utf-8
 module HTTPAccessKit
   include RMTools
-  CONFIG = YAML.load(read(%W(rhack.yml #{File.join(ENV['HOME'], 'rhack.yml')})) || '') || {}
+  extend RMTools
+  
+  CONFIG = if ENV["APP_ROOT"]
+    YAML.load(read(File.join ENV["APP_ROOT"], 'config/rhack.yml') || '') || {}
+  else
+    YAML.load(read(%W(config/rhack.yml rhack.yml #{File.join(ENV['HOME'], 'rhack.yml')})) || '') || {}
+  end
 
   UAS = if File.file?(uas = CONFIG['ua file'] || File.join(ENV['HOME'], 'ua.txt'))
            IO.read(uas)/"\n"
-  else   ['Mozilla/5.0 (Windows; U; Windows NT 5.1; ru; rv:1.9.1.8) Gecko/20100202 MRA 5.6 (build 03278) Firefox/3.5.8 (.NET CLR 3.5.30729)'] end
+  else   ['Mozilla/5.0 (Windows NT 6.1; WOW64; rv:14.0) Gecko/20100101 Firefox/14.0.1'] end
   
   L = RMLogger.new(CONFIG.logger || {})
   
-  config	      = CONFIG.db || File.join(ENV['HOME'], 'db.yml')
+  db_config = if ENV["APP_ROOT"] and ENV["RAILS_ENV"] and File.file?(dbyml = File.join(ENV["APP_ROOT"], 'config/database.yml'))
+    YAML.load(read(dbyml))[ENV["RAILS_ENV"]]
+  else
+    CONFIG.db || File.join(ENV['HOME'], 'db.yml')
+  end
   begin
-  DB	            = ActiveRecord::Base.establish_connection_with config
+    DB = ActiveRecord::Base.establish_connection_with db_config
   rescue LoadError
-  DB = nil
+    DB = nil
   end
- 
-  cache	      = CONFIG.cache || {}
-  CacheDir	  = cache.dir || File.join(File.dirname(__FILE__), 'cache')
-  CacheTable	= (cache.table || :rhack_cache).to_sym
-  CacheTTL	  = cache.clean ? eval(cache.clean).b : nil
-  
-  RETRY	      = CONFIG['scout retry'] || {}
+  if DB and !(CONFIG.cache and CONFIG.cache.enabled == false)
+    cache	      = CONFIG.cache || {}
+    CacheDir	  = cache.dir || File.join(File.dirname(__FILE__), 'cache')
+    CacheTable	= (cache.table || :rhack_cache).to_sym
+    CacheTTL	  = cache.clean ? eval(cache.clean).b : nil
+  end
+    
+  RETRY     = CONFIG['scout retry'] || {}
   
   $uas	  ||= UAS
   $Carier	||= Curl::Multi.new
@@ -32,5 +43,5 @@ module HTTPAccessKit
   end
 end
 
-module Curl; include HTTPAccessKit end
+module Curl; extend HTTPAccessKit end
 RHACK = HTTPAccessKit

data/lib/rhack.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 $KCODE	= 'UTF-8' if RUBY_VERSION < "1.9"
 require 'rmtools_dev' unless defined? RMTools
+requrie 'cgi'
 here = File.expand_path File.dirname __FILE__
 require File.join(here, 'curb_core.so')
 require 'active_record'
@@ -13,4 +14,4 @@ require "#{here}/curl-global"
 require "#{here}/scout"
 require "#{here}/frame"
 require "#{here}/words"
-require "#{here}/cache" if RHACK::DB
+require "#{here}/cache" if defined? RHACK::CacheDir

data/lib/rhack/services.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 require 'rhack'
 
+# Вызовы сервисов всегда ждут и возвращают обработанный ответ, если вызвваны без блока. 
+# В противном случае используется событийная модель и обработанный ответ передаётся в блок.
 module HTTPAccessKit
 
   class Service

data/lib/scout.rb

@@ -67,14 +67,14 @@ module Curl
       end
       
       @req = {}
-      @req.url	      = easy.last_effective_url
-      @req.header	= easy.headers
+      @req.url	        = easy.last_effective_url
+      @req.headers	= easy.headers
       if range = easy.headers.Range and range[/(\d+)-(\d+)/]
-        @req.range = $1.to_i .. $2.to_i
+        @req.range   = $1.to_i .. $2.to_i
       end
       if easy.base and @req.meth = easy.base.last_method and @req.meth == :post
-        @req.body	= easy.post_body
-        @req.mp	  = easy.multipart_form_post?
+        @req.body	  = easy.post_body
+        @req.mp	    = easy.multipart_form_post?
       end
     end
     
@@ -90,6 +90,7 @@ module Curl
       @error ? @error[key_or_index] : @hash[key_or_index.downcase]
     end
     
+    alias :headers :hash
   end
   
 end
@@ -101,25 +102,20 @@ module HTTPAccessKit
     
     def initialize(*args)
       if args[1].is Scout
-        domain, str, scout = nil, *args
+        str, scout = *args
         ck = str//;\s*/
         ck[1..-1].each {|par|
           a = par/'='
-          case a[0]
+          case a[0].downcase
             when 'path'; @path = (a[1] == '/') ? // : /^#{Regexp.escape a[1]}/
-            when 'domain'
-              if a[1].ord == ?.
-                domain = a[1][1..-1]
-                @domain = /(^|\.)#{Regexp.escape(domain)}$/
-              else 
-                domain = a[1]
-                @domain = /^#{Regexp.escape(a[1])}$/
-              end
+            when 'domain'; @domain = /(^|\.)#{Regexp.escape a[1].sub(/^./, '')}$/
+            when 'expires'; @expires = a[1].to_time
           end
         }
-        @name, @value = ck[0]/'='
-        L.debug args if !domain 
-        (scout.cookies[domain || scout.uri.host] ||= {})[@name] = self
+        @name, @value = ck[0].split('=', 2)
+        #@value.gsub!(/^['"]|['"]$/, '')
+        L.debug args if !@domain
+        (scout.cookies[scout.uri.host] ||= {})[@name] = self
       else
         @name, cookie = args[0]
         case cookie
@@ -134,7 +130,11 @@ module HTTPAccessKit
     end
     
     def use(str, uri)
-      str << @string if uri.path[@path] and !uri.root || uri.host[@domain]
+      if !@expires or @expires > Time.now
+        str << @string if uri.path[@path] and !uri.root || uri.host[@domain]
+      else
+        :expired
+      end
     end
       
     def to_s; @value end
@@ -296,7 +296,7 @@ module HTTPAccessKit
       header = DefaultHeader.dup
       if @cookieProc
         cookies = ''
-        main_cks.each_value {|v| v.use cookies, @uri}
+        main_cks.each {|k, v| main_cks.delete k if v.use(cookies, @uri) == :expired}
         header['Cookie'] = cookies[0..-3]                                 
       end
       if @refforge

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 2
-  version: 0.2.2
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Sergey Baev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-01 00:00:00 Z
+date: 2012-08-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rmtools
@@ -80,7 +80,7 @@ dependencies:
         version: "2.12"
   type: :development
   version_requirements: *id004
-description: Webscrapping library based on curb gem extension and libxml-ruby (and optionally Johnson and ActiveRecord)
+description: Webscraping library based on curb gem extension and libxml-ruby (and optionally Johnson and ActiveRecord)
 email: 
 - tinbka@gmail.com
 executables: []
@@ -89,7 +89,6 @@ extensions:
 - ext/curb/extconf.rb
 extra_rdoc_files: 
 - ./Manifest.txt
-- ./License.txt
 - ./README.txt
 - ./History.txt
 files: 
@@ -150,7 +149,6 @@ files:
 - ./Rakefile
 - ./Manifest.txt
 - ./CURB-LICENSE
-- ./License.txt
 - ./README.txt
 - ./Gemfile
 - ./History.txt

data/License.txt

@@ -1,17 +0,0 @@
-Copyright (c) 2010 Anonymous <tinbka@gmail.com>
-All rights reserved.
-
-This work is licensed under the same license as Ruby language.
-
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.