geocaching 0.6.0 → 0.6.1

data/README.markdown

@@ -58,10 +58,10 @@ Tests
 -----
 
 Tests are written using [RSpec](http://relishapp.com/rspec).
+You need [Bundler](http://gembundler.com/) to run the tests.
 
-    $ export GC_USERNAME="username"
-    $ export GC_PASSWORD="password"
-    $ rake test
+    $ bundle update
+    $ GC_USERNAME="username" GC_PASSWORD="password" bundle exec rake test
 
 Additional environment variables you may specify are:
 

data/lib/geocaching.rb

@@ -79,14 +79,13 @@ module Geocaching
   class HTTPError < Error
   end
 
-  autoload :HTTP, "geocaching/http"
-  autoload :Cache, "geocaching/cache"
-  autoload :CacheType, "geocaching/cache_type"
-  autoload :Log, "geocaching/log"
-  autoload :LogType, "geocaching/log_type"
-  autoload :MyLogs, "geocaching/my_logs"
-  autoload :User, "geocaching/user"
-  autoload :Watchlist, "geocaching/watchlist"
-  autoload :PocketQuery, "geocaching/pocket_query"
-  autoload :VERSION, "geocaching/version"
+  autoload :Cache,        "geocaching/cache"
+  autoload :CacheType,    "geocaching/cache_type"
+  autoload :HTTP,         "geocaching/http"
+  autoload :Log,          "geocaching/log"
+  autoload :LogType,      "geocaching/log_type"
+  autoload :MyLogs,       "geocaching/my_logs"
+  autoload :User,         "geocaching/user"
+  autoload :VERSION,      "geocaching/version"
+  autoload :Watchlist,    "geocaching/watchlist"
 end

data/lib/geocaching/cache.rb

@@ -21,10 +21,6 @@ module Geocaching
   # information are available without being logged in, most information
   # will only be accessible after a successful login.
   #
-  # This class does caching.  That means that multiple calls of, for example,
-  # the {#latitude} method only do one HTTP request.  To override the cached
-  # information, call the {#fetch} method manually.
-  #
   # == Usage
   #
   #  cache = Geocaching::Cache.fetch(:code => "GCTEST")
@@ -149,7 +145,8 @@ module Geocaching
     def fetch
       raise ArgumentError, "Neither code nor GUID given" unless @code or @guid
 
-      resp, @data = HTTP.get(path)
+      base_path = "/seek/cache_details.aspx?log=y&"
+      resp, @data = HTTP.get(base_path + (@code ? "wp=#{@code}" : "guid=#{@guid}"))
       @doc = Nokogiri::HTML.parse(@data)
     end
 
@@ -207,10 +204,10 @@ module Geocaching
         elements = @doc.search("div.CacheDetailNavigationWidget li a[href^='/seek/log.aspx']")
 
         if elements.size > 0 and elements.first["href"] =~ /ID=(\d+)/
-          @id = $1.to_i
+          id = $1.to_i
         end
 
-        @id || begin
+        id || begin
           raise ParseError, "Could not extract ID from website"
         end
       end
@@ -260,9 +257,10 @@ module Geocaching
     def owner
       @owner ||= begin
         raise NotFetchedError unless fetched?
+        elements = @doc.search("span.minorCacheDetails a[href*='/profile/?guid=']")
 
-        if @data =~ /<strong>\s*?A[(n\s*?Event)]*\s*?cache\s*?<\/strong>\s*?by\s*?<a.*?guid=([a-f0-9-]{36}).*?>(.*?)<\/a>/
-          @owner_display_name = HTTP.unescape($2)
+        if elements.size == 1 and elements.first["href"] =~ /guid=([a-f0-9-]{36})/
+          @owner_display_name = HTTP.unescape(elements.first.content)
           User.new(:guid => $1)
         else
           raise ParseError, "Could not extract owner from website"
@@ -284,8 +282,9 @@ module Geocaching
     def difficulty
       @difficulty ||= begin
         raise NotFetchedError unless fetched?
+        elements = @doc.search("#ctl00_ContentBody_uxLegendScale img")
 
-        if @data =~ /<strong>\s*?Difficulty:<\/strong>\s*?<img.*?alt="([\d\.]{1,3}) out of 5" \/>/
+        if elements.size == 1 and elements.first["alt"] =~ /([\d\.]{1,3}) out of 5/
           $1.to_f
         else
           raise ParseError, "Could not extract difficulty rating from website"
@@ -299,8 +298,9 @@ module Geocaching
     def terrain
       @terrain ||= begin
         raise NotFetchedError unless fetched?
+        elements = @doc.search("#ctl00_ContentBody_Localize6 img")
 
-        if @data =~ /<strong>\s+?Terrain:<\/strong>\s+?<img.*?alt="([\d\.]{1,3}) out of 5" \/>/
+        if elements.size == 1 and elements.first["alt"] =~ /([\d\.]{1,3}) out of 5/
           $1.to_f
         else
           raise ParseError, "Could not extract terrain rating from website"
@@ -315,7 +315,7 @@ module Geocaching
       @hidden_at ||= begin
         raise NotFetchedError unless fetched?
 
-        if @data =~ /<strong>\s*?Hidden\s*?:\s*?<\/strong>\s*?(\d{1,2})\/(\d{1,2})\/(\d{4})/
+        if @data =~ /<span class="minorCacheDetails">Hidden\s*?:\s*?(\d{1,2})\/(\d{1,2})\/(\d{4})<\/span>/
           Time.mktime($3, $1, $2)
         else
           raise ParseError, "Could not extract hidden date from website"
@@ -331,7 +331,7 @@ module Geocaching
         raise NotFetchedError unless fetched?
         return nil unless [:event, :megaevent, :cito, :lfevent].include?(type.to_sym)
 
-        if @data =~ /<strong>\s*?Event Date:\s*?<\/strong>\s*?\w+, (\d+) (\w+) (\d{4})/
+        if @data =~ /<span class="minorCacheDetails">\s*?Event Date:\s*?\w+, (\d+) (\w+) (\d{4})<\/span>/
           Time.parse([$1, $2, $3].join)
         else
           raise ParseError, "Could not extract event date from website"
@@ -553,9 +553,9 @@ module Geocaching
       })
     end
 
