tarantula 0.4.1 → 0.4.2

data/.gitignore

@@ -7,3 +7,4 @@ doc
 TAGS
 coverage
 *.gem
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.8.7
+  - 1.9.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.4.2
+* Fix Response#html? for Rails 3 (jgkite + rsanheim)
+* All tests green again [cldwalker]
+
 v0.2.0 Implementation of updated look-and-feel [Jason Rudolph]
 
 v0.1.8 Add timeouts for crawls to help really long builds [Rob Sanheim]

data/README.rdoc

@@ -11,7 +11,7 @@ Tarantula is a big fuzzy spider. It crawls your Rails 3 application, fuzzing dat
 The latest and greatest version is always available on GitHub. (See the rakefile for dependencies, or
 just let RubyGems handle it).  Add it to your Gemfile as normal:
 
-gem "tarantula", "0.4.1"
+   gem "tarantula"
 
 === Crawling Your App
 
@@ -124,13 +124,7 @@ The above will crawl your app twice, and each specific crawl will timeout if it
 
 == Bugs/Requests
 
-Please submit your bug reports, patches, or feature requests at Lighthouse:
-
-http://relevance.lighthouseapp.com/projects/17868-tarantula/overview
-
-You can view the continuous integration results for Tarantula, including results against all supported versions of Rails, on RunCodeRun here:
-
-http://runcoderun.com/relevance/tarantula
+Please submit your bug reports, patches, or feature requests in Github Issues.
 
 == License
 

data/lib/relevance/core_extensions/response.rb

@@ -1,11 +1,13 @@
 # dynamically mixed in to response objects
 module Relevance
   module CoreExtensions
-    module Response 
-      def html?                                           
+    module Response
+      def html?
         # some versions of Rails integration tests don't set content type
         # so we are treating nil as html. A better fix would be welcome here.
-        ((content_type =~ %r{^text/html}) != nil)  || content_type == nil
+        (content_type.respond_to?(:html?) ?
+          content_type.html? : content_type =~ %r{^text/html}) ||
+          content_type.nil?
       end
     end
   end

data/lib/relevance/tarantula.rb

@@ -1,15 +1,7 @@
-TARANTULA_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "../.."))
-
 require 'forwardable'
 require 'erb'
 require 'active_support'
 require 'action_controller'
-# bringing in xss-shield requires a bunch of other dependencies
-# still not certain about this, if it ruins your world please let me know
-#xss_shield_path = File.join(TARANTULA_ROOT, %w{vendor xss-shield})
-#$: << File.join(xss_shield_path, "lib")
-#require File.join(xss_shield_path, "init")
-
 require 'htmlentities'
 
 module Relevance; end

data/lib/relevance/tarantula/invalid_html_handler.rb

@@ -5,7 +5,10 @@ module Relevance
       include Relevance::Tarantula
       def handle(result)
         response = result.response
-        return unless response.html?
+        unless response.html?
+          log "Skipping #{self.class} on url: #{result.url} because response is not html."
+          return
+        end
         begin
           body = HTML::Document.new(response.body, true)
         rescue Exception => e

data/lib/relevance/tarantula/tidy_handler.rb

@@ -1,8 +1,6 @@
-require 'rubygems'
 begin
-  gem 'tidy'
   require 'tidy'
-rescue Gem::LoadError
+rescue LoadError
   puts "Tidy gem not available -- 'gem install tidy' to get it."
 end
 
@@ -12,7 +10,7 @@ if defined? Tidy
   module Relevance
     module Tarantula
 
-      class TidyHandler 
+      class TidyHandler
         include Relevance::Tarantula
         def initialize(options = {})
           @options = {:show_warnings=>true}.merge(options)

data/lib/relevance/tarantula/version.rb

@@ -1,5 +1,5 @@
 module Relevance
   module Tarantula
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

data/spec/relevance/core_extensions/file_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require 'relevance/core_extensions/file'
 
 describe "Relevance::CoreExtensions::File#extension" do
   it "should return the extension without the leading dot" do

data/spec/relevance/core_extensions/response_spec.rb

