scrappy 0.1.20 → 0.1.21

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.21 2011-02-25
+
+* Fixed missing callback in server redirection
+
 === 0.1.20 2011-02-25
 
 * Added missing dependency (haml)

data/lib/scrappy/server.rb

@@ -11,12 +11,12 @@ module Scrappy
       haml :home
     end
 
-    get '/:format/*' do
-      process_request :get, params[:format], params[:splat] * "/", params[:callback]
+    get '/:format/*' do |format, url|
+      process_request :get, format, url, params[:callback]
     end
 
-    post '/:format/*' do
-      process_request :post, params[:format], params[:splat] * "/", params[:callback]
+    post '/:format/*' do |format, url|
+      process_request :post, format, url, params[:callback]
     end
 
     protected
@@ -48,8 +48,8 @@ module Scrappy
     end
     
     def textual_inputs
-      return '' if inputs.empty?
-      "?" + (inputs.map{|k,v| "#{CGI.escape(k)}=#{CGI.escape(v)}"}*'')
+      return '' if inputs.merge('callback'=>params[:callback]).empty?
+      "?" + (inputs.merge('callback'=>params[:callback]).map{|k,v| "#{CGI.escape(k)}=#{CGI.escape(v)}"}*'')
     end
   end
 end

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.20'
+  VERSION = '0.1.21'
 end
 
 # Require selectors

data/scrappy.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scrappy}
-  s.version = "0.1.20"
+  s.version = "0.1.21"
 
   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
-  - 20
-  version: 0.1.20
+  - 21
+  version: 0.1.21
 platform: ruby
 authors: 
 - Jose Ignacio