crags 2.1.2 → 2.2.0

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem "curb"
-gem "hpricot"
+gem "nokogiri"
 
 group :test do
   gem "rspec"

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     curb (0.7.9)
     diff-lcs (1.1.2)
-    hpricot (0.8.3)
+    nokogiri (1.4.4)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
       rspec-expectations (~> 2.4.0)
@@ -18,5 +18,5 @@ PLATFORMS
 
 DEPENDENCIES
   curb
-  hpricot
+  nokogiri
   rspec

data/VERSION

@@ -1 +1 @@
-2.1.2
+2.2.0

data/crags.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crags}
-  s.version = "2.1.2"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Marney"]
-  s.date = %q{2011-01-17}
+  s.date = %q{2011-02-08}
   s.description = %q{A library to help search across multiple craigslist locations.}
   s.email = %q{gotascii@gmail.com}
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
     "lib/crags/search/country.rb",
     "lib/crags/search/location.rb",
     "lib/crags/search/search.rb",
-    "lib/ext/hpricot/elem.rb",
+    "lib/ext/element.rb",
     "lib/ext/string.rb",
     "spec/crags/category_spec.rb",
     "spec/crags/country_spec.rb",
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
     "spec/crags/search/country_spec.rb",
     "spec/crags/search/location_spec.rb",
     "spec/crags/search/search_spec.rb",
-    "spec/ext/hpricot/elem_spec.rb",
+    "spec/ext/element_spec.rb",
     "spec/ext/string_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
     "spec/crags/search/country_spec.rb",
     "spec/crags/search/location_spec.rb",
     "spec/crags/search/search_spec.rb",
-    "spec/ext/hpricot/elem_spec.rb",
+    "spec/ext/element_spec.rb",
     "spec/ext/string_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -71,14 +71,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<curb>, [">= 0"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
     else
       s.add_dependency(%q<curb>, [">= 0"])
-      s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
     end
   else
     s.add_dependency(%q<curb>, [">= 0"])
-    s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
   end
 end
 

data/lib/crags/fetcher.rb

@@ -1,10 +1,10 @@
 module Crags
   module Fetcher
     def fetch_doc(url)
-      Hpricot.parse(fetch_html(url))
+      Nokogiri::XML.parse(fetch_xml(url))
     end
 
-    def fetch_html(url)
+    def fetch_xml(url)
       req = fetch_request(url)
       req.body_str
     end

data/lib/crags.rb

@@ -1,9 +1,9 @@
-require 'hpricot'
+require 'nokogiri'
 require 'curl'
 require 'erb'
 require 'ostruct'
 require 'ext/string'
-require 'ext/hpricot/elem'
+require 'ext/element'
 require 'crags/fetcher'
 require 'crags/country'
 require 'crags/location'

data/lib/ext/element.rb

@@ -0,0 +1,21 @@
+module Element
+  def title
+    at("title").content
+  end
+
+  def url
+    self["about"].strip_http
+  end
+
+  def date_str
+    at("dc|date").content
+  end
+
+  def date
+    DateTime.parse(date_str)
+  end
+end
+
+class Nokogiri::XML::Element
+  include Element
+end

data/spec/crags/fetcher_spec.rb

@@ -5,17 +5,17 @@ describe Fetcher do
     extend Fetcher
   end
 
-  it "hpricots the fetched html" do
-    stub!(:fetch_html).with("url").and_return("html")
-    Hpricot.should_receive(:parse).with("html").and_return("doc")
+  it "nokogiris the fetched xml" do
+    stub!(:fetch_xml).with("url").and_return("xml")
+    Nokogiri::XML.should_receive(:parse).with("xml").and_return("doc")
     fetch_doc("url").should == "doc"
   end
 
-  it "fetch_requests a url" do
+  it "fetches a request when fetching xml" do
     curb = mock("curb")
     curb.stub!(:body_str).and_return("uhh")
     should_receive(:fetch_request).with("url").and_return(curb)
-    fetch_html("url").should == "uhh"
+    fetch_xml("url").should == "uhh"
   end
 
   it "creates a new request" do

data/spec/ext/{hpricot/elem_spec.rb → element_spec.rb}

@@ -1,26 +1,30 @@
 require 'spec_helper'
 
-describe Hpricot::Elem do
+class Tester
+  include Element
+end
+
+describe Nokogiri::XML::Element do
   before do
-    @elem = Hpricot::Elem.new("<omg></omg>")
+    @elem = Tester.new
   end
 
   it "uses the inner_text of title element for title" do
     title = stub
-    title.stub!(:inner_text).and_return("title!")
+    title.stub!(:content).and_return("title!")
     @elem.stub!(:at).with("title").and_return(title)
     @elem.title.should == "title!"
   end
 
   it "rdf:about attribute for the url" do
-    @elem.stub!(:[]).with("rdf:about").and_return("url!")
+    @elem.stub!(:[]).with("about").and_return("url!")
     @elem.url.should == "url!"
   end
 
   it "uses the inner_text of the dc:date element for date_str" do
     dc_date = stub
-    dc_date.stub!(:inner_text).and_return("date_str!")
-    @elem.stub!(:at).with("dc:date").and_return(dc_date)
+    dc_date.stub!(:content).and_return("date_str!")
+    @elem.stub!(:at).with("dc|date").and_return(dc_date)
     @elem.date_str.should == "date_str!"
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crags
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: false
   segments: 
   - 2
-  - 1
   - 2
-  version: 2.1.2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Justin Marney
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -05:00
+date: 2011-02-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  name: hpricot
+  name: nokogiri
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -72,7 +72,7 @@ files:
 - lib/crags/search/country.rb
 - lib/crags/search/location.rb
 - lib/crags/search/search.rb
-- lib/ext/hpricot/elem.rb
+- lib/ext/element.rb
 - lib/ext/string.rb
 - spec/crags/category_spec.rb
 - spec/crags/country_spec.rb
@@ -82,7 +82,7 @@ files:
 - spec/crags/search/country_spec.rb
 - spec/crags/search/location_spec.rb
 - spec/crags/search/search_spec.rb
-- spec/ext/hpricot/elem_spec.rb
+- spec/ext/element_spec.rb
 - spec/ext/string_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -128,6 +128,6 @@ test_files:
 - spec/crags/search/country_spec.rb
 - spec/crags/search/location_spec.rb
 - spec/crags/search/search_spec.rb
-- spec/ext/hpricot/elem_spec.rb
+- spec/ext/element_spec.rb
 - spec/ext/string_spec.rb
 - spec/spec_helper.rb

data/lib/ext/hpricot/elem.rb

@@ -1,19 +0,0 @@
-module Hpricot
-  class Elem
-    def title
-      at("title").inner_text
-    end
-
-    def url
-      self["rdf:about"].strip_http
-    end
-
-    def date_str
-      at("dc:date").inner_text
-    end
-
-    def date
-      DateTime.parse(date_str)
-    end
-  end
-end