mapsqueak 0.0.1 → 0.0.2

data/lib/mapsqueak.rb

@@ -27,6 +27,7 @@ class MapSqueakSession
   def initialize(host = 'http://mapsqueak.heroku.com', username=nil,password=nil)
     @host = host
     @cookie_file = 'anonymous@anaonymous.com.cookies'
+    signin(username,password) unless username.nil?
   end
 
   # sign in by email/password. 
@@ -35,19 +36,21 @@ class MapSqueakSession
     signin_xml = Document.new
     signin_xml.add_element('session')
     signin_xml.root << xml_element('email',email)
-    signin_xml.root << xml_element('password',password)
+    
+    # allow nil passwords right now
+    signin_xml.root << xml_element('password',password.to_s)
     puts signin_xml.to_s
-
+    
     @cookie_file = "#{email}.cookies"
-
+    
     curl_str = "curl --data \'#{signin_xml.to_s}\' #{self.host}/sessions.xml -H \"Content-Type: application/xml\" --cookie-jar #{@cookie_file}"
-
+    
     result = `#{curl_str}`
     puts result
     doc = Document.new(result)
     @user_id = XPath.first(doc,"hash/user-id").text
   end
-
+  
   # sign the current user out.
   # note that the cookie file will be deleted. 
   def sign_out
@@ -60,74 +63,119 @@ class MapSqueakSession
   # post a new squeak. the squeak can either be whatever the ClientSqueak constructor accepts - 
   # a String of json or xml, or a hash, or it can be a ClientSqueak object. Talk about flexibility!
   # the send_format must be :xml or :json
-  def post_squeak(squeak,send_format = :xml)
-    s = nil
+  # facebook params is a Hash with either :facebook_test_user => true, or :access_token=> token
+  def squeak(squeak,send_format = :xml, facebook_params = {})
+    temp_squeak= nil
     case squeak
-      when ClientSqueak
-      s = squeak
-      when Hash
-      s = ClientSqueak.new(squeak)
+    when ClientSqueak
+      temp_squeak= squeak
+    when Hash
+      temp_squeak= ClientSqueak.new(squeak)
     end
     unless [:json, :xml].include?(send_format)
       $stderr.puts "Error: send_format must be in json or xml"
     end
     format_str = send_format.to_s
-    data = s.send("to_#{format_str}")
+    data = temp_squeak.send("to_#{format_str}")
     curl_str = "curl --data \'#{data}\' #{self.host}/squeaks.#{format_str} -H \"Content-Type: application/#{format_str}\" --cookie #{@cookie_file}"
-
+    
     # execute the curl command
-    `#{curl_str}`
+    res = `#{curl_str}`
+    actual_squeak = ClientSqueak.new(res)
+    
+    if facebook_params.include?(:access_token)
+      user = Koala::Facebook::API.new(facebook_params[:access_token])
+    elsif(facebook_params.include?(:facebook_test_user))
+      test_users = Koala::Facebook::TestUsers.new(:app_id => '107582139349630', :secret => "ca16bbd5834ab7d4b012ec5e84a0d003")
+      user_info = test_users.create(true, "offline_access,read_stream,manage_pages,publish_stream")
+      login_url = user_info['login_url']
+      user = Koala::Facebook::API.new(user_info['access_token'])
+    end
+    
+    unless user.nil?
+      puts "Using the following facebook user: #{user.inspect}"
+      
+      picture_url = "http://maps.googleapis.com/maps/api/staticmap?center=#{update[:latitude]},#{update[:longitude]}&zoom=13&size=200x200&maptype=roadmap&markers=color:blue%7Clabel:M%7C#{update[:latitude]},#{update[:longitude]}&sensor=true"
+      
+      puts "Google image url: #{picture_url}"
+      
+      # Use google's static map api to get an image for the squeak
+      id = user.put_wall_post("MapSqueak update at #{Time.now.strftime('')}",{:name => 'squeak name', 
+				:link => "#{opts.host}/squeaks/#{confirmation_return_hash['squeak']['id']}",
+				:caption => opts.text,
+				:description => "the description of the squeak, TBD",
+				:picture => picture_url})
+      puts "Updated facebook  with id: #{id}"
+      puts "Visit #{login_url} to see it ..." unless login_url.nil?
+    end
+    
+    # return the Squeak
+    return actual_squeak
   end
-
+  
   # get a list of no more than max squeaks closest to the given center_latitude/centerlongitude
   # The format must either be :json or :xml.
   # TODO: create a list of ClientSqueak objects, or make a get_squeak_objects function
