gotascii-crags 1.4.3 → 1.4.4

data/crags.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crags}
-  s.version = "1.4.3"
+  s.version = "1.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Marney"]

data/lib/crags.rb

@@ -4,7 +4,7 @@ require 'hpricot'
 require 'erb'
 
 module Crags
-  VERSION = '1.4.3'
+  VERSION = '1.4.4'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
 

data/lib/crags/fetch.rb

@@ -5,7 +5,15 @@ module Crags
     end
 
     def fetch_html(url)
-      Curl::Easy.perform(url).body_str
+      req = Curl::Easy.perform(url)
+      req.body_str
+    end
+
+    def fetch_request(url)
+      req = Curl::Easy.new(url)
+      req.follow_location = true
+      req.perform
+      req
     end
   end
 end

data/lib/crags/searcher.rb

@@ -7,8 +7,16 @@ module Crags
       url.gsub(/http\:\/\/(.*)(\/|(.html))/,'\1\3')
     end
 
+    def location_link(country)
+      "http://geo.craigslist.org/iso/#{country}"
+    end
+
     def location_doc(country)
-      fetch_doc("http://geo.craigslist.org/iso/#{country}")
+      fetch_doc(location_link(country))
+    end
+
+    def location_request(country)
+      fetch_request(location_link(country))
     end
 
     def location_links(country)
@@ -16,7 +24,12 @@ module Crags
     end
 
     def locations(country)
-      location_links(country).collect{|link| strip_http(link["href"]) }
+      linkz = location_links(country)
+      if linkz.empty?
+        [location_request(country).last_effective_url]
+      else
+        linkz.collect{|link| strip_http(link["href"]) }
+      end
     end
 
     def categories

data/test/crags/fetch_test.rb

@@ -17,5 +17,17 @@ class Crags::FetchTest < Test::Unit::TestCase
       Curl::Easy.expects(:perform).with("url").returns(curb)
       fetch_html("url").should == "uhh"
     end
+
+    should "create a new request" do
+      req = stub(:follow_location= => nil, :perform => nil)
+      Curl::Easy.expects(:new).with("url").returns(req)
+      fetch_request("url").should == req
+    end
+    
+    should "follow redirects for fetched requests" do
+      req = mock(:follow_location= => nil, :perform => nil)
+      Curl::Easy.stubs(:new).returns(req)
+      fetch_request("url")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gotascii-crags
 version: !ruby/object:Gem::Version 
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors: 
 - Justin Marney