geocaching 0.1.0 → 0.2.0

data/Rakefile

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 task :default => :test
 
 task :test do

data/geocaching.gemspec

@@ -1,21 +1,19 @@
 Gem::Specification.new do |s|
-  s.name        = "geocaching"
-  s.version     = "0.1.0"
+  s.name = "geocaching"
+  s.version = "0.2.0"
 
-  s.summary     = "Library for accessing information on geocaching.com"
-  s.description = <<-EOD
-A Ruby library that allows to access information on geocaching.com
-in an object-oriented manner.
-EOD
+  s.summary = "API for geocaching.com"
+  s.description = "A Ruby library that provides an API for information on geocaching.com"
 
-  s.author      = "nano"
-  s.email       = "nano@fooo.org"
-  s.homepage    = "http://nano.github.com/geocaching"
+  s.author = "Thomas Cyron"
+  s.email = "nano@fooo.org"
+  s.homepage = "http://nano.github.com/ruby-geocaching"
 
-  s.has_rdoc    = false
-  s.has_yardoc  = true
+  s.files  = %w(README.markdown Rakefile geocaching.gemspec)
+  s.files += Dir.glob("lib/**/*")
+  s.files += Dir.glob("spec/**/*")
 
-  s.files       = %w(README.markdown Rakefile geocaching.gemspec)
-  s.files      += Dir.glob("lib/**/*")
-  s.files      += Dir.glob("spec/**/*")
+  s.has_rdoc = false
+  s.add_dependency "nokogiri", ">= 1.4.2"
+  s.add_development_dependency "rspec"
 end

data/lib/geocaching/cache.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "time"
 
 module Geocaching
@@ -70,7 +72,7 @@ module Geocaching
       raise ArgumentError, "Neither code nor GUID given" unless @code or @guid
 
       resp, @data = HTTP.get(path)
-      @doc = Hpricot(@data)
+      @doc = Nokogiri::HTML.parse(@data)
     end
 
     # Whether information have successfully been fetched
@@ -91,7 +93,7 @@ module Geocaching
         raise NotFetchedError unless fetched?
         elements = @doc.search("#ctl00_uxWaypointName.GCCode")
 
-        if elements.size == 1 and elements.first.inner_html =~ /(GC[A-Z0-9]+)/
+        if elements.size == 1 and elements.first.content =~ /(GC[A-Z0-9]+)/
           HTTP.unescape($1)
         else
           raise ExtractError, "Could not extract code from website"
@@ -111,7 +113,7 @@ module Geocaching
         elements = @doc.search("#ctl00_ContentBody_lnkPrintFriendly")
         guid = nil
 
-        if elements.size == 1 and href = elements.first.attributes["href"]
+        if elements.size == 1 and href = elements.first["href"]
           guid = $1 if href =~ /guid=([0-9a-f-]{36})/
         end
 
@@ -149,7 +151,7 @@ module Geocaching
         elements = @doc.search("span#ctl00_ContentBody_CacheName")
 
         if elements.size == 1
-          HTTP.unescape(elements.first.inner_html)
+          HTTP.unescape(elements.first.content)
         else
           raise ExtractError, "Could not extract name from website"
         end
@@ -239,7 +241,7 @@ module Geocaching
         latitude = nil
         elements = @doc.search("a#ctl00_ContentBody_lnkConversions")
 
-        if elements.size == 1 and href = elements.first.attributes["href"]
+        if elements.size == 1 and href = elements.first["href"]
           latitude = $1.to_f if href =~ /lat=(-?[0-9\.]+)/
         end
 
@@ -261,7 +263,7 @@ module Geocaching
         longitude = nil
         elements = @doc.search("a#ctl00_ContentBody_lnkConversions")
 
-        if elements.size == 1 and href = elements.first.attributes["href"]
+        if elements.size == 1 and href = elements.first["href"]
           longitude = $1.to_f if href =~ /lon=(-?[0-9\.]+)/
         end
 