@@ -1,29 +1,48 @@
 require "spec_helper"
-require 'relevance/core_extensions/file'
 
 describe "Relevance::CoreExtensions::Response#html?" do
   before do
     @response = OpenStruct.new
     @response.extend(Relevance::CoreExtensions::Response)
-  end         
-  
-  it "should be html if the content-type is 'text/html'" do
-    @response.content_type = "text/html"
-    @response.should be_html
-    @response.content_type = "text/html;charset=iso-8859-2"
-    @response.should be_html
   end
 
-  it "should not be html if the content-type isn't an html type" do
-    @response.content_type = "text/plain"
-    @response.should_not be_html
+  context 'when content_type is a String (Rails 2)' do
+    it "should be html if the content-type is 'text/html'" do
+      @response.content_type = "text/html"
+      @response.should be_html
+      @response.content_type = "text/html;charset=iso-8859-2"
+      @response.should be_html
+    end
+
+    it "should not be html if the content-type isn't an html type" do
+      @response.content_type = "text/plain"
+      @response.should_not be_html
+      @response.content_type = "application/pdf"
+      @response.should_not be_html
+    end
   end
 
-  # better ideas welcome, but be careful not to  
+  context 'when content_type is a Mime::Type (Rails 3)' do
+    it "should be html if the content-type is 'text/html'" do
+      @response.content_type = Mime::Type.new("text/html")
+      @response.should be_html
+      @response.content_type = Mime::Type.new("text/html;charset=iso-8859-2")
+      @response.should be_html
+    end
+
+    it "should not be html if the content-type isn't an html type" do
+      @response.content_type = Mime::Type.new("text/plain")
+      @response.should_not be_html
+      @response.content_type = Mime::Type.new("application/pdf")
+      @response.should_not be_html
+    end
+  end
+
+  # better ideas welcome, but be careful not to
   # castrate tarantula for proxies that don't set the content-type
   it "should pretend we have html if the content-type is nil" do
     @response.content_type = nil
     @response.should be_html
   end
-  
+
 end

data/spec/relevance/core_extensions/test_case_spec.rb

@@ -1,5 +1,4 @@
 require "spec_helper"
-require 'relevance/core_extensions/test_case'
 
 describe "TestCase extensions" do
   pending "can create the crawler" do
@@ -13,7 +12,7 @@ describe "TestCase extensions" do
     expects(:tarantula_crawler).returns(crawler)
     tarantula_crawl(:integration_test_stub, :url => "/foo")
   end
-  
+
   it "should get mixed into ActionController::IntegrationTest" do
     ActionController::IntegrationTest.ancestors.should include(Relevance::CoreExtensions::TestCaseExtensions)
   end

data/spec/relevance/tarantula/rails_integration_proxy_spec.rb

@@ -57,11 +57,11 @@ describe "Relevance::Tarantula::RailsIntegrationProxy patching" do
   it "patches in Relevance::CoreExtensions::Response" do
     @rip = Relevance::Tarantula::RailsIntegrationProxy.new(stub)
     @rip.stubs(:rails_root).returns("faux_rails_root")
-    @response = stub_everything({:code => "404", :headers => {}, :content_type => "text/html"})
+    @response = stub_everything({:code => "404", :headers => {}, :content_type => Mime::Type.new("text/html")})
     @response.meta.ancestors.should_not include(Relevance::CoreExtensions::Response)
     @rip.patch_response("/url", @response)
     @response.meta.ancestors.should include(Relevance::CoreExtensions::Response)
-    @response.html?.should == true
+    @response.should be_html
   end
     
   it "replaces 404s with 200s, pulling content from public, for known text types" do

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
-require 'rubygems'
-lib_path = File.expand_path(File.dirname(__FILE__) + "/../lib")
-$LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
-
 if rails_version = ENV['RAILS_VERSION']
+  require 'rubygems'
   gem "rails", rails_version
 end
 
@@ -13,6 +10,7 @@ if Rails::VERSION::STRING < "2.3.1" && RUBY_VERSION >= "1.9.1"
 end
 puts "==== Testing with Rails #{Rails::VERSION::STRING} ===="
 