-  def get_squeaks(center_latitude,center_longitude,max = 100,format=:json)
+  def get_squeaks(center_latitude,center_longitude,max = 100,format=:xml)
     # curl "http://192.168.0.2:3000/squeaks.xml?num_squeaks=3&center_latitude=50.0&center_longitude=-1.8" 
     unless [:json, :xml].include?(format)
       $stderr.puts "Error: must be in json or xml"
     end
     
-    squeaks = `curl #{self.host}/squeaks.#{format.to_s}?num_squeaks=#{max}&center_latitude=#{center_latitude}&center_longitude=#{center_longitude}`
+    squeak_string = `curl #{self.host}/squeaks.#{format.to_s}?num_squeaks=#{max}&center_latitude=#{center_latitude}&center_longitude=#{center_longitude}`
 
-    # TODO: parse these appropriately
+    return squeak_str_to_objects(squeak_string,format)
   end
-
+  
   # return all of my squeaks in a specified format, either :xml or :json
-  def get_my_squeaks(format=:json)
+  def get_my_squeaks(format=:xml)
     unless [:json, :xml].include?(format)
       $stderr.puts "Error: must be in json or xml"
     end
     # TODO: add a hash based on the parameters requested and use session token
     # T
-    `curl #{self.host}/users/#{@user_id}.#{format.to_s} --cookie #{@cookie_file}`
+    squeak_string = `curl #{self.host}/users/#{@user_id}.#{format.to_s} --cookie #{@cookie_file}`
+    return squeak_str_to_objects(squeak_string,format)
+  end
+
+  # 
+  def edit_squeak(squeak, update_hash)
+    squeak.merge!(update_hash)
+    "curl --request PUT --data #{squeak.to_json} #{self.host}/squeaks/#{squeak.id}.json -H \"Content-Type: application/json\""
   end
-end
 
+:private
+  def squeak_str_to_objects(squeak_string,format)
+    squeaks = []
+    case format
+    when :xml
+      doc = Document.new(squeak_string)
+      doc.elements.each('squeaks/') {|el| squeaks << ClientSqueak.new(el.to_s)}
+    when :json
+      obj = JSON.parse(squeak_string)
+      obj['squeaks'].each {|s| squeaks << ClientSqueak.new(s) }
+    end
+    
+    return squeaks
+  end
+end
 # ClientSqueak - a class that encapsulates a client side squeak
 # Note that if I am not the owner of a squeak, I will not know the user
 class ClientSqueak
   include XmlHelpers
-  attr_accessor :latitude, :longitude, :text, :duration, :expires, :username
-
-  @@mandatory_parameters = %w[latitude longitude text duration]
-  @@min_latitude = -90.0
-  @@max_latitude = 90.0
-  @@min_longitude = -180.0
-  @@max_longitude = 180.0
-  @@min_duration = 0.0 
-  @@max_duration = 24.0
-  @@max_text_length = 140
-
-  # Initialize a new squeak which must be in an allowable format: 
+
+  attr_accessor :latitude, :longitude, :text, :duration, :expires, :username, :id, :time_utc,:expires,:created_at,:updated_at,:user_email, :gmaps
+  
+  # Initialize a new squeak which must be in an allowable format
+  # Must set: latitude, longitude, text, and duration
   # json - a String representation of a JSON object
-  #         e.g. {\"squeak\":{\"latitude\":\"54.1\",\"longitude\":\"-1.7\",\"duration\":\"2\",\"text\":\"Another squeak!\"}}
+  #         e.g. {\"squeak\":{\"latitude\":\"54\",\"longitude\":\"-1.5\",\"duration\":\"2\",\"text\":\"Another squeak!\"}}
   # xml - a String representation of an XML blob
-  #        e.g. <squeak><latitude>54.1</latitude><longitude>-1.7</longitude><text>Another squeak!</text><duration>2</duration></squeak>
+  #        e.g. <squeak><latitude>54</latitude><longitude>-1.5</longitude><text>Another squeak!</text><duration>2</duration></squeak>
   # hash - a hash representation of a squeak
-  #         e.g. {:squeak => {:latitude=> 54.1, :longitude=>-1.69, :text => "Another squeak!", :duration => 2}}
+  #         e.g. {:squeak => {:latitude=> 54, :longitude=>-1.69, :text => "Another squeak!", :duration => 2}}
   #         OR if you are lazy (like me) you can just specify the inner hash:
-  #         e.g. {:latitude=> 54.1, :longitude=>-1.69, :text => "Another squeak!", :duration => 2}
+  #         e.g. {:latitude=> 54, :longitude=>-1.69, :text => "Another squeak!", :duration => 2}
   def initialize(squeak)
     @original_squeak = squeak
     temp_hash = {:squeak => {}}
@@ -149,32 +197,37 @@ class ClientSqueak
 	  # a nice flexible way to parse the XML. as long as the XML 
 	  # is only one level deep
 	  doc.elements.each('squeak/') do | el |
