gotascii-crags 1.1.1 → 1.2.0

data/crags.gemspec

@@ -1,16 +1,16 @@
 Gem::Specification.new do |s|
   s.name = %q{crags}
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Marney"]
   s.date = %q{2009-01-31}
   s.description = %q{A library to help search across multiple craigslist locations.}
-  s.email = %q{justin.marney@viget.com}
+  s.email = %q{gotascii@gmail.com}
   s.extra_rdoc_files = ["History.txt", "README.txt", "lib/js/client.html"]
   s.files = [".gitignore", "History.txt", "Manifest.txt", "README.txt", "Rakefile", "crags.gemspec", "lib/crags.rb", "lib/crags/fetch.rb", "lib/crags/proxy.rb", "lib/crags/runner.rb", "lib/crags/searcher.rb", "lib/js/client.html", "tasks/ann.rake", "tasks/bones.rake", "tasks/gem.rake", "tasks/git.rake", "tasks/manifest.rake", "tasks/notes.rake", "tasks/post_load.rake", "tasks/rdoc.rake", "tasks/rubyforge.rake", "tasks/setup.rb", "tasks/spec.rake", "tasks/svn.rake", "tasks/test.rake", "test/crags/fetch_test.rb", "test/crags/proxy_test.rb", "test/crags/runner_test.rb", "test/crags/searcher_test.rb", "test/test_helper.rb"]
   s.has_rdoc = true
-  s.homepage = %q{http://github.com/vigetlabs/crags}
+  s.homepage = %q{http://github.com/gotascii/crags}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{crags}

data/lib/crags.rb

@@ -3,7 +3,7 @@ require 'curb'
 require 'hpricot'
 
 module Crags
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
 

data/lib/crags/searcher.rb

@@ -2,6 +2,10 @@ module Crags
   module Searcher
     include Fetch
 
+    def strip_http(url)
+      url.gsub(/http\:\/\/(.*)\//,'\1')
+    end
+
     def location_doc
       fetch_doc("http://geo.craigslist.org/iso/us")
     end
@@ -11,7 +15,7 @@ module Crags
     end
 
     def locations
-      location_links.collect{|link| link["href"].gsub(/http\:\/\/(.*)\//,'\1') }
+      location_links.collect{|link| strip_http(link["href"]) }
     end
 
     def categories
@@ -32,22 +36,23 @@ module Crags
     end
 
     def items(doc)
-      doc.search("item")
+      doc.search("item").collect do |item|
+        hashify(item)
+      end
+    end
+
+    def hashify(item)
+      title = item.at("title").inner_text
+      url = strip_http(item["rdf:about"])
+      {:title => title, :url => url}
     end
 
     def search_location(keyword, loc, category = 'sss', &block)
       doc = fetch_doc("http://#{loc}/search/#{category}?query=#{keyword}&format=rss")
       items(doc).collect do |item|
-        link = create_link(item)
-        yield link if block_given?
-        link
+        yield item if block_given?
+        item
       end
     end
-
-    def create_link(item)
-      link = item["rdf:about"]
-      title = item.at("title").inner_text
-      "<a href=\"#{link}\">#{title}</a>"
-    end
   end
 end

data/test/crags/searcher_test.rb

@@ -7,6 +7,11 @@ context "Searcher with stubbed fetch doc" do
     stubs(:fetch_doc)
   end
 
+  specify "strip_http should remove http:// and trailing /" do
+    url = "http://omg/"
+    strip_http(url).should == "omg"
+  end
+
   specify "location doc should fetch doc at location url" do
     expects(:fetch_doc).with("http://geo.craigslist.org/iso/us").returns("doc")
     location_doc.should == "doc"
@@ -51,28 +56,24 @@ context "Searcher with stubbed fetch doc" do
     search_location("keyword", "url")
   end
 
-  specify "search location should create link with each item in doc items and return list" do
+  specify "search location should create return items" do
     items = [1,2,3]
     expects(:items).returns(items)
-    items.each do |i|
-      expects(:create_link).with(i).returns("omg#{i}")
-    end
-    search_location("keyword", "url").should == ['omg1','omg2','omg3']
+    search_location("keyword", "url").should == items
   end
 
-  specify "create link should return an a href based on item element" do
-    inner_text = mock(:inner_text=>"text")
-    item = mock do |l|
-      expects(:[]).with("rdf:about").returns("link")
-      expects(:at).with("title").returns(inner_text)
-    end
-
-    create_link(item).should == "<a href=\"link\">text</a>"
+  specify "items should get all item elements from doc" do
+    item = stub
+    stubs(:hashify).with(item).returns(1)
+    doc = mock { expects(:search).with("item").returns([item]) }
+    items(doc).should == [1]
   end
 
-  specify "items should get all item elements from doc" do
-    doc = mock { expects(:search).with("item").returns(1) }
-    items(doc).should == 1
+  specify "items should hashify all item elements from doc" do
+    item = stub
+    expects(:hashify).with(item).returns(1)
+    doc = stub { stubs(:search).returns([item]) }
+    items(doc).should == [1]
   end
 
   specify "categories should fetch doc the main sfbay page" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gotascii-crags
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - Justin Marney
@@ -14,7 +14,7 @@ default_executable:
 dependencies: []
 
 description: A library to help search across multiple craigslist locations.
-email: justin.marney@viget.com
+email: gotascii@gmail.com
 executables: []
 
 extensions: []
@@ -55,7 +55,7 @@ files:
 - test/crags/searcher_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://github.com/vigetlabs/crags
+homepage: http://github.com/gotascii/crags
 post_install_message: 
 rdoc_options: 
 - --main