torquebox-backstage 0.1.2 → 0.2.0

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+* 0.2.0
+  * if the queue isn't available via jndi, just log an error instead of raising
+  * updated to use the TorqueBox 1.0.0.CR2 gems
+  
+* 0.1.2 and earlier
+  * stuff happened

data/Gemfile

@@ -5,7 +5,7 @@ gem "rack-flash"
 gem 'haml', '~>3.0'
 gem "jmx", '0.7'
 gem 'json'
-gem 'torquebox', '1.0.0.CR1'
+gem 'torquebox', '1.0.0.CR2'
 gem 'tobias-sinatra-url-for'
 gem 'rack-accept'
 

data/Gemfile.lock

@@ -33,21 +33,21 @@ GEM
     tilt (1.2.2)
     tobias-sinatra-url-for (0.2.1)
       sinatra (>= 0.9.1.1)
-    torquebox (1.0.0.CR1)
-      torquebox-base (= 1.0.0.CR1)
-      torquebox-messaging (= 1.0.0.CR1)
-      torquebox-naming (= 1.0.0.CR1)
-      torquebox-rake-support (= 1.0.0.CR1)
-      torquebox-vfs (= 1.0.0.CR1)
-      torquebox-web (= 1.0.0.CR1)
-    torquebox-base (1.0.0.CR1-java)
-    torquebox-messaging (1.0.0.CR1-java)
-      torquebox-base (= 1.0.0.CR1)
-      torquebox-naming (= 1.0.0.CR1)
-    torquebox-naming (1.0.0.CR1-java)
-    torquebox-rake-support (1.0.0.CR1)
-    torquebox-vfs (1.0.0.CR1-java)
-    torquebox-web (1.0.0.CR1-java)
+    torquebox (1.0.0.CR2)
+      torquebox-base (= 1.0.0.CR2)
+      torquebox-messaging (= 1.0.0.CR2)
+      torquebox-naming (= 1.0.0.CR2)
+      torquebox-rake-support (= 1.0.0.CR2)
+      torquebox-vfs (= 1.0.0.CR2)
+      torquebox-web (= 1.0.0.CR2)
+    torquebox-base (1.0.0.CR2-java)
+    torquebox-messaging (1.0.0.CR2-java)
+      torquebox-base (= 1.0.0.CR2)
+      torquebox-naming (= 1.0.0.CR2)
+    torquebox-naming (1.0.0.CR2-java)
+    torquebox-rake-support (1.0.0.CR2)
+    torquebox-vfs (1.0.0.CR2-java)
+    torquebox-web (1.0.0.CR2-java)
     watchr (0.7)
 
 PLATFORMS
@@ -65,5 +65,5 @@ DEPENDENCIES
   sinatra (= 1.1.2)
   thor
   tobias-sinatra-url-for
-  torquebox (= 1.0.0.CR1)
+  torquebox (= 1.0.0.CR2)
   watchr

data/TODO

@@ -1,9 +1,8 @@
 TODO
 
-* allow queue browsing from the API
-* link queues/topics to their apps
-* see how backstage behaves in a cluster
-* allow resending DLQ and ExpiryQueue messages
-* store failure backtraces for jobs/tasks in TorqueBox, and display here
+* link queues/topics to their apps (requires TB changes)
+* see how backstage behaves in a cluster 
+* allow resending DLQ and ExpiryQueue messages (requires replacing the external (client) queuebrowser with one based off of the mbean listMessages)
+* store failure backtraces for jobs/tasks in TorqueBox, and display here  (requires TB changes)
 * improve test coverage
 * add stats collection, with memory usage and other bits? ruby runtime stats?

data/TORQUEBOX_VERSION

@@ -1 +1 @@
-1.0.0.RC1-SNAPSHOT
+1.0.0.CR2

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/backstage.rb

@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 
-#require 'bundler/setup'
 require 'sinatra/base'
 require 'rack-flash'
 require 'rack/accept'

data/lib/destinations/models/destination.rb

@@ -42,6 +42,9 @@ module Backstage
         message.parent = self
         yield message
       end
+    rescue Exception => ex
+      puts "WARNING - failed to access messages for queue #{jndi_name}: #{ex}"
+      puts ex.backtrace.join( "\n" )
     end
     
     def display_name

data/lib/destinations/models/queue.rb

@@ -29,5 +29,8 @@ module Backstage
       super + [:durable]
     end
 
+    def subcollections
+      [:messages]
+    end
   end
 end

data/lib/helpers.rb

@@ -105,6 +105,13 @@ module Backstage
             response[key] = json_url_for( object_path( value ) )
           end
         end
+
+        if object.respond_to?( :subcollections )
+          object.subcollections.each do |collection|
+            response[collection] = json_url_for( collection_path( object, collection ) )
+          end
+        end
+
         response
       end
 

data/spec/api_spec.rb

@@ -41,7 +41,7 @@ module Backstage
       end
     end
 
-      end
+  end
 
   describe 'with authentication enabled' do
     before(:each) do
@@ -49,7 +49,7 @@ module Backstage
       @authenticator = mock(:authenticator)
       TorqueBox::Authentication.stub(:default).and_return(@authenticator)
     end
-    
+
     it "api should work with authentication" do
       @authenticator.should_receive(:authenticate).with('blah', 'pw').and_return(true)
       authorize 'blah', 'pw'
@@ -73,14 +73,14 @@ module Backstage
       ENV['REQUIRE_AUTHENTICATION'] = nil
     end
   end
-  
+
   %w{ app queue topic job message_processor service pool }.each do |resource|
     klass = "backstage/#{resource}".constantize
     describe resource do
       it "should have hash attributes beyond :resource" do
         klass.to_hash_attributes.size.should > 1
       end
-      
+
       describe "/#{resource.pluralize}" do
         before(:each) do
           klass.stub(:all).and_return([resource_with_mock_mbean(klass)])
@@ -131,6 +131,18 @@ module Backstage
         end
       end
     end
+  end
+
+  describe "/queue" do
+    before(:each) do
+      Queue.stub(:find).and_return(resource_with_mock_mbean(Queue))
+      get "/queue/somename", :format => 'json'
+      @response = JSON.parse(last_response.body, :symbolize_names => true)
+    end
 
+    it "should include a link to its messages" do
+      @response[:messages].should =~ %r{/queue/.*/messages.*format=json$}
+    end
   end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: torquebox-backstage
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
   - Tobias Crawley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -04:00
+date: 2011-04-26 00:00:00 -04:00
 default_executable: backstage
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -75,7 +75,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.0.CR1
+            version: 1.0.0.CR2
     requirement: *id006
     prerelease: false
     type: :runtime
@@ -188,6 +188,7 @@ extra_rdoc_files:
   - README.md
   - TODO
 files: 
+  - CHANGELOG.md
   - Gemfile
   - Gemfile.lock
   - README.md