-    # Returns a Hash representation of this class.
+    # Returns a hash representing this cache.
     #
-    # @return [Hash] Hash representing this class
+    # @return [Hash] Hash representing this cache
     def to_hash
       hash = {
         :id         => id,
@@ -578,7 +578,7 @@ module Geocaching
         :unpublished? => unpublished?
       }
 
-      if [:event, :megaevent, :lfevent].include?(type)
+      if [:event, :megaevent, :lfevent, :cito].include?(type.to_sym)
         hash[:event_date] = event_date
       else
         hash[:hidden_at] = hidden_at
@@ -586,14 +586,5 @@ module Geocaching
 
       hash
     end
-
-  private
-
-    # Returns the HTTP request path.
-    #
-    # @return [String] HTTP request path
-    def path
-      "/seek/cache_details.aspx?log=y&" + (@code ? "wp=#{@code}" : "guid=#{@guid}")
-    end
   end
 end

data/lib/geocaching/http.rb

@@ -116,7 +116,7 @@ module Geocaching
       @loggedin = false
       @cookie = nil
 
-      get("/login/default.aspx?RESET=Y")
+      get("/login/default.aspx?RESETCOMPLETE=Y")
     end
 
     # Returns whether you‘ve already logged in.
@@ -147,8 +147,12 @@ module Geocaching
         raise HTTPError
       end
 
-      unless resp.kind_of?(Net::HTTPSuccess) or resp.kind_of?(Net::HTTPRedirection)
-        raise HTTPError
+      unless resp.kind_of?(Net::HTTPSuccess)
+        if resp.kind_of?(Net::HTTPRedirection) and resp.response["location"]
+          resp, data = get(resp.response["location"])
+        else
+          raise HTTPError
+        end
       end
 
       [resp, data]