data/lib/geocaching/http.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "cgi"
 require "net/http"
 require "timeout"
@@ -54,7 +56,9 @@ module Geocaching
       #
       # @return [String] The converted string
       def unescape(str)
-        CGI.unescapeHTML(str.gsub(/&#(\d{3});/) { [$1.to_i].pack("U") })
+        str = str.force_encoding("UTF-8")
+        str = str.gsub(/&#(\d{3});/) { [$1.to_i].pack("U") }
+        CGI.unescapeHTML(str)
       end
     end
 

data/lib/geocaching/log.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Geocaching
   # This class represents a log on geocaching.com.
   class Log
@@ -52,7 +54,7 @@ module Geocaching
       raise LoginError, "Need to be logged in to fetch log information" unless HTTP.loggedin?
 
       resp, @data = HTTP.get(path)
-      @doc = Hpricot(@data)
+      @doc = Nokogiri::HTML.parse(@data)
     end
 
     # Whether information have successfully been fetched
@@ -150,7 +152,7 @@ module Geocaching
 
     def meta
       @meta ||= begin
-        elements = @doc.search("meta").select { |e| e.attributes["name"] =~ /^og:/ }.flatten
+        elements = @doc.search("meta").select { |e| e["name"] =~ /^og:/ }.flatten
         info = {}
 
         elements.each do |element|

data/lib/geocaching.rb

@@ -1,4 +1,6 @@
-require "hpricot"
+# encoding: utf-8
+
+require "nokogiri"
 
 # This is a Ruby library to access information on geocaching.com.  As
 # Groundspeak does not provide a public API yet, one needs to parse the
@@ -33,18 +35,23 @@ require "hpricot"
 #  p log.username #=> Foobar
 #
 module Geocaching
+  # All exceptions raised by this library are subclasses of this class.  It
+  # easily allows to rescue from all exceptions by catching Geocaching::Error.
+  class Error < Exception
+  end
+
   # This exception is raised when a method that requires being
   # logged in is called when not logged in.
-  class LoginError < Exception
+  class LoginError < Error
   end
 
   # This exception is raised when a timeout is hit.
-  class TimeoutError < Exception
+  class TimeoutError < Error
   end
 
   # This exception is raised when a method is called that requires
   # the +#fetch+ method to be called first.
-  class NotFetchedError < Exception
+  class NotFetchedError < Error
     def initialize
       super "Need to call the #fetch method first"
     end
@@ -53,11 +60,11 @@ module Geocaching
   # This exception is raised when information could not be
   # extracted out of the website’s HTML code.  For example,
   # this may happen if Groundspeak changed their website.
-  class ExtractError < Exception
+  class ExtractError < Error
   end
 
   # This exception is raised when a HTTP request fails.
-  class HTTPError < Exception
+  class HTTPError < Error
   end
 
   autoload :HTTP, "geocaching/http"

data/spec/cache_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require "geocaching"

data/spec/helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 unless ENV["GC_USERNAME"] and ENV["GC_PASSWORD"]
   $stderr.puts "You need to provide your geocaching.com account credentials"
   $stderr.puts "by setting the environment variables GC_USERNAME and GC_PASSWORD."

data/spec/log_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require "geocaching"

metadata

@@ -4,24 +4,48 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
-- nano
+- Thomas Cyron
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 +02:00
+date: 2010-07-27 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
-description: |
-  A Ruby library that allows to access information on geocaching.com
-  in an object-oriented manner.
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: A Ruby library that provides an API for information on geocaching.com
 email: nano@fooo.org
 executables: []
 
@@ -41,8 +65,8 @@ files:
 - spec/helper.rb
 - spec/log_message.txt
 - spec/log_spec.rb
-has_rdoc: yard
-homepage: http://nano.github.com/geocaching
+has_rdoc: false
+homepage: http://nano.github.com/ruby-geocaching
 licenses: []
 
 post_install_message: 
@@ -72,6 +96,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Library for accessing information on geocaching.com
+summary: API for geocaching.com
 test_files: []