ops_routes 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/config/routes.rb

@@ -1,6 +1,14 @@
-ActionController::Routing::Routes.draw do |map|
-  map.connect '/ops/version', :controller => 'ops', :action => 'version'
-  map.connect '/ops/heartbeat', :controller => 'ops', :action => 'heartbeat'
-  map.connect '/ops/heartbeat/:name', :controller => 'ops', :action => 'heartbeat'
-  map.connect '/ops/configuration', :controller => 'ops', :action => 'configuration'
+if Rails::VERSION::MAJOR == 3
+  Rails.application.routes.draw do |map|
+    match '/ops/version', :to => 'ops#version'
+    match '/ops/heartbeat(/:name)', :to => 'ops#heartbeat'
+    match '/ops/configuration', :to => 'ops#configuration'
+  end
+else  
+  ActionController::Routing::Routes.draw do |map|
+    map.connect '/ops/version', :controller => 'ops', :action => 'version'
+    map.connect '/ops/heartbeat', :controller => 'ops', :action => 'heartbeat'
+    map.connect '/ops/heartbeat/:name', :controller => 'ops', :action => 'heartbeat'
+    map.connect '/ops/configuration', :controller => 'ops', :action => 'configuration'
+  end
 end

data/lib/ops_routes.rb

@@ -132,13 +132,16 @@ module OpsRoutes
     
     # Configuration page
     
-    def add_configuration_section(name, &block)
+    def configuration
       @configuration ||= {}
-      @configuration[name] = block
+    end
+
+    def add_configuration_section(name, &block)
+      configuration[name] = block
     end
 
     def current_config
-      @configuration.inject({}) do |current, (section, block)|
+      configuration.inject({}) do |current, (section, block)|
         current[section] = block.call
         current
       end

data/lib/views/config.html.haml

@@ -11,11 +11,11 @@
     -# %pre&= current_config.inspect
     - current_config.each do |section, settings|
       %h2= section
-      %table
+      %table.settings
         - settings.each_with_index do |(setting, value), i|
           %tr{ :class => i%2==0 ? 'even' : nil }
-            %td= setting
-            %td
+            %td.key= setting
+            %td.value
               %pre&= print_detail(value)
 
 

data/spec/ops_routes/middleware_spec.rb

@@ -74,13 +74,6 @@ describe OpsRoutes::Middleware do
         OpsRoutes.should_receive(:check_configuration).and_return('The configuration page')
         get '/ops/configuration'
       end
-
-      it 'should call the configuration block' do
-        config_block = lambda{}
-        OpsRoutes.add_configuration_section(:test, &config_block)
-        config_block.should_receive(:call).and_return( :key => 'value' )
-        get '/ops/configuration'
-      end
     end
 
   end

data/spec/ops_routes_spec.rb

@@ -97,6 +97,57 @@ describe OpsRoutes do
 
   end
 
+  describe ".check_configuration" do
+    it "should call current_config" do
+      OpsRoutes.should_receive(:current_config).and_return({})
+      OpsRoutes.check_configuration
+    end
+
+    it "should render a valid html page" do
+      config_page = OpsRoutes.check_configuration
+      config_page.should have_tag('html')
+      config_page.should have_tag('head')
+      config_page.should have_tag('body')
+    end
+
+    it "should have h2 for section" do
+      OpsRoutes.add_configuration_section(:test){{}}
+      config_page = OpsRoutes.check_configuration
+      config_page.should have_tag('h2', 'test')
+    end
+
+    it "should have config section key and value in table" do
+      OpsRoutes.add_configuration_section(:test){ { :some_key => 'the value' } }
+      config_page = OpsRoutes.check_configuration
+      config_page.should have_tag('.settings td.key', 'some_key')
+      config_page.should have_tag('.settings td.value pre', '"the value"')
+    end
+    
+  end
+
+  describe '.add_configuration_section' do
+    it "should add provided block to configuration hash" do
+      config_block = lambda{}
+      OpsRoutes.add_configuration_section(:test, &config_block)
+      OpsRoutes.configuration.should have_key(:test)
+      OpsRoutes.configuration[:test].should == config_block
+    end
+
+  end
+
+  describe '.current_config' do
+    it 'should call the configuration block' do
+      config_block = lambda{}
+      OpsRoutes.add_configuration_section(:test, &config_block)
+      config_block.should_receive(:call).and_return( :key => 'value' )
+      OpsRoutes.current_config
+    end
+
+    it 'should return empty hash if no config provided' do
+      OpsRoutes.current_config.should == {}
+    end
+  end
+
   describe '.app_name' do
   
     it "should return config option if given" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
+  - 6
   - 0
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Primedia Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -04:00
+date: 2010-10-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency