Skip to content

Commit

Permalink
Bring repo up to date
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpeace
jpeace committed Jan 24, 2012
1 parent 1f8b7c8 commit e5d3f24
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion doc/Horseman/Action.html
View file
Expand Up @@ -200,7 +200,7 @@ <h3 class="section-header">Public Class Methods</h3>
<pre><span class="ruby-comment"># File lib/horseman/action.rb, line 7</span>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">uri</span>, <span class="ruby-identifier">response</span>=<span class="ruby-keyword">nil</span>)
<span class="ruby-ivar">@uri</span> = <span class="ruby-identifier">uri</span>
<span class="ruby-ivar">@response</span> = <span class="ruby-constant">Horseman</span><span class="ruby-operator">::</span><span class="ruby-constant">Response</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">response</span>.<span class="ruby-identifier">body</span>, <span class="ruby-identifier">response</span>.<span class="ruby-identifier">to_hash</span>) <span class="ruby-keyword">unless</span> <span class="ruby-identifier">response</span>.<span class="ruby-identifier">nil?</span>
<span class="ruby-ivar">@response</span> = <span class="ruby-constant">Response</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">response</span>.<span class="ruby-identifier">body</span>, <span class="ruby-identifier">response</span>.<span class="ruby-identifier">to_hash</span>) <span class="ruby-keyword">unless</span> <span class="ruby-identifier">response</span>.<span class="ruby-identifier">nil?</span>
<span class="ruby-keyword">end</span></pre>
</div><!-- new-source -->

Expand Down
8 changes: 4 additions & 4 deletions doc/Horseman/Browser.html
View file
Expand Up @@ -257,7 +257,7 @@ <h3 class="section-header">Public Class Methods</h3>
<span class="ruby-keyword">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">connection</span>, <span class="ruby-identifier">base_url</span>=<span class="ruby-string">''</span>)
<span class="ruby-ivar">@connection</span> = <span class="ruby-identifier">connection</span>
<span class="ruby-ivar">@base_url</span> = <span class="ruby-identifier">base_url</span>
<span class="ruby-ivar">@cookies</span> = <span class="ruby-constant">Horseman</span><span class="ruby-operator">::</span><span class="ruby-constant">Cookies</span>.<span class="ruby-identifier">new</span>
<span class="ruby-ivar">@cookies</span> = <span class="ruby-constant">Cookies</span>.<span class="ruby-identifier">new</span>
<span class="ruby-ivar">@multipart_boundary</span> = <span class="ruby-node">&quot;----HorsemanBoundary#{SecureRandom.hex(8)}&quot;</span>
<span class="ruby-keyword">end</span></pre>
</div><!-- new-source -->
Expand Down Expand Up @@ -288,7 +288,7 @@ <h3 class="section-header">Public Class Methods</h3>
<div class="method-source-code" id="with_base_url-source">
<pre><span class="ruby-comment"># File lib/horseman/browser.rb, line 13</span>
<span class="ruby-keyword">def</span> <span class="ruby-keyword">self</span>.<span class="ruby-identifier">with_base_url</span>(<span class="ruby-identifier">base_url</span>)
<span class="ruby-constant">Horseman</span><span class="ruby-operator">::</span><span class="ruby-constant">Browser</span>.<span class="ruby-identifier">new</span>(<span class="ruby-constant">Horseman</span><span class="ruby-operator">::</span><span class="ruby-constant">Connection</span>.<span class="ruby-identifier">new</span>, <span class="ruby-identifier">base_url</span>)
<span class="ruby-constant">Browser</span>.<span class="ruby-identifier">new</span>(<span class="ruby-constant">Connection</span>.<span class="ruby-identifier">new</span>, <span class="ruby-identifier">base_url</span>)
<span class="ruby-keyword">end</span></pre>
</div><!-- with_base_url-source -->

Expand Down Expand Up @@ -401,7 +401,7 @@ <h3 class="section-header">Public Instance Methods</h3>
<span class="ruby-keyword">end</span>
<span class="ruby-identifier">request_body</span> = <span class="ruby-identifier">build_request_body</span>(<span class="ruby-identifier">data</span>, <span class="ruby-identifier">selected_form</span>.<span class="ruby-identifier">encoding</span>)

