kibana-sinatra 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b90d776ed0faabd51b00e390a59c193d63c4eb94
-  data.tar.gz: d38a9fb1987082bd9c38ff97be8763c985bf75d4
+  metadata.gz: 488b10d33481ec09a9be9de778d08b984898b6d8
+  data.tar.gz: 9b115a2965cba2cb58bc0f01e03c745f7c2af59a
 SHA512:
-  metadata.gz: 9e7aa803378bd32ad9e524ed7c11cb77cff766d936496db3dd8e17ffa08048eddd9090afadf2eca7c67e26b413f875166c8f673a1ce1ba8e425e8f82eaf342cf
-  data.tar.gz: 221b2797b0615c18553e404dcae19ba30fc32096c04137e22fc57cff53a703074dcc4b210113e392e1537986b86fe958dda0369218847ffc40bc067855cfa855
+  metadata.gz: 3a31c619687789b0f096ac3e9b86b864df72d6b7c07456cb4aae77a940ca8a3f02e486fe7ad4993c6dc531c4b7a6f81567b920dd7c231c809e880a759f15ae68
+  data.tar.gz: 8eae148863560503a60ee3685ca805e53304c574835fb646c0c8d46b7b56748587b2949425444cebfdad4537cfe8396c356f476cb340d4ca223ce9d617d1e43e

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - "2.0.0"
+  - "1.9.3"
+  - "1.9.2"

data/README.md

@@ -1,6 +1,7 @@
 # Kibana::Sinatra
 
 [![Dependency Status](https://gemnasium.com/ianneub/kibana-sinatra.png)](https://gemnasium.com/ianneub/kibana-sinatra)
+[![Build Status](https://travis-ci.org/ianneub/kibana-sinatra.png)](https://travis-ci.org/ianneub/kibana-sinatra)
 
 This gem provides [Kibana 3](https://github.com/elasticsearch/kibana) inside a [Sinatra](http://www.sinatrarb.com/) app that you can include in any Rack based system, including Rails.
 
@@ -31,11 +32,11 @@ Create a new file in `config/initializers` and include the following code. Repla
 ```ruby
 module Kibana::Sinatra
   class Web
-    def self.elasticsearch_url
+    def elasticsearch_url
       "http://\"+window.location.hostname+\":9200"
     end
     
-    def self.kibana_index
+    def kibana_index
       "kibana-int"
     end
   end

data/Rakefile

@@ -1,2 +1,9 @@
 require "bundler/gem_tasks"
 require "./lib/tasks/update"
+
+task :default => :test
+
+desc "Run tests"
+task :test do
+  require './test/sinatra_test.rb'
+end

data/kibana-sinatra.gemspec

@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "uuid"
   spec.add_development_dependency "rubyzip"
+  spec.add_development_dependency "rack-test"
   spec.add_dependency "sinatra", "~> 1.4"
 end

data/lib/kibana/sinatra/version.rb

@@ -1,5 +1,5 @@
 module Kibana
   module Sinatra
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/kibana/sinatra/web.rb

@@ -15,11 +15,11 @@ module Kibana
         erb :config
       end
 
-      def self.elasticsearch_url
+      def elasticsearch_url
         "http://\"+window.location.hostname+\":9200"
       end
 
-      def self.kibana_index
+      def kibana_index
         "kibana-int"
       end
     end

data/lib/kibana/views/config.erb

@@ -18,14 +18,14 @@ function (Settings) {
      * elasticsearch host
      * @type {String}
      */
-    elasticsearch: "<%= Kibana::Sinatra::Web.elasticsearch_url %>",
+    elasticsearch: "<%= elasticsearch_url %>",
 
     /**
      * The default ES index to use for storing Kibana specific object
      * such as stored dashboards
      * @type {String}
      */
-    kibana_index: "<%= Kibana::Sinatra::Web.kibana_index %>",
+    kibana_index: "<%= kibana_index %>",
 
     /**
      * Panel modules available. Panels will only be loaded when they are defined in the

data/lib/tasks/update.rb

@@ -35,8 +35,8 @@ task :update do
   config_file = "#{asset_path}/../views/config.erb"
   FileUtils.mv "#{asset_path}/config.js", config_file
   text = File.read(config_file)
-  text.gsub!('http://"+window.location.hostname+":9200', '<%= Kibana::Sinatra::Web.elasticsearch_url %>')
-  text.gsub!('"kibana-int"', '"<%= Kibana::Sinatra::Web.kibana_index %>"')
+  text.gsub!('http://"+window.location.hostname+":9200', '<%= elasticsearch_url %>')
+  text.gsub!('"kibana-int"', '"<%= kibana_index %>"')
   File.open(config_file, "w") {|file| file.write(text) }
 end
 

data/test/sinatra_test.rb

@@ -0,0 +1,65 @@
+ENV['RACK_ENV'] = 'test'
+
+require 'kibana/sinatra'
+require 'test/unit'
+require 'rack/test'
+
+class SinatraTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    Kibana::Sinatra::Web
+  end
+
+  def test_it_outputs_dashboard
+    get '/'
+    assert last_response.ok?
+    assert last_response.body.include?('{{dashboard.current.title}}')
+  end
+
+  def test_it_renders_config_with_default_elasticsearch_url
+    get '/config.js'
+    assert last_response.ok?
+    assert last_response.body.include?('elasticsearch: "http://"+window.location.hostname+":9200"')
+  end
+
+  def test_it_renders_config_with_custom_elasticsearch_url
+    elasticsearch_url = Proc.new { "http://asdf.com:9200" }
+
+    monkey_patch "elasticsearch_url", elasticsearch_url do
+      get '/config.js'
+      assert last_response.ok?
+      assert last_response.body.include?('elasticsearch: "http://asdf.com:9200"')
+    end
+  end
+
+  def test_it_renders_config_with_default_kibana_index
+    get '/config.js'
+    assert last_response.ok?
+    assert last_response.body.include?('kibana_index: "kibana-int"')
+  end
+
+  def test_it_renders_config_with_custom_kibana_index
+    kibana_index = Proc.new { "asdf" }
+
+    monkey_patch "kibana_index", kibana_index do
+      get '/config.js'
+      assert last_response.ok?
+      assert last_response.body.include?('kibana_index: "asdf"')
+    end
+  end
+
+  def monkey_patch(method_name, method_replacement)
+    Kibana::Sinatra::Web.class_eval do
+      alias_method "old_#{method_name}", method_name
+      define_method method_name, method_replacement
+    end
+    
+    yield
+
+    Kibana::Sinatra::Web.class_eval do
+      alias_method method_name, "old_#{method_name}"
+      remove_method "old_#{method_name}"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kibana-sinatra
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ian Neubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -348,6 +363,7 @@ files:
 - lib/kibana/sinatra/web.rb
 - lib/kibana/views/config.erb
 - lib/tasks/update.rb
+- test/sinatra_test.rb
 homepage: http://github.com/ianneub/kibana-sinatra
 licenses:
 - MIT
@@ -373,4 +389,5 @@ signing_key:
 specification_version: 4
 summary: This gem packages up Kibana 3 into a Sinatra app that can be used stand alone,
   or with Rails.
-test_files: []
+test_files:
+- test/sinatra_test.rb