scrappy 0.4.5 → 0.4.6

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.4.6 2011-10-05
+
+* Bug fix when using public instead of public_folder
+
 === 0.4.5 2011-07-20
 
 * Bug fix in underscored new URIs

data/lib/scrappy.rb

@@ -24,5 +24,5 @@ require 'scrappy/agent/blind_agent'
 require 'scrappy/agent/agent'
 
 module Scrappy
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

data/lib/scrappy/server/admin.rb

@@ -18,7 +18,7 @@ module Scrappy
       app.get '/javascript' do
         fragments = agent.fragments_for(Scrappy::Kb.extractors, params[:uri])
         content_type 'application/javascript'
-        "window.scrappy_extractor=#{fragments.any?};" + open("#{settings.public}/javascripts/annotator.js").read
+        "window.scrappy_extractor=#{fragments.any?};" + open("#{settings.public_folder}/javascripts/annotator.js").read
       end
       
       app.get '/help' do

data/lib/scrappy/server/server.rb

@@ -12,9 +12,9 @@ module Scrappy
     register Admin if Scrappy::Options.admin
     
     enable :sessions
-    set    :root,   File.join(File.dirname(__FILE__), '..', '..', '..')
-    set    :views,  Proc.new { File.join(root, "views") }
-    set    :public, Proc.new { File.join(root, "public") }
+    set    :root,          File.join(File.dirname(__FILE__), '..', '..', '..')
+    set    :views,         Proc.new { File.join(root, "views") }
+    set    :public_folder, Proc.new { File.join(root, "public") }
 
     get '/:format/*' do |format, url|
       process_request :get, format, url, params[:callback]

data/scrappy.gemspec

@@ -1,31 +1,29 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{scrappy}
-  s.version = "0.4.5"
+  s.name = "scrappy"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jose Ignacio"]
-  s.date = %q{2011-07-20}
-  s.default_executable = %q{scrappy}
-  s.description = %q{RDF web scraper}
-  s.email = %q{joseignacio.fernandez@gmail.com}
+  s.date = "2011-10-05"
+  s.description = "RDF web scraper"
+  s.email = "joseignacio.fernandez@gmail.com"
   s.executables = ["scrappy"]
   s.extra_rdoc_files = ["README.rdoc", "bin/scrappy", "extractors/elmundo.yarf", "lib/scrappy.rb", "lib/scrappy/agent/agent.rb", "lib/scrappy/agent/blind_agent.rb", "lib/scrappy/agent/cache.rb", "lib/scrappy/agent/dumper.rb", "lib/scrappy/agent/map_reduce.rb", "lib/scrappy/extractor/extractor.rb", "lib/scrappy/extractor/formats.rb", "lib/scrappy/extractor/fragment.rb", "lib/scrappy/extractor/selector.rb", "lib/scrappy/extractor/selectors/base_uri.rb", "lib/scrappy/extractor/selectors/css.rb", "lib/scrappy/extractor/selectors/new_uri.rb", "lib/scrappy/extractor/selectors/root.rb", "lib/scrappy/extractor/selectors/section.rb", "lib/scrappy/extractor/selectors/slice.rb", "lib/scrappy/extractor/selectors/uri.rb", "lib/scrappy/extractor/selectors/uri_pattern.rb", "lib/scrappy/extractor/selectors/visual.rb", "lib/scrappy/extractor/selectors/xpath.rb", "lib/scrappy/learning/optimizer.rb", "lib/scrappy/learning/trainer.rb", "lib/scrappy/repository.rb", "lib/scrappy/server/admin.rb", "lib/scrappy/server/errors.rb", "lib/scrappy/server/helpers.rb", "lib/scrappy/server/server.rb", "lib/scrappy/support.rb"]
   s.files = ["History.txt", "Manifest", "README.rdoc", "Rakefile", "bin/scrappy", "extractors/elmundo.yarf", "lib/scrappy.rb", "lib/scrappy/agent/agent.rb", "lib/scrappy/agent/blind_agent.rb", "lib/scrappy/agent/cache.rb", "lib/scrappy/agent/dumper.rb", "lib/scrappy/agent/map_reduce.rb", "lib/scrappy/extractor/extractor.rb", "lib/scrappy/extractor/formats.rb", "lib/scrappy/extractor/fragment.rb", "lib/scrappy/extractor/selector.rb", "lib/scrappy/extractor/selectors/base_uri.rb", "lib/scrappy/extractor/selectors/css.rb", "lib/scrappy/extractor/selectors/new_uri.rb", "lib/scrappy/extractor/selectors/root.rb", "lib/scrappy/extractor/selectors/section.rb", "lib/scrappy/extractor/selectors/slice.rb", "lib/scrappy/extractor/selectors/uri.rb", "lib/scrappy/extractor/selectors/uri_pattern.rb", "lib/scrappy/extractor/selectors/visual.rb", "lib/scrappy/extractor/selectors/xpath.rb", "lib/scrappy/learning/optimizer.rb", "lib/scrappy/learning/trainer.rb", "lib/scrappy/repository.rb", "lib/scrappy/server/admin.rb", "lib/scrappy/server/errors.rb", "lib/scrappy/server/helpers.rb", "lib/scrappy/server/server.rb", "lib/scrappy/support.rb", "public/favicon.ico", "public/images/logo.png", "public/images/logo_tiny.png", "public/javascripts/annotator.js", "public/javascripts/remote.js", "public/javascripts/utils.js", "public/stylesheets/application.css", "test/test_helper.rb", "test/test_scrappy.rb", "views/extractors.haml", "views/help.haml", "views/home.haml", "views/layout.haml", "views/patterns.haml", "views/samples.haml", "views/test.haml", "scrappy.gemspec"]