@@ -187,7 +191,11 @@ module Geocaching
       end
 
       unless resp.kind_of?(Net::HTTPSuccess)
-        raise HTTPError
+        if resp.kind_of?(Net::HTTPRedirection) and resp.response["location"]
+          resp, data = get(resp.response["location"])
+        else
+          raise HTTPError
+        end
       end
 
       [resp, data]

data/lib/geocaching/log.rb

@@ -2,10 +2,6 @@
 
 module Geocaching
   # The {Log} class represents a log on geocaching.com.
-  #
-  # This class does caching.  That means that multiple calls of, for example,
-  # the {#date} method only do one HTTP request.  If you want to override the
-  # cached information, call the {#fetch} method manually.
   class Log
     # Creates a new instance and calls the {#fetch} method afterwards.
     # +:guid+ must be specified as an attribute.
@@ -58,7 +54,7 @@ module Geocaching
       raise ArgumentError, "No GUID given" unless @guid
       raise LoginError unless HTTP.loggedin?
 
-      resp, @data = HTTP.get(path)
+      resp, @data = HTTP.get("/seek/log.aspx?LUID=#{@guid}")
       @doc = Nokogiri::HTML.parse(@data)
     end
 
@@ -212,12 +208,5 @@ module Geocaching
         info
       end
     end
-
-    # Returns the HTTP request path.
-    #
-    # @return [String] HTTP request path
-    def path
-      "/seek/log.aspx?LUID=#{@guid}"
-    end
   end
 end

data/lib/geocaching/my_logs.rb

@@ -4,13 +4,11 @@ module Geocaching
   # The {MyLogs} class provides access to the logs the user
   # you’re logged in with has written.
   #
-  # This class does caching.  If you want to override the cached information,
-  # call the {#fetch} method manually.
-  #
   # == Usage
   #
   #  mylogs = Geocaching::MyLogs.fetch
-  #  puts "I've written #{mylogs.size} logs."
+  #  puts "I've written #{mylogs.logs.size} logs."
+  #
   class MyLogs
     # Creates a new instance and calls {#fetch} afterwards.
     #
@@ -27,7 +25,7 @@ module Geocaching
     def fetch
       raise LoginError unless HTTP.loggedin?
 
-      resp, @data = HTTP.get(path)
+      resp, @data = HTTP.get("/my/logs.aspx?s=1")
       @doc = Nokogiri::HTML.parse(@data)
     end
 
@@ -72,13 +70,6 @@ module Geocaching
 
   private
 
-    # Returns the HTTP request path.
-    #
-    # @return [String] HTTP request path
-    def path
-      "/my/logs.aspx?s=1"
-    end
-
     # Extracts information from a HTML table row node.
     #
     # @return [Hash] Extracted information

data/lib/geocaching/user.rb

@@ -5,13 +5,11 @@ require "time"
 module Geocaching
   # The {User} class represents a user on geocaching.com.
   #
-  # This class does caching.  If you want to override the cached information,
-  # call the {#fetch} method manually.
-  #
   # == Usage
   #
   #  user = Geocaching::User.fetch(:guid => "...")
   #  puts user.name #=> "Jack"
+  #
   class User
     # Creates a new instance and calls the {fetch} method afterwards.
     # +:guid+ must be given as an attribute.
@@ -52,7 +50,7 @@ module Geocaching
     def fetch
       raise ArgumentError, "No GUID given" unless @guid
 
-      resp, @data = HTTP.get(path)
+      resp, @data = HTTP.get("/profile/?guid=#{guid}")
       @doc = Nokogiri::HTML.parse(@data)
     end
 
@@ -215,14 +213,5 @@ module Geocaching
     def premium_member?
       status.include?("Premium Member")
     end
-
-  private
-
-    # Returns the HTTP request path.
-    #
-    # @return [String] HTTP request path
-    def path
-      "/profile/?guid=#{guid}"
-    end
   end
 end

data/lib/geocaching/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Geocaching
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/geocaching/watchlist.rb

@@ -2,12 +2,6 @@
 
 module Geocaching
   # The {Watchlist} class provides access to the user’s watchlist.
