kibana-sinatra 3.1.0.1 → 3.1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1e05bf726539ac6f753a4f87fcfac3437365c8c
-  data.tar.gz: b13d42d8c9a2bc96f3724b6146ec8aa446d96684
+  metadata.gz: 7d6fb0ca5b9deb5f4ac4021e85db5ed2bc2f8cc1
+  data.tar.gz: 7fcc55bafac7329a79b8e8e56dc5991fe2eb4b2a
 SHA512:
-  metadata.gz: 2b6cb7c1cc7db01d55c8b7b3c84a73d699c3ca9726ed42532fd5c8be566fd486536623b2dde6295ef9a7efffeda664972363b02a4fccdad741a447a4fb28b6f1
-  data.tar.gz: 0d74a6de030ef1386d4e9d3622a08aa4ff00f0acb94632a2bc17f8b752570e646bd58da842cddb562382ed3766148dc77c2127cfb9b0d602132c267295dbe462
+  metadata.gz: 2054e744ba55b7f4299c1b88ff5780e67f58a6358d4473142e0e9ed7e4f28c4cb6d509f9111cd55f1e0264684b6b4c9c162a8a739e6886a56c9bd9b6ef21bbb8
+  data.tar.gz: 3f9f274511bfaf9edd1382b175e37d98a0dd24f7bd51e60086b71c41b1c18fa6707794e9b40172b24eabda4aff17a76cf444356fd2b89219f6aa086a2319120b

data/README.md

@@ -75,6 +75,24 @@ At last, you need to just run rackup.
 rackup
 ```
 
+### Custom dashboards
+
+If you would like to include custom dashboard JSON files you can do so by overriding the `render_dashboard(name)` method. This method requires a single parameter `name` that will contain the filename requested. For example, if the browser requests `/app/dashboards/test.json`, then `test.json` will be assigned to the `name` parameter.
+
+This method should return the JSON as a string.
+
+You could then make that JSON file the default by overriding `default_route` like this:
+
+```ruby
+module Kibana::Sinatra
+  class Web
+    def default_route
+      "/dashboard/file/test.json"
+    end
+  end
+end
+```
+
 ## Versions
 
 Kibana-sinatra's version number will match the upstream Kibana version number, plus an additional build number. For example:

data/lib/kibana/sinatra/version.rb

@@ -1,5 +1,5 @@
 module Kibana
   module Sinatra
-    VERSION = "3.1.0.1"
+    VERSION = "3.1.0.2"
   end
 end

data/lib/kibana/sinatra/web.rb

@@ -15,6 +15,10 @@ module Kibana
         erb :config
       end
 
+      get '/app/dashboards/:name' do
+        render_dashboard params[:name]
+      end
+
       def elasticsearch_url
         "http://\"+window.location.hostname+\":9200"
       end
@@ -26,6 +30,10 @@ module Kibana
       def default_route
         "/dashboard/file/default.json"
       end
+
+      def render_dashboard(name)
+        status 404
+      end
     end
 
   end

data/test/sinatra_test.rb

@@ -65,17 +65,49 @@ class SinatraTest < Minitest::Unit::TestCase
     end
   end
 
+  def test_it_renders_kibana_builtin_dashboard
+    get '/app/dashboards/default.json'
+    assert last_response.ok?
+    assert_equal 4140, last_response.body.length
+  end
+
+  def test_it_renders_kibana_builtin_dashboard_when_custom_present
+    render_dashboard = Proc.new {|name| "asdf" }
+
+    monkey_patch "render_dashboard", render_dashboard do
+      get '/app/dashboards/default.json'
+      assert last_response.ok?
+      assert_equal 4140, last_response.body.length
+    end
+  end
+
+  def test_it_renders_default_dashboard
+    get '/app/dashboards/asdf.json'
+    assert last_response.not_found?
+    assert_equal 0, last_response.body.length
+  end
+
+  def test_it_renders_custom_dashboard
+    render_dashboard = Proc.new {|name| "asdf" }
+
+    monkey_patch "render_dashboard", render_dashboard do
+      get '/app/dashboards/testing.json'
+      assert last_response.ok?
+      assert_equal "asdf", last_response.body
+    end
+  end
+
   def monkey_patch(method_name, method_replacement)
     Kibana::Sinatra::Web.class_eval do
-      alias_method "old_#{method_name}", method_name
+      alias_method "original_#{method_name}", method_name
       define_method method_name, method_replacement
     end
     
     yield
-
+  ensure
     Kibana::Sinatra::Web.class_eval do
-      alias_method method_name, "old_#{method_name}"
-      remove_method "old_#{method_name}"
+      alias_method method_name, "original_#{method_name}"
+      remove_method "original_#{method_name}"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kibana-sinatra
 version: !ruby/object:Gem::Version
-  version: 3.1.0.1
+  version: 3.1.0.2
 platform: ruby
 authors:
 - Ian Neubert