-  s.homepage = %q{http://github.com/josei/scrappy}
+  s.homepage = "http://github.com/josei/scrappy"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Scrappy", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{scrappy}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Web scraper that allows producing RDF data out of plain web pages}
+  s.rubyforge_project = "scrappy"
+  s.rubygems_version = "1.8.10"
+  s.summary = "Web scraper that allows producing RDF data out of plain web pages"
   s.test_files = ["test/test_scrappy.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_runtime_dependency(%q<sinatra>, [">= 1.1.2"])
       s.add_runtime_dependency(%q<thin>, [">= 1.2.7"])

metadata

@@ -1,169 +1,132 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: scrappy
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 5
-  version: 0.4.5
+version: !ruby/object:Gem::Version
+  version: 0.4.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jose Ignacio
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-20 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 5
+  requirement: &77861890 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 2
+  version_requirements: *77861890
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &77861670 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 7
+  version_requirements: *77861670
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &77861460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.7
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 1
+  version_requirements: *77861460
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &77861250 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mechanize
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+  version_requirements: *77861250
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: &77861020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: lightrdf
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 9
+  version_requirements: *77861020
+- !ruby/object:Gem::Dependency
+  name: lightrdf
+  requirement: &77860800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.9
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 2
+  version_requirements: *77860800
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &77860560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.2
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
+  version_requirements: *77860560
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &77860340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 24
+  version_requirements: *77860340
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &77860130 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.24
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rack-flash
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 1
+  version_requirements: *77860130
+- !ruby/object:Gem::Dependency
+  name: rack-flash
+  requirement: &77859920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: *77859920
 description: RDF web scraper
 email: joseignacio.fernandez@gmail.com
-executables: 
+executables:
 - scrappy
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - bin/scrappy
 - extractors/elmundo.yarf
@@ -195,7 +158,7 @@ extra_rdoc_files:
 - lib/scrappy/server/helpers.rb
 - lib/scrappy/server/server.rb
 - lib/scrappy/support.rb
-files: 
+files:
 - History.txt
 - Manifest
 - README.rdoc
@@ -247,42 +210,36 @@ files:
 - views/samples.haml
 - views/test.haml
 - scrappy.gemspec
-has_rdoc: true
 homepage: http://github.com/josei/scrappy
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Scrappy
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: scrappy
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Web scraper that allows producing RDF data out of plain web pages
-test_files: 
+test_files:
 - test/test_scrappy.rb
 - test/test_helper.rb