-	    el.each do |child|
+	    el.elements.each do |child|
 	      temp_hash[:squeak][child.name.to_sym] = child.text
 	    end
 	  end
 	rescue Exception => e2
-	  raise "Can't parse squeak text: #{squeak}"
+	  raise "Can't parse squeak text: #{squeak}\n" + e2.backtrace.join("\n")
 	end
       end
     end
     
     t = temp_hash['squeak'] || temp_hash[:squeak]
-    parms_set = []
-    t.keys.each do | k |
-      # this will set and validate the parameters
-      self.send("#{k.to_s}=",t[k])
-      parms_set << k.to_s
-    end
+    self.merge!(t)
 
     # but we need to make sure that all of the mandatory parameters are defined
-    unless (@@mandatory_parameters - parms_set).empty?
+    unless (%w[latitude longitude text duration] - self.to_hash[:squeak].keys.map {|k| k.to_s}).empty?
       raise "Must have duration, lat and long and text"
     end
   end
 
+  # set the id, but only allow it once. we don't necessarily know the id at construction time, so 
+  # this should be good enough for now. 
+  def id=(id)
+    if @id.nil?
+      @id = id
+    else
+      raise "Can't change a squeak's id"
+    end
+  end
+
   # convert the squeak to XML format
-  # e.g. <squeak><latitude>54.1</latitude><longitude>-1.7</longitude><text>Another squeak!</text><duration>2</duration></squeak>
+  #  e.g. <squeak><latitude>54</latitude><longitude>-1.5</longitude><text>Another squeak!</text><duration>2</duration></squeak>
   def to_xml
     params_xml = Document.new
     params_xml.add_element('squeak')
@@ -186,7 +239,7 @@ class ClientSqueak
   end
 
   # convert the squeak to JSON format
-  #  e.g. {\"squeak\":{\"latitude\":\"54.1\",\"longitude\":\"-1.7\",\"duration\":\"2\",\"text\":\"Another squeak!\"}}
+  #  e.g. {\"squeak\":{\"latitude\":\"54\",\"longitude\":\"-1.5\",\"duration\":\"2\",\"text\":\"Another squeak!\"}}
   def to_json
     self.to_hash.to_json
   end
@@ -203,37 +256,53 @@ class ClientSqueak
     }
   end
 
+  # merge another Squeak's parameters by letting the other's parameters overwrite the current Squeak's parms. 
+  # Returns a copy Hash
+  def merge(other)
+    self.to_hash.merge!(other)
+  end
+
+  # merge another Squeak's parameters by letting the other's parameters overwrite the current Squeak's parms. 
+  # Modifies the current Squeak
+  def merge!(other)
+    t = other.to_hash
+    t.keys.each do | k |
+      # this will set and validate the parameters
+      self.send("#{k.to_s.gsub('-','_')}=",t[k])
+    end
+  end
+
   # set the latitude for the squeak
-  # must be between  @@min_latitude and @@max_latitude 
+  # must be between  -90.0 and 90.0 
   def latitude=(latitude)
     lat = latitude.to_f
-    raise "Bad latitude" if lat < @@min_latitude
-    raise "Bad latitude" if lat > @@max_latitude
+    raise "Bad latitude" if lat < -90.0
+    raise "Bad latitude" if lat > 90.0
     @latitude = lat
   end
 
   # set the longitude for the squeak
-  # must be between @@min_longitude and @@max_longitude
+  # must be between -180.0 and 180.0
   def longitude=(longitude)
     long = longitude.to_f
-    raise "Bad longitude" if long < @@min_longitude
-    raise "Bad longitude" if long > @@max_longitude
+    raise "Bad longitude" if long < -180.0
+    raise "Bad longitude" if long > 180.0
     @longitude = long
   end
 
   # set the time to live for the squeak
-  # must be between @@min_duration and @@max_duration
+  # must be between 0.0 and 24.0
   def duration=(duration)
     dur = duration.to_f
-    raise "Bad duration" if dur < @@min_duration
-    raise "Bad duration" if dur > @@max_duration
+    raise "Bad duration" if dur < 0.0
+    raise "Bad duration" if dur > 24.0
     @duration = dur
   end
 
   # set the message portion of the squeak
-  # length can't exceed @@max_text_length
+  # length can't exceed 140
   def text=(txt)
-    raise "Bad text length" unless txt.length <= @@max_text_length
+    raise "Bad text length" unless txt.length <= 140
     @text = txt.dup
   end
 

metadata

@@ -2,7 +2,7 @@
 name: mapsqueak
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ethan Stryker
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-03 00:00:00 +00:00
+date: 2011-12-07 00:00:00 +00:00
 default_executable: 
 dependencies: []