kibana-sinatra 3.1.0.0 → 3.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e814d7c44de07824618a49d1ef6f7fd1f65b9da
-  data.tar.gz: cd129e565427adc2443cdc2b7678f134f580d6f4
+  metadata.gz: a1e05bf726539ac6f753a4f87fcfac3437365c8c
+  data.tar.gz: b13d42d8c9a2bc96f3724b6146ec8aa446d96684
 SHA512:
-  metadata.gz: 5ebf59a58f1b18902b23f4066da73eb7fcb3b134053e28e0bf17d6b728c9f165b34d91b1bf24197c21470d63eb062d692e418401dfb2103ef06db00f7735306f
-  data.tar.gz: 428d2994e538ed095cf9f0babe236e68bb096e87669b2fa427e534712daa784a96da670d578f23797943de3a29df29d547b15b450a32194ce760a0090108510f
+  metadata.gz: 2b6cb7c1cc7db01d55c8b7b3c84a73d699c3ca9726ed42532fd5c8be566fd486536623b2dde6295ef9a7efffeda664972363b02a4fccdad741a447a4fb28b6f1
+  data.tar.gz: 0d74a6de030ef1386d4e9d3622a08aa4ff00f0acb94632a2bc17f8b752570e646bd58da842cddb562382ed3766148dc77c2127cfb9b0d602132c267295dbe462

data/README.md

@@ -26,7 +26,7 @@ Or install it yourself as:
 
 First you will need to configure Kibana's config.js file so that a web browser can find your [elasticsearch](http://www.elasticsearch.org/) cluster.
 
-Create a new file in `config/initializers` and include the following code. Replace the strings with the location of your elasticsearch cluster and the kibana index. Note that both of these are optional.
+Create a new file in `config/initializers` and include the following code. Replace the strings with the location of your elasticsearch cluster and the kibana index. You may also set the default_route. Note that all of these are optional. Please refer to the [Kibana config file](https://github.com/elasticsearch/kibana/blob/master/src/config.js) for explanations of what these settings do.
 
 ```ruby
 module Kibana::Sinatra
@@ -38,6 +38,10 @@ module Kibana::Sinatra
     def kibana_index
       "kibana-int"
     end
+
+    def default_route
+      "/dashboard/elasticsearch/asdf"
+    end
   end
 end
 ```

data/lib/kibana/sinatra/version.rb

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

data/lib/kibana/sinatra/web.rb

@@ -22,6 +22,10 @@ module Kibana
       def kibana_index
         "kibana-int"
       end
+
+      def default_route
+        "/dashboard/file/default.json"
+      end
     end
 
   end

data/lib/kibana/views/config.erb

@@ -41,7 +41,7 @@ function (Settings) {
      *
      * default_route: '/dashboard/elasticsearch/WebLogs',
      */
-    default_route     : '/dashboard/file/default.json',
+    default_route     : '<%= default_route %>',
 
     /** @scratch /configuration/config.js/5
      *

data/lib/tasks/update.rb

@@ -39,6 +39,7 @@ task :update do
   text = File.read(config_file)
   text.gsub!('http://"+window.location.hostname+":9200', '<%= elasticsearch_url %>')
   text.gsub!('"kibana-int"', '"<%= kibana_index %>"')
+  text.gsub!('\'/dashboard/file/default.json\'', '\'<%= default_route %>\'')
   File.open(config_file, "w") {|file| file.write(text) }
 end
 

data/test/sinatra_test.rb

@@ -23,6 +23,12 @@ class SinatraTest < Minitest::Unit::TestCase
     assert last_response.body.include?('elasticsearch: "http://"+window.location.hostname+":9200"')
   end
 
+  def test_it_renders_config_with_default_default_route
+    get '/config.js'
+    assert last_response.ok?
+    assert last_response.body.include?('default_route     : \'/dashboard/file/default.json\'')
+  end
+
   def test_it_renders_config_with_custom_elasticsearch_url
     elasticsearch_url = Proc.new { "http://asdf.com:9200" }
 
@@ -49,6 +55,16 @@ class SinatraTest < Minitest::Unit::TestCase
     end
   end
 
+  def test_it_renders_config_with_custom_default_route
+    default_route = Proc.new { "asdf" }
+
+    monkey_patch "default_route", default_route do
+      get '/config.js'
+      assert last_response.ok?
+      assert last_response.body.include?('default_route     : \'asdf\'')
+    end
+  end
+
   def monkey_patch(method_name, method_replacement)
     Kibana::Sinatra::Web.class_eval do
       alias_method "old_#{method_name}", method_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kibana-sinatra
 version: !ruby/object:Gem::Version
-  version: 3.1.0.0
+  version: 3.1.0.1
 platform: ruby
 authors:
 - Ian Neubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler