tarantula 0.4.3 → 0.5.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.5.0
+* Handle rails 3.2 link methods
+* Renamed Relevance::Tarantula::Link#method to #meth
+* Ensure tests pass with latest Rails 2 and 3
+* Add notice for deprecating ruby 1.8 in 0.6.0
+
 v0.4.3
 * Fix rake tasks #25 [cldwalker]
 * Remove removing String#chars #18 [cldwalker]

data/README.rdoc

@@ -16,6 +16,10 @@ just let RubyGems handle it).  Add it to your Gemfile as normal:
 
    gem "tarantula"
 
+Or for Rails 3 applications:
+
+   gem 'tarantula', :require => 'tarantula-rails3'
+
 === Crawling Your App
 
 Use the included rake task to create a Rails integration test that will allow Tarantula to crawl your

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rake'
 require 'rake/testtask'
 require 'rdoc/task'
+require "bundler/gem_tasks"
 Dir["lib/relevance/tasks/*.rake"].each {|f| load f }
 
 begin

data/ci/rails3.gemfile

@@ -1,4 +1,4 @@
 source :rubygems
 
 gemspec :path => "../"
-gem 'rails', '~> 3.0.10', :group => :development
+gem 'rails', '~> 3.2.13', :group => :development

data/lib/relevance/tarantula.rb

@@ -4,6 +4,12 @@ require 'active_support'
 require 'action_controller'
 require 'htmlentities'
 
+if RUBY_VERSION < '1.9.1'
+  warn "***************************************************"
+  warn "tarantula will stop supporting ruby 1.8.x in 0.6.0."
+  warn "***************************************************"
+end
+
 module Relevance; end
 module Relevance; module CoreExtensions; end; end
 module Relevance

data/lib/relevance/tarantula/link.rb

@@ -10,7 +10,7 @@ module Relevance
         def protect_against_forgery?
           false
         end
-        #fast fix for rails3 
+        #fast fix for rails3
         def method_javascript_function(method, url = '', href = nil)
           action = (href && url.size > 0) ? "'#{url}'" : 'this.href'
           submit_function =
@@ -27,11 +27,11 @@ module Relevance
             submit_function << "s.setAttribute('name', '#{request_forgery_protection_token}'); s.setAttribute('value', '#{escape_javascript form_authenticity_token}'); f.appendChild(s);"
           end
           submit_function << "f.submit();"
-        end    
+        end
       end
 
       METHOD_REGEXPS = {}
-      [:put, :delete, :post].each do |m|
+      [:put, :delete, :post, :patch].each do |m|
         # remove submit from the end so we'll match with or without forgery protection
         s = method_javascript_function(m).gsub( /f.submit();/, "" )
         # don't just match this.href in case a different url was passed originally
@@ -46,7 +46,7 @@ module Relevance
 
         if String === link || link.nil?
           @href = transform_url(link)
-          @method = :get
+          @meth = :get
         else # should be a tag
           @href = link['href'] ? transform_url(link['href'].downcase) : nil
           @tag = link
@@ -54,23 +54,24 @@ module Relevance
       end
 
       def crawl
-        response = crawler.follow(method, href)
+        response = crawler.follow(meth, href)
         log "Response #{response.code} for #{self}"
         crawler.handle_link_results(self, make_result(response))
       end
 
       def make_result(response)