+require 'relevance/tarantula'
 require 'bundler'
 Bundler.require
 require 'ostruct'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tarantula
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-22 00:00:00.000000000Z
+date: 2012-02-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &24434960 !ruby/object:Gem::Requirement
+  requirement: &70348248358760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 4.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *24434960
+  version_requirements: *70348248358760
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &24434460 !ruby/object:Gem::Requirement
+  requirement: &70348248358220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *24434460
+  version_requirements: *70348248358220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24434000 !ruby/object:Gem::Requirement
+  requirement: &70348248357700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *24434000
+  version_requirements: *70348248357700
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &24433540 !ruby/object:Gem::Requirement
+  requirement: &70348248357240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *24433540
+  version_requirements: *70348248357240
 - !ruby/object:Gem::Dependency
   name: sdoc-helpers
-  requirement: &24433080 !ruby/object:Gem::Requirement
+  requirement: &70348248356660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.4
   type: :development
   prerelease: false
-  version_requirements: *24433080
+  version_requirements: *70348248356660
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &24432620 !ruby/object:Gem::Requirement
+  requirement: &70348248356080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *24432620
+  version_requirements: *70348248356080
 - !ruby/object:Gem::Dependency
   name: log_buddy
-  requirement: &24432160 !ruby/object:Gem::Requirement
+  requirement: &70348248339640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *24432160
+  version_requirements: *70348248339640
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &24431700 !ruby/object:Gem::Requirement
+  requirement: &70348248339060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.12
   type: :development
   prerelease: false
-  version_requirements: *24431700
+  version_requirements: *70348248339060
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &24431240 !ruby/object:Gem::Requirement
+  requirement: &70348248338480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 3.0.9
   type: :development
   prerelease: false
-  version_requirements: *24431240
+  version_requirements: *70348248338480
 description: A big hairy fuzzy spider that crawls your site, wreaking havoc
 email:
 - opensource@thinkrelevance.com
@@ -120,10 +120,10 @@ files:
 - .autotest
 - .gitignore
 - .rvmrc
+- .travis.yml
 - CHANGELOG
 - DSL_EXAMPLES.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -224,8 +224,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: tarantula
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A big hairy fuzzy spider that crawls your site, wreaking havoc
-test_files: []
+test_files:
+- template/tarantula_test.rb

data/Gemfile.lock

@@ -1,108 +0,0 @@
-PATH
-  remote: .
-  specs:
-    relevance/tarantula (0.4.0)
-      hpricot (~> 0.8.4)
-      htmlentities (~> 4.3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.10)
-      actionpack (= 3.0.10)
-      mail (~> 2.2.19)
-    actionpack (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-    activesupport (3.0.10)
-    arel (2.0.10)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    hpricot (0.8.4)
-    htmlentities (4.3.0)
-    i18n (0.5.0)
-    json (1.5.3)
-    log_buddy (0.6.0)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    mocha (0.9.12)
-    polyglot (0.3.2)
-    rack (1.2.3)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.10)
-      actionmailer (= 3.0.10)
-      actionpack (= 3.0.10)
-      activerecord (= 3.0.10)
-      activeresource (= 3.0.10)
-      activesupport (= 3.0.10)
-      bundler (~> 1.0)
-      railties (= 3.0.10)
-    railties (3.0.10)
-      actionpack (= 3.0.10)
-      activesupport (= 3.0.10)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (0.9.2)
-    rdiscount (1.6.8)
-    rdoc (3.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sdoc (0.3.0)
-      json (>= 1.1.3)
-      rdoc (~> 3)
-    sdoc-helpers (0.1.4)
-      sdoc (~> 0.2)
-    thor (0.14.6)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  log_buddy (~> 0.6.0)
-  mocha (~> 0.9.12)
-  rails (~> 3.0.9)
-  rdiscount (~> 1.6.8)
-  relevance/tarantula!
-  rspec (~> 2.6.0)
-  sdoc (~> 0.3.0)
-  sdoc-helpers (~> 0.1.4)