tap-ubiquity 0.2.1 → 0.3.0

data/History

@@ -1,3 +1,7 @@
+== 0.3.0 / 2009-05-25
+
+Updates to utilize Tap-0.17.0
+
 == 0.2.1 / 2009-03-30
 
 * changed dependency to json_pure to play well

data/lib/tap/ubiquity/ubiquity.rb

@@ -6,12 +6,18 @@ module Tap
   
     # ::controller
     class Ubiquity < Tap::Controller
+      UBIQUITY_WEBSITE = "http://labs.mozilla.com/projects/ubiquity/"
+     
       def index
         link = {:uri => request['uri'], :name => request['name']}
         render 'index.erb', :locals => {:feeds => feeds, :link => link}
       end
     
       protected
+      
+      def ubiquity_website
+        UBIQUITY_WEBSITE
+      end
     
       def feeds
         env_names = {}
@@ -23,18 +29,10 @@ module Tap
         server.env.each do |env|
           env_name = env_names[env]
         
-          env.controllers.minimap.each do |name, constant|
-            document = Lazydoc[constant.require_path]
-            document.resolve(nil, true)  # ?? why is force required ??
-            if comment = document[constant.name]['ubiquity']
-              action = comment.subject.strip
-              action = 'commands' if action.empty?
-              feeds << [
-                server.uri(name, action), 
-                "#{env_name}:#{name}", 
-                comment.content.join("\n").strip
-              ]
-            end
+          env.constant_manifest(:ubiquity).minimap.each do |name, constant|
+            action = constant.comment.strip
+            action = 'commands' if action.empty?
+            feeds << [server.uri(name, action), "#{env_name}:#{name}"]
           end
         end
       

data/lib/tap/ubiquity/utils.rb

@@ -25,28 +25,17 @@ module Tap
     #
     # Utils expects to be included in a Tap::Controller.
     module Utils
-      module_function
       
       # Serves the command from the calling method.
       def serve(command)
-        if command_request?
-          response['Content-Type'] = 'application/x-javascript'
-          command
-        else
-          block_given? ? yield(command_link) : command_link
-        end
+        response['Content-Type'] = 'application/x-javascript'
+        command
       end
-
-      # Returns true if the current request indicates the command javascript
-      # should be returned by serve (ie the path_info ends with '.js')
-      def command_request?
-        File.extname(request.path_info) == '.js'
-      end
-
+      
       # Returns the link tag for subscribing to a ubiquity command served
       # from the specified action.
-      def command_link(action=self.action)
-        "<link rel='commands' href='#{uri(action)}.js' />"
+      def command_link(href)
+        "<link rel='commands' href='#{href}' />"
       end
       
       # Formats a Ubiquity command that calls action with an 'input' parameter

data/tap-ubiquity.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "tap-ubiquity"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
   s.author = "Simon Chiang"
   s.email = "simon.a.chiang@gmail.com"
   s.homepage = "http://tap.rubyforge.org/ubiquity/"
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.summary = "Making Tap available in Ubiquity"
   s.require_path = "lib"
   s.rubyforge_project = "tap"
-  s.add_dependency("tap-server", ">= 0.3.0")
+  s.add_dependency("tap-server", ">= 0.4.0")
   s.add_dependency("json_pure", ">= 1.1.3")
   s.has_rdoc = true
   s.rdoc_options.concat %W{--main README -S -N --title Tap\sUbiquity}

data/views/tap/ubiquity/ubiquity/index.erb

@@ -1,6 +1,6 @@
 <h1>Welcome to Tap!</h1>
 
-<p><a href="http://tap.rubyforge.org">Tap</a> interfaces with the web using <a href="">Ubiquity</a>.</p>
+<p><a href="http://tap.rubyforge.org">Tap</a> interfaces with the web using <a href="<%= ubiquity_website %>">Ubiquity</a>.</p>
 <ul>
   <li>Press 'option' + 'space' to bring up a prompt</li>
 </ul>
@@ -8,11 +8,8 @@
 <% unless feeds.empty? %>
 <p>Subscribe to local feeds by clicking on the links below:</p>
 <ul>
-<% feeds.each do |(uri, name, help)| %>
-  <li>
-    <a href="<%= uri %>"><%= name %></a>
-    <div><%= help %></div>
-  </li>
+<% feeds.each do |(uri, name)| %>
+  <li><a href="<%= uri %>"><%= name %></a></li>
 <% end %>
 </ul>
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tap-ubiquity
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Simon Chiang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-30 00:00:00 -06:00
+date: 2009-05-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: json_pure