scrappy 0.1.21 → 0.1.22

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.22 2011-02-25
+
+* Support for reverse proxy in web server
+
 === 0.1.21 2011-02-25
 
 * Fixed missing callback in server redirection

data/bin/scrappy

@@ -36,7 +36,7 @@ module Scrappy
         opts.on('-D', '--dump')                 { Agent::Options.dump = true; Agent::Options.format = :rdf }
         opts.on('-u', '--debug')                { Agent::Options.debug = true }
         opts.on('-i', '--interactive')          { Options.shell = true; Agent::Options.format_header = false }
-        opts.on('-s', '--server')               { Options.server = true }
+        opts.on('-s', '--server [ROOT]')        { |url| Options.server = true; Options.root = url }
         opts.on('-S', '--proxy-server')         { Options.proxy = true }
         opts.on('-P P', '--port P')             { |p| Options.port = p }
         opts.on('-c C', '--concurrence C')      { |c| Agent::Options.workers = c.to_i }
@@ -65,7 +65,7 @@ module Scrappy
         puts "Launching Scrappy Web Server..."
         require 'scrappy/server'
         Thin::Logging.silent = true
-        Scrappy::Server.run! :host => 'localhost', :port => Options.port, :environment=>:production
+        Scrappy::Server.run! :host => 'localhost', :port => Options.port, :environment=>:production, :root=>Options.root
       elsif Options.shell
         puts "Launching Scrappy Shell..."
         require 'scrappy/shell'
@@ -105,7 +105,7 @@ Options
   -D, --dump               Dumps RDF data to disk
   -u, --debug              Shows debugging traces
   -i, --interactive        Runs interactive shell
-  -s, --server             Runs web server
+  -s, --server [ROOT]      Runs web server (optionally specify server's root url)
   -S, --proxy-server       Runs web proxy
   -P, --port PORT          Selects port number (default is 3434)
   -v, --visual             Uses visual agent (slow)

data/lib/scrappy.rb

@@ -21,7 +21,7 @@ require 'scrappy/agent/agent'
 Namespace :sc, 'http://lab.gsi.dit.upm.es/scraping.rdf#'
 
 module Scrappy
-  VERSION = '0.1.21'
+  VERSION = '0.1.22'
 end
 
 # Require selectors

data/lib/scrappy/server.rb

@@ -24,7 +24,7 @@ module Scrappy
       response = agent.proxy :method=>method, :uri=>url, :inputs=>inputs, :format=>format.to_sym
       case response.status
       when :redirect
-        redirect "/#{format}/#{CGI::escape(response.uri).gsub('%2F','/').gsub('%3A',':')}#{textual_inputs}"
+        redirect "#{settings.root}/#{format}/#{CGI::escape(response.uri).gsub('%2F','/').gsub('%3A',':')}#{textual_inputs}"
       when :ok
         headers 'Content-Type' => response.content_type
         callback ? "#{callback}(#{response.output})" : response.output
@@ -48,8 +48,8 @@ module Scrappy
     end
     
     def textual_inputs
-      return '' if inputs.merge('callback'=>params[:callback]).empty?
-      "?" + (inputs.merge('callback'=>params[:callback]).map{|k,v| "#{CGI.escape(k)}=#{CGI.escape(v)}"}*'')
+      return '' if inputs.merge('callback'=>params[:callback]).reject{|k,v| v.nil?}.empty?
+      "?" + (inputs.merge('callback'=>params[:callback]).reject{|k,v| v.nil?}.map{|k,v| "#{CGI.escape(k)}=#{CGI.escape(v)}"}*'')
     end
   end
 end

data/scrappy.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scrappy}
-  s.version = "0.1.21"
+  s.version = "0.1.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Ignacio"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 21
-  version: 0.1.21
+  - 22
+  version: 0.1.22
 platform: ruby
 authors: 
 - Jose Ignacio