-        crawler.make_result(:method    => method,
+        crawler.make_result(:method    => meth,
                             :url       => href,
                             :response  => response,
                             :referrer  => referrer)
       end
 
-      def method
-        @method ||= begin
+      def meth
+        @meth ||= begin
                       (@tag &&
-                       [:put, :delete, :post].detect do |m| # post should be last since it's least specific
-                        @tag['onclick'] =~ METHOD_REGEXPS[m]
+                       [:put, :delete, :post, :patch].detect do |m| # post should be last since it's least specific
+                        @tag['onclick'] =~ METHOD_REGEXPS[m] ||
+                        @tag['data-method'] == m.to_s.downcase
                        end) ||
                          :get
                     end
@@ -82,7 +83,7 @@ module Relevance
 
       def ==(obj)
         obj.respond_to?(:href) && obj.respond_to?(:method) &&
-          self.href.to_s == obj.href.to_s && self.method.to_s == obj.method.to_s
+          self.href.to_s == obj.href.to_s && self.meth.to_s == obj.meth.to_s
       end
       alias :eql? :==
 
@@ -91,7 +92,7 @@ module Relevance
         end
 
       def to_s
-        "<Relevance::Tarantula::Link href=#{href}, method=#{method}>"
+        "<Relevance::Tarantula::Link href=#{href}, method=#{meth}>"
       end
 
     end

data/lib/relevance/tarantula/version.rb

@@ -1,5 +1,5 @@
 module Relevance
   module Tarantula
-    VERSION = "0.4.3"
+    VERSION = "0.5.0"
   end
 end

data/spec/relevance/tarantula/html_report_helper_spec.rb

@@ -26,7 +26,7 @@ describe 'Relevance::Tarantula::HtmlReportHelper#wrap_stack_trace_line' do
     line = %{/action_controller/filters.rb:697:in `call_filters'}
     @reporter.stubs(:textmate_url).returns("ide_url")
     html = @reporter.wrap_stack_trace_line(line)
-    html.should == "<a href='ide_url'>/action_controller/filters.rb:697</a>:in `call_filters'"
+    html.should include "<a href='ide_url'>/action_controller/filters.rb:697</a>:in `call_filters"
   end  
   
   it "converts html entities for non-stack trace lines" do

data/spec/relevance/tarantula/link_spec.rb

@@ -2,83 +2,107 @@ require "spec_helper"
 
 describe "Relevance::Tarantula::Link" do
   include ActionView::Helpers::UrlHelper
-  
+
   it "does not raise an error when initializing without href attribtue" do
     link = make_link(Hpricot('<a="/foo">foo</a>').at('a'))
     link.href.should == nil
-    link.method.should == :get    
+    link.meth.should == :get
   end
 
   it "parses anchor tags" do
     link = make_link(Hpricot('<a href="/foo">foo</a>').at('a'))
     link.href.should == '/foo'
-    link.method.should == :get
+    link.meth.should == :get
   end
 
   it "parses anchor tags with POST 'method'" do
     link = make_link(Hpricot(%Q{<a href="/foo" onclick="#{Relevance::Tarantula::Link.method_javascript_function(:post)}">foo</a>}).at('a'))
     link.href.should == '/foo'
-    link.method.should == :post
+    link.meth.should == :post
+  end
+
+  it "parses anchor tags with POST data-method" do
+    link = make_link(Hpricot(%Q{<a href="/foo" data-method="post">foo</a>}).at('a'))
+    link.href.should == '/foo'
+    link.meth.should == :post
   end
 
   it "parses anchor tags with PUT 'method'" do
     link = make_link(Hpricot(%Q{<a href="/foo" onclick="#{Relevance::Tarantula::Link.method_javascript_function(:put)}">foo</a>}).at('a'))
     link.href.should == '/foo'
-    link.method.should == :put
+    link.meth.should == :put
+  end
+
+  it "parses anchor tags with PUT data-method" do
+    link = make_link(Hpricot(%Q{<a href="/foo" data-method="put">foo</a>}).at('a'))
+    link.href.should == '/foo'
+    link.meth.should == :put
+  end
+
+  it "parses anchor tags with PATCH data-method" do
+    link = make_link(Hpricot(%Q{<a href="/foo" data-method="patch">foo</a>}).at('a'))
+    link.href.should == '/foo'
+    link.meth.should == :patch
   end
 
   it "parses anchor tags with DELETE 'method'" do
     link = make_link(Hpricot(%Q{<a href="/foo" onclick="#{Relevance::Tarantula::Link.method_javascript_function(:delete)}">foo</a>}).at('a'))
     link.href.should == '/foo'
-    link.method.should == :delete
+    link.meth.should == :delete
+  end
+
+  it "parses anchor tags with DELETE data-method" do
+    link = make_link(Hpricot(%Q{<a href="/foo" data-method="delete">foo</a>}).at('a'))
+    link.href.should == '/foo'
+    link.meth.should == :delete
   end
 
   it "parses link tags with text" do
     link = make_link(Hpricot('<link href="/bar">bar</a>').at('link'))
     link.href.should == '/bar'
-    link.method.should == :get
+    link.meth.should == :get
   end
-  
+
   it "parses link tags without text" do
     link = make_link(Hpricot('<link href="/bar" />').at('link'))
     link.href.should == '/bar'
-    link.method.should == :get
+    link.meth.should == :get
   end
-  
+
   it 'remembers link referrer if there is one' do
     link = make_link('/url', stub_everything, '/some-referrer')
     link.referrer.should == '/some-referrer'
   end
-  
+
   it "does two things when crawled: follow, log, and handle" do
     crawler = Relevance::Tarantula::Crawler.new
     link = make_link('/foo', crawler)
-    
+
     response = stub(:code => "200")
     crawler.expects(:follow).returns(response)
     link.expects(:log)
     crawler.expects(:handle_link_results)
-    
+
     link.crawl
   end
-  
+
   # method_javascript_function needs this method
   def protect_against_forgery?
     false
   end
-  
+
 end
 
 describe "possible conflict when user has an AR model named Link" do
   it "does not taint Object with Relevance::Tarantula" do
     Object.ancestors.should_not include(Relevance::Tarantula)
   end
-  
+
   it "doesnt break with a Link model" do
     lambda {
       class Link < ActiveRecord::Base
       end
     }.should_not raise_error
   end
-  
+
 end

data/tarantula.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "htmlentities", "~> 4.3.0"
   s.add_runtime_dependency "hpricot", "~> 0.8.4"
 
-  s.add_development_dependency "rspec", "~> 2.8.0"
+  s.add_development_dependency "rspec", "~> 2.12.0"
   s.add_development_dependency 'rdoc', '~> 3.12.0'
   s.add_development_dependency "log_buddy", "~> 0.6.0"
-  s.add_development_dependency "mocha", "~> 0.9.12"
+  s.add_development_dependency "mocha", "~> 0.13.2"
   s.add_development_dependency "rails", ">= 2.3.0"
 end

metadata

@@ -1,101 +1,144 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: tarantula
-version: !ruby/object:Gem::Version
-  version: 0.4.3
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
-authors:
+authors: 
 - Relevance, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-04-12 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: htmlentities
-  requirement: &70200734539400 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 4
+        - 3
+        - 0
         version: 4.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70200734539400
-- !ruby/object:Gem::Dependency
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: hpricot
-  requirement: &70200734538900 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 8
+        - 4
         version: 0.8.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *70200734538900
-- !ruby/object:Gem::Dependency
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70200734538440 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-  type: :development
-  prerelease: false
-  version_requirements: *70200734538440
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 2
+        - 12
+        - 0
+        version: 2.12.0
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &70200734537980 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 3
+        - 12
+        - 0
         version: 3.12.0
-  type: :development
-  prerelease: false
-  version_requirements: *70200734537980
-- !ruby/object:Gem::Dependency
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   name: log_buddy
-  requirement: &70200734537520 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *70200734537520
-- !ruby/object:Gem::Dependency
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &70200724830800 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.12
-  type: :development
-  prerelease: false
-  version_requirements: *70200724830800
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 13
+        - 2
+        version: 0.13.2
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &70200724830340 !ruby/object:Gem::Requirement
+  prerelease: false
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: *70200724830340
-description: Tarantula is a big fuzzy spider. It crawls your Rails 2.3 and 3.x applications,
-  fuzzing data to see what breaks.
-email:
+  requirement: *id007
+description: Tarantula is a big fuzzy spider. It crawls your Rails 2.3 and 3.x applications, fuzzing data to see what breaks.
+email: 
 - opensource@thinkrelevance.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .autotest
 - .gitignore
 - .rvmrc
@@ -186,27 +229,36 @@ files:
 - vendor/xss-shield/test/test_safe_string.rb
 homepage: https://github.com/relevance/tarantula
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.21
 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