mapsqueak 0.0.2 → 0.0.3

data/lib/mapsqueak.rb

@@ -121,9 +121,10 @@ class MapSqueakSession
     unless [:json, :xml].include?(format)
       $stderr.puts "Error: must be in json or xml"
     end
-    
-    squeak_string = `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}\'`
+    
+    puts squeak_string
     return squeak_str_to_objects(squeak_string,format)
   end
   
@@ -141,7 +142,7 @@ class MapSqueakSession
   # 
   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\""
+    "curl --request PUT --data \'#{squeak.to_json}\' #{self.host}/squeaks/#{squeak.id}.json -H \"Content-Type: application/json\""
   end
 
 :private
@@ -150,10 +151,11 @@ class MapSqueakSession
     case format
     when :xml
       doc = Document.new(squeak_string)
-      doc.elements.each('squeaks/') {|el| squeaks << ClientSqueak.new(el.to_s)}
+      doc.elements.each('squeaks/squeak') {|el| squeaks << ClientSqueak.new(el.to_s)}
     when :json
       obj = JSON.parse(squeak_string)
-      obj['squeaks'].each {|s| squeaks << ClientSqueak.new(s) }
+      # Note that gmaps4rails makes the json have a 'description' as opposed to 'text'
+      obj.each {|s| puts s; squeaks << ClientSqueak.new(s) }
     end
     
     return squeaks
@@ -165,6 +167,7 @@ class ClientSqueak
   include XmlHelpers
 
   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
@@ -311,5 +314,9 @@ class ClientSqueak
     self.to_hash.to_s
   end
 
+  # Note that gmaps4rails makes the json have a 'description' as opposed to 'text'
+  alias :description :text
+  alias :description= :text=
+
 end
 

metadata

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