-  #
-  # This method does caching.  That means that multiple calls to, for example,
-  # the {#caches} method do only one HTTP request.  If you want to override
-  # the cached information, call the {#fetch} method manually.  Note that this
-  # only applies to instances of this class, so a HTTP request is made for
-  # every call of the {caches} class method.
   class Watchlist
     # Creates a new instance of this class and calls the {#caches} method.
     #
@@ -47,7 +41,7 @@ module Geocaching
         raise LoginError, "You need to be logged in to access your watchlist"
       end
 
-      resp, @data = HTTP.get(path)
+      resp, @data = HTTP.get("/my/watchlist.aspx")
       @doc = Nokogiri::HTML.parse(@data)
     end
 
@@ -61,13 +55,6 @@ module Geocaching
 
   private
 
-    # Returns the HTTP request path.
-    #
-    # @return [String] HTTP request path
-    def path
-      "/my/watchlist.aspx"
-    end
-
     # Returns the information from a HTML table row node.
     #
     # @return [Hash] Extracted information

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Thomas Cyron
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-28 00:00:00 +01:00
+date: 2011-02-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,21 +47,6 @@ dependencies:
         version: 1.4.6
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  type: :development
-  version_requirements: *id003
 description: A Ruby library that provides an API for geocaching.com
 email: thomas@thcyron.de
 executables: []
@@ -72,73 +57,16 @@ extra_rdoc_files: []
 
 files: 
 - README.markdown
-- Rakefile
-- geocaching.gemspec
 - lib/geocaching/cache.rb
 - lib/geocaching/cache_type.rb
 - lib/geocaching/http.rb
 - lib/geocaching/log.rb
 - lib/geocaching/log_type.rb
 - lib/geocaching/my_logs.rb
-- lib/geocaching/pocket_query.rb
 - lib/geocaching/user.rb
 - lib/geocaching/version.rb
 - lib/geocaching/watchlist.rb
 - lib/geocaching.rb
-- spec/cache/ape.rb
-- spec/cache/cito.rb
-- spec/cache/earthcache.rb
-- spec/cache/event.rb
-- spec/cache/letterbox.rb
-- spec/cache/lfevent.rb
-- spec/cache/locationless.rb
-- spec/cache/megaevent.rb
-- spec/cache/multi.rb
-- spec/cache/mystery.rb
-- spec/cache/traditional.rb
-- spec/cache/virtual.rb
-- spec/cache/webcam.rb
-- spec/cache/wherigo.rb
-- spec/cache_spec.rb
-- spec/helper.rb
-- spec/log/announcement.rb
-- spec/log/announcement.txt
-- spec/log/archive.rb
-- spec/log/archive.txt
-- spec/log/attended.rb
-- spec/log/attended.txt
-- spec/log/coords_update.rb
-- spec/log/coords_update.txt
-- spec/log/disable.rb
-- spec/log/disable.txt
-- spec/log/dnf.rb
-- spec/log/dnf.txt
-- spec/log/enable.rb
-- spec/log/enable.txt
-- spec/log/found.rb
-- spec/log/found.txt
-- spec/log/needs_archived.rb
-- spec/log/needs_archived.txt
-- spec/log/needs_maintenance.rb
-- spec/log/needs_maintenance.txt
-- spec/log/note.rb
-- spec/log/note.txt
-- spec/log/owner_maintenance.rb
-- spec/log/owner_maintenance.txt
-- spec/log/publish.rb
-- spec/log/publish.txt
-- spec/log/retract.rb
-- spec/log/retract.txt
-- spec/log/reviewer_note.rb
-- spec/log/reviewer_note.txt
-- spec/log/unarchive.rb
-- spec/log/unarchive.txt
-- spec/log/webcam_photo_taken.rb
-- spec/log/webcam_photo_taken.txt
-- spec/log/will_attend.rb
-- spec/log/will_attend.txt
-- spec/log_spec.rb
-- spec/user_spec.rb
 has_rdoc: false
 homepage: http://nano.github.com/ruby-geocaching
 licenses: []