scrappy 0.1.19 → 0.1.20

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.1.20 2011-02-25
+
+* Added missing dependency (haml)
+* Support for more predicates in NewUriSelector
+
 === 0.1.19 2011-02-24
 
 * Using Sinatra (in production mode) instead of Camping

data/Rakefile

@@ -11,7 +11,7 @@ Echoe.new('scrappy', Scrappy::VERSION) do |p|
   p.email          = "joseignacio.fernandez@gmail.com"
   p.install_message = '**(Optional) Remember to install rbwebkitgtk for visual parsing features**'
   p.ignore_pattern = ["pkg/*"]
-  p.dependencies = [['activesupport','>= 2.3.5'], ['sinatra', '>= 1.1.2'], ['thin', '>= 1.2.7'], ['nokogiri', '>= 1.4.1'], ['mechanize','>= 1.0.0'], ['lightrdf','>= 0.1.9'], ['i18n', '>= 0.4.2']]
+  p.dependencies = [['activesupport','>= 2.3.5'], ['sinatra', '>= 1.1.2'], ['thin', '>= 1.2.7'], ['nokogiri', '>= 1.4.1'], ['mechanize','>= 1.0.0'], ['lightrdf','>= 0.1.9'], ['i18n', '>= 0.4.2'], ['haml', '>= 3.0.24']]
 end
 
 Rake::RDocTask.new(:rdoc) do |rdoc|

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

data/lib/scrappy/selectors/new_uri.rb

@@ -7,8 +7,16 @@ module NewUriSelector
       [ doc[:content].text ]
     end
 
+    @@indexes ||= Hash.new(0)
+    prefix = selector.sc::prefix.first.to_s
+    prefix = (prefix =~ /\Ahttp/ ? URI::parse(doc[:uri]).merge(prefix).to_s : "#{doc[:uri]}#{prefix}")
+    suffix = selector.sc::suffix.first.to_s
+
     contents.map do |content|
-      new_uri = selector.sc::prefix.first.to_s + content.wikify + selector.sc::suffix.first.to_s
+      variable = selector.sc::sequence.first.to_s=="true" ? (@@indexes[selector] += 1) : content.wikify
+      
+      new_uri = "#{prefix}#{variable}#{suffix}"
+      
       { :uri=>new_uri, :content=>doc[:content], :value=>new_uri }
     end
   end

data/scrappy.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scrappy}
-  s.version = "0.1.19"
+  s.version = "0.1.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Ignacio"]
-  s.date = %q{2011-02-24}
+  s.date = %q{2011-02-25}
   s.default_executable = %q{scrappy}
   s.description = %q{RDF web scraper}
   s.email = %q{joseignacio.fernandez@gmail.com}
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<lightrdf>, [">= 0.1.9"])
       s.add_runtime_dependency(%q<i18n>, [">= 0.4.2"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.0.24"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_dependency(%q<sinatra>, [">= 1.1.2"])
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mechanize>, [">= 1.0.0"])
       s.add_dependency(%q<lightrdf>, [">= 0.1.9"])
       s.add_dependency(%q<i18n>, [">= 0.4.2"])
+      s.add_dependency(%q<haml>, [">= 3.0.24"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.5"])
@@ -51,5 +53,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mechanize>, [">= 1.0.0"])
     s.add_dependency(%q<lightrdf>, [">= 0.1.9"])
     s.add_dependency(%q<i18n>, [">= 0.4.2"])
+    s.add_dependency(%q<haml>, [">= 3.0.24"])
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 19
-  version: 0.1.19
+  - 20
+  version: 0.1.20
 platform: ruby
 authors: 
 - Jose Ignacio
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +01:00
+date: 2011-02-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,6 +115,20 @@ dependencies:
         version: 0.4.2
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 24
+        version: 3.0.24
+  type: :runtime
+  version_requirements: *id008
 description: RDF web scraper
 email: joseignacio.fernandez@gmail.com
 executables: