mojodna-fire-hydrant 0.0.2 → 0.0.3

data/examples/fire_eagle_consumer.rb

@@ -6,9 +6,7 @@ require 'yaml'
 hydrant = FireHydrant.new(YAML.load(File.read("fire_hydrant.yml")))
 
 hydrant.on_location_update do |user|
-  # for some reason the Fire Eagle gem doesn't work when I access #name directly
-  name = user.locations[0].instance_eval { @doc.at("//name").innerText }
-  puts "#{user.token} has moved to #{name}."
+  puts "#{user.token} has moved to #{user.locations.first}."
 end
 
 hydrant.run!

data/examples/fire_eagle_visualizer.rb

@@ -12,18 +12,17 @@ require 'fire_hydrant'
 earth = Appscript.app("Google Earth")
 
 # override the resource as "visualizer"
-hydrant = FireHydrant.new(YAML.load(File.read("fire_hydrant.yml")).merge("resource" => "visualizer"), true)
+hydrant = FireHydrant.new(YAML.load(File.read("fire_hydrant.yml")).merge("resource" => "visualizer"))
 
 hydrant.on_location_update do |user|
-  # for some reason the Fire Eagle gem doesn't work when I access #name directly
-  name = user.locations[0].instance_eval { @doc.at("//name").innerText }
-  puts "#{user.token} has moved to #{name}."
+  puts "#{user.token} has moved to #{user.locations.first}."
 
   geom = user.locations[0].geom
   begin
     pt = geom.is_a?(GeoRuby::SimpleFeatures::Envelope) ? geom.center : geom
     earth.SetViewInfo({:latitude => pt.y, :longitude => pt.x, :distance => (rand * 25000) + 5000, :azimuth => rand * 360, :tilt => (rand * 75)}, {:speed => 1})
-  rescue # rescue from Appscript errrors
+  rescue # rescue from Appscript errors
   end
+end
 
 hydrant.run!

data/fire-hydrant.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "fire-hydrant"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
   s.summary = "Fire Eagle XMPP PubSub tools"
   s.description = "Tools for consuming Fire Eagle's XMPP PubSub feed."
   s.authors = ["Seth Fitzsimmons"]
@@ -9,6 +9,6 @@ Gem::Specification.new do |s|
   s.files = ["examples", "examples/authorize.rb", "examples/fire_eagle_consumer.rb", "examples/fire_eagle_visualizer.rb", "fire-hydrant.gemspec", "fire_hydrant.yml", "fire_hydrant.yml.development", "fire_hydrant.yml.production", "fire_hydrant.yml.sample", "lib", "lib/fire_hydrant", "lib/fire_hydrant/fire_hydrant.rb", "lib/fire_hydrant/jacks", "lib/fire_hydrant/jacks/fire_eagle_jack.rb", "lib/fire_hydrant/jacks.rb", "lib/fire_hydrant.rb", "README.markdown"]
   s.require_paths = ["lib"]
 
-  s.add_dependency("fireeagle")
-  s.add_dependency("mojodna-switchboard")
+  s.add_dependency("mojodna-fireeagle",   ">=", "0.8.0.1")
+  s.add_dependency("mojodna-switchboard", ">=", "0.0.11")
 end

data/lib/fire_hydrant/fire_hydrant.rb

@@ -1,10 +1,9 @@
-require 'rubygems'
 begin
   require 'fireeagle'
   require 'switchboard'
 rescue LoadError => e
-  gem = e.message.split("--").last.strip
-  puts "The #{gem} gem is required."
+  lib = e.message.split("--").last.strip
+  puts "#{lib} is required."
 end
 
 class FireHydrant < Switchboard::Client

data/lib/fire_hydrant/jacks/fire_eagle_jack.rb

@@ -1,20 +1,17 @@
 class FireEagleJack
   def self.connect(switchboard, settings)
     switchboard.plug!(AutoAcceptJack, NotifyJack, PubSubJack)
+    switchboard.hook(:location_update)
 
     switchboard.on_pubsub_event do |event|
       event.payload.each do |payload|
         payload.elements.each do |item|
           rsp = item.first_element("rsp")
-          response = FireEagle::Response.new(rsp.to_s)
+          response = FireEagle::Response.parse(rsp.to_s)
           user = response.users[0]
           on(:location_update, user)
         end
       end
     end
-
-    def switchboard.on_location_update(&block)
-      register_hook(:location_update, &block)
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-fire-hydrant
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Seth Fitzsimmons
@@ -9,17 +9,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-27 00:00:00 -07:00
+date: 2009-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: fireeagle
+  name: mojodna-fireeagle
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.8.0.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: mojodna-switchboard
@@ -29,6 +32,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.0.11
     version: 
 description: Tools for consuming Fire Eagle's XMPP PubSub feed.
 email: