riemann-dash 0.2.9 → 0.2.10

data/lib/riemann/dash/views/index.erubis

@@ -26,6 +26,8 @@
   <script src="vendor/flot/jquery.flot.time.min.js"></script>
   <script src="vendor/flot/jquery.flot.stack.min.js"></script>
   <script src="vendor/PriorityQueue.js"></script>
+  <script src="vendor/gauge.min.js"></script>
+  <script src="vendor/jquery.gauge.js"></script>
   <script> // turn underscore templates into mustache style templates
     _.templateSettings = {
       evaluate    : /\{\%([\s\S]+?)\%\}/g,  // {%  eval(js);  %}
@@ -53,6 +55,7 @@
   <script src="views/list.js"></script>
   <script src="views/help.js"></script>
   <script src="views/gauge.js"></script>
+  <script src="views/dial.js"></script>
   <script src="views/grid.js"></script>
   <script src="dash.js"></script>
 

data/test/browser_config_test.rb

@@ -0,0 +1,120 @@
+require './test/test_helper'
+require 'pp'
+
+describe "Riemann::Dash::BrowserConfig" do
+
+  before do
+    @mock_backend = Minitest::Mock.new
+    Riemann::Dash::BrowserConfig.backend = @mock_backend
+  end
+  
+  describe :read do
+    it "delegates to its backend" do
+      @mock_backend.expect :read, :return_value
+
+      Riemann::Dash::BrowserConfig.read
+
+      @mock_backend.verify
+    end
+  end
+
+  describe :update do
+    it "delegates to its backend" do
+      @mock_backend.expect :update, :return_value, [String]
+
+      Riemann::Dash::BrowserConfig.update("stuff to update")
+
+      @mock_backend.verify
+    end
+  end
+
+  describe :merge_configs do
+    before do
+      @first_config = {'server' => 'first_server', 'server_type' => 'first_type'}
+      @second_config = {'server' => 'second_server', 'server_type' => 'second_type'}
+    end
+
+    describe "when merging the server value" do
+      it "prioritises the value from the first config" do
+        merged_configs = Riemann::Dash::BrowserConfig.merge_configs(@first_config, @second_config)
+
+        assert_equal @first_config['server'], merged_configs['server']
+      end
+
+      it "uses the value from the second config if no other exists" do
+        merged_configs = Riemann::Dash::BrowserConfig.merge_configs({}, @second_config)
+
+        assert_equal @second_config['server'], merged_configs['server']
+      end
+    end
+
+    describe "when merging the server_type value" do
+      it "prioritises the value from the first config" do
+        merged_configs = Riemann::Dash::BrowserConfig.merge_configs(@first_config, @second_config)
+
+        assert_equal @first_config['server_type'], merged_configs['server_type']
+      end
+
+      it "uses the value from the second config if no other exists" do
+        merged_configs = Riemann::Dash::BrowserConfig.merge_configs({}, @second_config)
+
+        assert_equal @second_config['server_type'], merged_configs['server_type']
+      end
+    end
+  end
+
+  describe :index_by do
+    before do
+      @list = [{'name' => 'a'}, {'name' => 'b'}, {'name' => 'c'}]
+    end
+
+    it "returns the list of key/value pairs as a map indexed by the specified key/value" do
+      indexed_config = Riemann::Dash::BrowserConfig.index_by(lambda { |x| x['name'] }, @list)
+
+      assert_equal({'name' => 'a'}, indexed_config['a'])
+      assert_equal({'name' => 'b'}, indexed_config['b'])
+      assert_equal({'name' => 'c'}, indexed_config['c'])
+    end
+
+  end
+
+  describe :merge_workspace do
+    before do
+      @first_ws = {"view" => {"version" => 2}, "name" => "first"}
+      @second_ws = {"view" => {"version" => 3}, "name" => "second"}
+    end
+
+    it "prioritises the workspace with the higher version" do
+      merged_workspace = Riemann::Dash::BrowserConfig.merge_workspace(@first_ws, @second_ws)
+      assert_equal @second_ws, merged_workspace
+
+      merged_workspace = Riemann::Dash::BrowserConfig.merge_workspace(@second_ws, @first_ws)
+      assert_equal @second_ws, merged_workspace
+    end
+
+    it "prioritises any workspace over a nil workspace" do
+      merged_workspace = Riemann::Dash::BrowserConfig.merge_workspace(@first_ws, nil)
+      assert_equal @first_ws, merged_workspace
+
+      merged_workspace = Riemann::Dash::BrowserConfig.merge_workspace(nil, @first_ws)
+      assert_equal @first_ws, merged_workspace
+    end
+
+    it "prioritises any workspace with a version over a workspace without a version" do
+      merged_workspace = Riemann::Dash::BrowserConfig.merge_workspace(@first_ws, {"view" => {}})
+      assert_equal @first_ws, merged_workspace
+
+      merged_workspace = Riemann::Dash::BrowserConfig.merge_workspace({"view" => {}}, @first_ws)
+      assert_equal @first_ws, merged_workspace
+    end
+
+    it "prioritises the first workspace if both versions are equal" do
+      @second_ws['view']['version'] = @first_ws['view']['version']
+      merged_workspace = Riemann::Dash::BrowserConfig.merge_workspace(@first_ws, @second_ws)
+      assert_equal @first_ws, merged_workspace
+
+    end  
+  end
+
+
+end

data/test/config_test.rb

@@ -62,53 +62,4 @@ describe "Riemann::Dash::Config" do
     end
   end
 
-  describe "workspace config" do
-    before do
-      FileUtils.rm_rf "test/tmp/"
-    end
-
-    
-    describe :read_ws_config do
-=begin
-      # this test fails if the config living at config/config.json has
-      # been overwritten with user content -- this happens for people
-      # who had previously run their riemann-dash instance via simply
-      # cd riemann-dash && bin/riemann-dash -- it would also fail once
-      # you save your config in the default location
-      it "retuns hash for empty configs" do
-        @config.read_ws_config.must_equal "{}"
-      end
-=end
-
-      it "reads the file, if present" do
-        @config.load_config("test/fixtures/config/ws_config.rb").must_equal true
-        @config.store[:ws_config].must_equal "test/fixtures/ws_config/dummy_config.json"
-        @config.read_ws_config.must_equal %Q{{hey: \"ho\"}}
-      end
-    end
-
-    describe :update_ws_config do
-      it "works" do
-        @config.store[:ws_config] = "test/tmp/config.json"
-        @config.update_ws_config("{\"server\":\"10.10.10.10\",\"workspaces\":[]}")
-      end
-
-      it "pretty-prints the config" do
-        @config.store[:ws_config] = "test/tmp/config.json"
-        @config.update_ws_config("{\"server\":\"10.10.10.10\",\"workspaces\":[]}")
-        File.read("test/tmp/config.json").must_equal File.read("test/fixtures/ws_config/pretty_printed_config.json")
-      end
-    end
-  end
-
-  describe "backwards compatible :[] and :[]= forwarders to `store` variable" do
-    it "reading works" do
-      @config[:ws_config].must_match %r{config/config.json}
-    end
-
-    it "writing works" do
-      @config[:ws_config] = "something"
-      @config[:ws_config].must_match %r{something}
-    end
-  end
 end

data/test/test_helper.rb

@@ -4,6 +4,7 @@ Bundler.setup(:default, :test)
 
 require 'minitest/autorun'
 require 'minitest/spec'
+require 'minitest/mock'
 #require "mocha/setup"
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riemann-dash
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Kyle Kingsbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -96,6 +96,7 @@ files:
 - Rakefile.rb
 - bin/riemann-dash
 - example/config.rb
+- example/config.ru
 - lib/riemann/dash.rb
 - lib/riemann/dash/app.rb
 - lib/riemann/dash/browser_config.rb
@@ -149,7 +150,10 @@ files:
 - lib/riemann/dash/public/vendor/flot/jquery.flot.threshold.min.js
 - lib/riemann/dash/public/vendor/flot/jquery.flot.time.js
 - lib/riemann/dash/public/vendor/flot/jquery.flot.time.min.js
+- lib/riemann/dash/public/vendor/gauge.min.js
+- lib/riemann/dash/public/vendor/jquery.gauge.js
 - lib/riemann/dash/public/vendor/jquery/jquery-1.9.1.min.js
+- lib/riemann/dash/public/vendor/jquery/jquery-1.9.1.min.map
 - lib/riemann/dash/public/vendor/jquery/jquery-ui-1.10.2.custom.min.js
 - lib/riemann/dash/public/vendor/jquery/jquery.quickfit.js
 - lib/riemann/dash/public/vendor/jquery/jquery.simplemodal.1.4.4.min.js
@@ -158,6 +162,7 @@ files:
 - lib/riemann/dash/public/vendor/toastr/toastr.css
 - lib/riemann/dash/public/vendor/toastr/toastr.js
 - lib/riemann/dash/public/view.js
+- lib/riemann/dash/public/views/dial.js
 - lib/riemann/dash/public/views/flot.js
 - lib/riemann/dash/public/views/gauge.js
 - lib/riemann/dash/public/views/grid.js
@@ -176,6 +181,7 @@ files:
 - sh/c
 - sh/env.rb
 - sh/test
+- test/browser_config_test.rb
 - test/config_test.rb
 - test/fixtures/config/basic_config.rb
 - test/fixtures/config/ws_config.rb
@@ -206,6 +212,7 @@ signing_key:
 specification_version: 4
 summary: HTTP dashboard for the distributed event system Riemann.
 test_files:
+- test/browser_config_test.rb
 - test/config_test.rb
 - test/fixtures/config/basic_config.rb
 - test/fixtures/config/ws_config.rb