<span class="ruby-keyword">if</span> <span class="ruby-identifier">is_absolute_url</span>(<span class="ruby-identifier">selected_form</span>.<span class="ruby-identifier">action</span>)
<span class="ruby-keyword">if</span> <span class="ruby-identifier">is_absolute_url?</span>(<span class="ruby-identifier">selected_form</span>.<span class="ruby-identifier">action</span>)
<span class="ruby-comment"># Absolute action http://www.example.com/action</span>
<span class="ruby-identifier">url</span> = <span class="ruby-identifier">selected_form</span>.<span class="ruby-identifier">action</span>
<span class="ruby-keyword">elsif</span> <span class="ruby-identifier">selected_form</span>.<span class="ruby-identifier">action</span> <span class="ruby-operator">==</span> <span class="ruby-string">''</span>
Expand All @@ -419,7 +419,7 @@ <h3 class="section-header">Public Instance Methods</h3>
<span class="ruby-keyword">else</span>
<span class="ruby-string">&quot;application/x-www-form-urlencoded&quot;</span>
<span class="ruby-keyword">end</span>
<span class="ruby-identifier">request</span>[<span class="ruby-string">'Referer'</span>] = <span class="ruby-ivar">@last_action</span>.<span class="ruby-identifier">url</span>
<span class="ruby-identifier">request</span>[<span class="ruby-string">'Referer'</span>] = <span class="ruby-ivar">@last_action</span>.<span class="ruby-identifier">url</span>

<span class="ruby-identifier">exec</span> <span class="ruby-identifier">request</span>
<span class="ruby-keyword">end</span></pre>
Expand Down
8 changes: 4 additions & 4 deletions doc/created.rid
View file
@@ -1,9 +1,9 @@
Wed, 11 Jan 2012 14:20:52 -0600
Tue, 24 Jan 2012 12:19:14 -0600
README.rdoc Mon, 09 Jan 2012 11:45:07 -0600
lib/horseman.rb Mon, 09 Jan 2012 16:58:53 -0600
lib/horseman/action.rb Wed, 11 Jan 2012 12:30:31 -0600
lib/horseman/browser.rb Wed, 11 Jan 2012 14:17:32 -0600
lib/horseman/connection.rb Wed, 11 Jan 2012 14:17:10 -0600
lib/horseman/action.rb Thu, 12 Jan 2012 12:55:28 -0600
lib/horseman/browser.rb Thu, 19 Jan 2012 14:05:13 -0600
lib/horseman/connection.rb Thu, 12 Jan 2012 15:28:23 -0600
lib/horseman/cookies.rb Thu, 05 Jan 2012 19:02:27 -0600
lib/horseman/response.rb Wed, 11 Jan 2012 12:21:49 -0600
lib/horseman/version.rb Wed, 11 Jan 2012 14:19:51 -0600
2 changes: 1 addition & 1 deletion horseman.gemspec
View file
Expand Up @@ -6,7 +6,7 @@ Gem::Specification.new do |s|

s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
s.authors = ["Jarrod Peace"]
s.date = "2012-01-11"
s.date = "2012-01-24"
s.description = "Headless HTTP crawler/scraper"
s.email = "peace.jarrod@gmail.com"
s.extra_rdoc_files = ["README.rdoc", "lib/horseman.rb", "lib/horseman/action.rb", "lib/horseman/browser.rb", "lib/horseman/connection.rb", "lib/horseman/cookies.rb", "lib/horseman/response.rb", "lib/horseman/version.rb"]
Expand Down
8 changes: 4 additions & 4 deletions lib/horseman/browser.rb
View file
Expand Up @@ -47,7 +47,7 @@ def post!(path = '/', options = {})
end
request_body = build_request_body(data, selected_form.encoding)

if is_absolute_url(selected_form.action)
if is_absolute_url?(selected_form.action)
# Absolute action http://www.example.com/action
url = selected_form.action
elsif selected_form.action == ''
Expand All @@ -65,7 +65,7 @@ def post!(path = '/', options = {})
else
"application/x-www-form-urlencoded"
end
request['Referer'] = @last_action.url
request['Referer'] = @last_action.url

exec request
end
Expand All @@ -88,7 +88,7 @@ def exec(request, redirects=0)
raise "Redirect limit reached" if redirects >= MaxRedirects

redirect_url = response['location']
if !is_absolute_url(redirect_url)
if !is_absolute_url?(redirect_url)
redirect_url = "#{@last_action.relative_root}#{redirect_url}"
end
get!(redirect_url, :redirects => redirects+1, :no_base_url => true)
Expand All @@ -105,7 +105,7 @@ def build_request_body(data, encoding=:url)
end
end

def is_absolute_url(url)
def is_absolute_url?(url)
url[/\w+:\/\/.*/]
end
end
Expand Down

0 comments on commit e5d3f24

Please sign in to comment.