dopplr 0.1.0 → 0.2.0

data/README.md

@@ -18,9 +18,9 @@ Now that you have a single-use token, assign it to the `Dopplr::Client` object a
     client.token = '1a2b3c4d5e6f'     #=> '1a2b3c4d5e6f'
     client.create_session             #=> '3c4d5e6f1a2b'
 
-### Instantiating and working with objects
+### Instantiating and returning data from objects
 
-All Dopplr objects are created using the client as a base, you can then branch of from them to dig deeper.
+All Dopplr objects are created using the client as a base.
 
     mike      = client.traveller      #=> Dopplr::Traveller for the token holder
     chicago   = client.city 4887398   #=> Dopplr::City for ID 4887398
@@ -57,4 +57,23 @@ Return a new `Dopplr::City` object without knowing the geoname_id (I'm feeling l
     portland = client.find_city "Portland"
     
     portland.country      #=> "United States"
-    portland.geoname_id   #=> 5746545
+    portland.geoname_id   #=> 5746545
+
+### Working with and creating new trip data
+
+Plan a new trip to Portland, OR.
+
+    portland.add_trip('2010-01-12', '2010-01-19')
+    portland_trip = mike.future_trips.last
+    
+    portland_trip.start           #=> Tue Jan 12 00:00:00 2010
+    portland_trip.city.latitude   #=> 45.5235
+
+Add some tags and a note to your trip.
+
+    portland_trip.add_tags :work, :meetup
+    portland_trip.add_note "Staying for a week, then heading back home."
+
+Trip got canceled? Delete it.
+
+    portland_trip.delete

data/lib/dopplr.rb

@@ -1,10 +1,9 @@
 $: << File.dirname(__FILE__)
 
 require 'rubygems'
-require 'time'
-require 'cgi'
 require 'net/https'
 require 'json'
+require 'time'
 
 require 'dopplr/client'
 require 'dopplr/traveller'

data/lib/dopplr/city.rb

@@ -23,5 +23,9 @@ module Dopplr
       @url          = info['url']
       @localtime    = Time.parse info['localtime'].slice(0..-7)
     end
+    
+    def add_trip(start, finish)
+      @client.post 'add_trip', :geoname_id => @geoname_id, :start => start, :finish => finish
+    end
   end
 end

data/lib/dopplr/client.rb

@@ -6,18 +6,27 @@ module Dopplr
       @token = token
     end
     
-    # Makes an API call with @token.
+    # GET request with @token.
     def get(path, params={})
       params['format'] = 'js'
-      params_uri = URI.escape(params.collect{|key,value| "#{key}=#{value}"}.join('&'))
-      url = "/api/#{path}/?#{params_uri}"
+      url = "/api/#{path}/?#{URI.escape(params.collect{|key,value| "#{key}=#{value}"}.join('&'))}"
       http = Net::HTTP.new("www.dopplr.com", 443)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      http.start do |http|
-        request = Net::HTTP::Get.new url, 'Authorization' => "AuthSub token=\"#{@token}\""
-        JSON.parse(http.request(request).body)
-      end
+      responce, data = http.get(url, 'Authorization' => "AuthSub token=\"#{@token}\"")
+      JSON.parse(data)
+    end
+    
+    # POST request with @token.
+    def post(path, params={})
+      params['format'] = 'js'
+      data_string = URI.escape(params.collect{|key,value| "#{key}=#{value}"}.join('&'))
+      url = "/api/#{path}"
+      http = Net::HTTP.new("www.dopplr.com", 443)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      response, data = http.post(url, data_string, 'Authorization' => "AuthSub token=\"#{@token}\"")
+      JSON.parse(data)
     end
     
     # Returns a URL for getting a token.

data/lib/dopplr/traveller.rb

@@ -39,13 +39,21 @@ module Dopplr
     def trips(options = {})
       unless @trips && !options[:force]
         trips = @client.get('trips_info', @params)['trip']
-        if !trips.empty?
-          @trips = trips.map do |trip|
-            Trip.new @client, trip['id']
-          end
+        @trips = trips.map do |trip|
+          Trip.new @client, trip['id']
+        end
+      end
+      @trips
+    end
+    
+    def future_trips(options = {})
+      unless @future_trips && !options[:force]
+        trips = @client.get('future_trips_info', @params)['trip']
+        @future_trips = trips.map do |trip|
+          Trip.new @client, trip['id']
         end
       end
-      @trips ||= []
+      @future_trips
     end
     
     def fellows(options = {})
@@ -68,5 +76,18 @@ module Dopplr
       end
       @fellows
     end
+    
+    def location_on_date(date)
+      location = @client.get('location_on_date', @params.merge(:date => date))['location']
+      location['home'] = City.new(@client, location['home']['geoname_id'])
+      if location['trip']
+        location['trip'] = Trip.new(@client, location['trip']['id'])
+      end
+      location = location.inject({}) do |memo, (key, value)|
+        memo[key.to_sym] = value
+        memo
+      end
+      location
+    end
   end
 end

data/lib/dopplr/trip.rb

@@ -27,5 +27,19 @@ module Dopplr
       end
       @city
     end
+    
+    def add_tags(*tags)
+      info = @client.post 'add_trip_tags', :trip_id => @trip_id, :tags => tags.join('+')
+      @tags = info['trip']['tag']
+    end
+    
+    def add_note(note)
+      info = @client.post 'add_trip_note', :trip_id => @trip_id, :body => note
+      @notes = info['trip']['note']
+    end
+    
+    def delete
+      @client.post 'delete_trip', :trip_id => @trip_id
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dopplr
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mike Richards
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-06 00:00:00 -04:00
+date: 2009-08-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency