batsd-dash 0.3.1 → 0.5.0

data/test/helper.rb

@@ -1,5 +1,3 @@
-require 'turn'
-require 'mocha'
 require 'sinatra/test_helpers'
 require 'minitest/autorun'
 require 'rack/test'
@@ -7,25 +5,14 @@ require 'rack/test'
 ENV['RACK_ENV'] = 'test'
 include Rack::Test::Methods
 
-# require the app itself
 require 'batsd-dash'
-
-# setup a MockSesion
-module Rack
-  class MockSession
-    alias_method :request_original, :request
-    def request(uri, env)
-      EM.synchrony { EM.next_tick { request_original(uri, env); EM.stop } }
-    end
-  end
-end
-
+require 'batsd-dash/app'
 
 class MiniTest::Spec
   after { mocha_teardown }
 
   def app
-    BatsdDash::App
+    Batsd::Dash::App
   end
 
   def json_response
@@ -33,9 +20,11 @@ class MiniTest::Spec
 
     if oid != @last_response_id
       @last_response_id = oid
-      @last_response_json_body = Yajl::Parser.parse(last_response.body, symbolize_keys: true) rescue nil
+      @last_response_json_body = JSON.parse(last_response.body, symbolize_names: true) rescue nil
     end
 
     @last_response_json_body
   end
 end
+
+require 'mocha/setup'

data/test/test_dash.rb

@@ -1,99 +1,95 @@
 require 'helper'
 
-describe BatsdDash::App do
-	before do
-		header 'Accept', 'application/json'
+describe Batsd::Dash::App do
+  before do
+    header 'Accept', 'application/json'
 
-		# batsd wouldn't return this much data but w/e
-		df = EventMachine::DefaultDeferrable.new
-		df.succeed 'interval' => 10, 'counters:a.b' => [], 'timers:c.d' => [], 'gauges:e.f' => []
+    # batsd wouldn't return this much data but w/e
+    values = { 'interval' => 10, 'counters:a.b' => [], 'timers:c.d' => [], 'gauges:e.f' => [] }
 
-		BatsdDash::ConnectionPool::Client.any_instance.stubs(:sync).returns(true)
-		BatsdDash::ConnectionPool::Client.any_instance.stubs(:unbind).returns(true)
+    Batsd::Dash::Connection.any_instance.stubs(:values).returns(values)
+  end
 
-		EM::Synchrony::ConnectionPool.any_instance.stubs(:async_values).returns(df)
-	end
+  it 'returns error on nil metrics' do
+    get '/data'
 
-	it 'returns error on nil metrics' do
-		get '/data'
+    last_response.status.must_equal 400
+    last_response.body.must_include 'error'
+  end
 
-		last_response.status.must_equal 400
-		last_response.body.must_include 'error'
-	end
+  it 'returns error on empty metrics' do
+    get '/data?counters[]='
 
-	it 'returns error on empty metrics' do
-		get '/data?counters[]='
+    last_response.status.must_equal 400
+    last_response.body.must_include 'error'
+  end
 
-		last_response.status.must_equal 400
-		last_response.body.must_include 'error'
-	end
+  it 'valid with counter param' do
+    get '/data?counters=a.b'
 
-	it 'valid with counter param' do
-		get '/data?counters=a.b'
+    last_response.status.must_equal 200
+    last_response.body.wont_be_empty
 
-		last_response.status.must_equal 200
-		last_response.body.wont_be_empty
+    json_response[:results].size.must_equal 1
+  end
 
-		json_response[:results].size.must_equal 1
-	end
+  it 'valid with timer param' do
+    get '/data?timers=c.d'
 
-	it 'valid with timer param' do
-		get '/data?timers=c.d'
+    last_response.status.must_equal 200
+    last_response.body.wont_be_empty
 
-		last_response.status.must_equal 200
-		last_response.body.wont_be_empty
+    json_response[:results].size.must_equal 1
+  end
 
-		json_response[:results].size.must_equal 1
-	end
+  it 'valid with gauge param' do
+    get '/data?gauges=e.f'
 
-	it 'valid with gauge param' do
-		get '/data?gauges=e.f'
+    last_response.status.must_equal 200
+    last_response.body.wont_be_empty
 
-		last_response.status.must_equal 200
-		last_response.body.wont_be_empty
+    json_response[:results].size.must_equal 1
+  end
 
-		json_response[:results].size.must_equal 1
-	end
+  it 'valid with multiple' do
+    get '/data?counters[]=a.b&timers[]=d.c&gauges[]=e.f'
 
-	it 'valid with multiple' do
-		get '/data?counters[]=a.b&timers[]=d.c&gauges[]=e.f'
+    last_response.status.must_equal 200
+    last_response.body.wont_be_empty
 
-		last_response.status.must_equal 200
-		last_response.body.wont_be_empty
+    json_response[:results].size.must_equal 3
+  end
 
-		json_response[:results].size.must_equal 3
-	end
+  describe 'range params' do
+    before do
+      @start = Time.now.to_i - 86000
+      @stop = Time.now.to_i
+    end
 
-	describe 'range params' do
-		before do
-			@start = Time.now.to_i - 86000
-			@stop = Time.now.to_i
-		end
+    it 'returns error without stop param' do
+      get "/data?counters[]=a.b&start=#{@start}"
 
-		it 'returns error without stop param' do
-			get "/data?counters[]=a.b&start=#{@start}"
+      last_response.status.must_equal 400
+      last_response.body.must_include 'error'
+    end
 
-			last_response.status.must_equal 400
-			last_response.body.must_include 'error'
-		end
+    it 'returns error without start param' do
+      get "/data?counters[]=a.b&stop=#{@stop}"
 
-		it 'returns error without start param' do
-			get "/data?counters[]=a.b&stop=#{@stop}"
+      last_response.status.must_equal 400
+      last_response.body.must_include 'error'
+    end
 
-			last_response.status.must_equal 400
-			last_response.body.must_include 'error'
-		end
+    it 'returns error on invalid range' do
+      get "/data?counters[]=a.b&start=#{@stop}&stop=#{@start}"
 
-		it 'returns error on invalid range' do
-			get "/data?counters[]=a.b&start=#{@stop}&stop=#{@start}"
+      last_response.status.must_equal 400
+      last_response.body.must_include 'error'
 
-			last_response.status.must_equal 400
-			last_response.body.must_include 'error'
+      get '/data?counters[]=a.b&start=-2&stop=-1'
 
-			get '/data?counters[]=a.b&start=-2&stop=-1'
-
-			last_response.status.must_equal 400
-			last_response.body.must_include 'error'
-		end
-	end
+      last_response.status.must_equal 400
+      last_response.body.must_include 'error'
+    end
+  end
 end

metadata

@@ -1,127 +1,143 @@
 --- !ruby/object:Gem::Specification
 name: batsd-dash
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  prerelease:
+  version: 0.5.0
 platform: ruby
 authors:
 - mikeycgto
 - btoconnor
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &18453260 !ruby/object:Gem::Requirement
-    none: false
+  name: connection_pool
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *18453260
-- !ruby/object:Gem::Dependency
-  name: sinatra-contrib
-  requirement: &18434360 !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
-  version_requirements: *18434360
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: sinatra-synchrony
-  requirement: &18431700 !ruby/object:Gem::Requirement
+  name: sinatra
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.2
-  type: :runtime
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
-  version_requirements: *18431700
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &18430480 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *18430480
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &18428960 !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
-  version_requirements: *18428960
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &18426900 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
-  version_requirements: *18426900
+  type: :development
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &18422820 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *18422820
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &18419360 !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
-  version_requirements: *18419360
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: turn
-  requirement: &18407960 !ruby/object:Gem::Requirement
+  name: sinatra-contrib
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
-  version_requirements: *18407960
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &18402940 !ruby/object:Gem::Requirement
+  name: mocha
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
-  version_requirements: *18402940
+  type: :development
 description: batsd-dash - graphs and stuff for batsd. yay!
 email:
 - mikeycgto@gmail.com
@@ -130,72 +146,76 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .rbenv-version
 - Gemfile
 - Guardfile
 - README.md
 - Rakefile
 - batsd-dash.gemspec
 - lib/batsd-dash.rb
-- lib/batsd-dash/connection_pool.rb
+- lib/batsd-dash/app.rb
+- lib/batsd-dash/connection.rb
 - lib/batsd-dash/graph.rb
 - lib/batsd-dash/params.rb
-- lib/batsd-dash/sass/public.scss
+- lib/batsd-dash/public/css/d3.css
+- lib/batsd-dash/public/css/datetimepicker.css
+- lib/batsd-dash/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
+- lib/batsd-dash/public/css/images/ui-bg_flat_75_ffffff_40x100.png
+- lib/batsd-dash/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
+- lib/batsd-dash/public/css/images/ui-bg_glass_65_ffffff_1x400.png
+- lib/batsd-dash/public/css/images/ui-bg_glass_75_dadada_1x400.png
+- lib/batsd-dash/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
+- lib/batsd-dash/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
+- lib/batsd-dash/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+- lib/batsd-dash/public/css/images/ui-icons_222222_256x240.png
+- lib/batsd-dash/public/css/images/ui-icons_2e83ff_256x240.png
+- lib/batsd-dash/public/css/images/ui-icons_454545_256x240.png
+- lib/batsd-dash/public/css/images/ui-icons_888888_256x240.png
+- lib/batsd-dash/public/css/images/ui-icons_cd0a0a_256x240.png
+- lib/batsd-dash/public/css/jquery-ui.css
+- lib/batsd-dash/public/css/public.css
+- lib/batsd-dash/public/js/d3.js
+- lib/batsd-dash/public/js/dash.js
+- lib/batsd-dash/public/js/datetimepicker.js
+- lib/batsd-dash/public/js/datetimepicker.js~
+- lib/batsd-dash/public/js/jquery-ui.js
+- lib/batsd-dash/public/js/jquery.js
+- lib/batsd-dash/public/js/nv.d3.js
 - lib/batsd-dash/version.rb
-- lib/public/css/d3.css
-- lib/public/css/datetimepicker.css
-- lib/public/css/images/ui-bg_flat_0_aaaaaa_40x100.png
-- lib/public/css/images/ui-bg_flat_75_ffffff_40x100.png
-- lib/public/css/images/ui-bg_glass_55_fbf9ee_1x400.png
-- lib/public/css/images/ui-bg_glass_65_ffffff_1x400.png
-- lib/public/css/images/ui-bg_glass_75_dadada_1x400.png
-- lib/public/css/images/ui-bg_glass_75_e6e6e6_1x400.png
-- lib/public/css/images/ui-bg_glass_95_fef1ec_1x400.png
-- lib/public/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- lib/public/css/images/ui-icons_222222_256x240.png
-- lib/public/css/images/ui-icons_2e83ff_256x240.png
-- lib/public/css/images/ui-icons_454545_256x240.png
-- lib/public/css/images/ui-icons_888888_256x240.png
-- lib/public/css/images/ui-icons_cd0a0a_256x240.png
-- lib/public/css/jquery-ui.css
-- lib/public/css/public.css
-- lib/public/js/d3.js
-- lib/public/js/dash.js
-- lib/public/js/datetimepicker.js
-- lib/public/js/datetimepicker.js~
-- lib/public/js/flot.js
-- lib/public/js/jquery-ui.js
-- lib/public/js/jquery.js
-- lib/public/js/nv.d3.js
-- lib/views/layout.haml
-- lib/views/missing.haml
-- lib/views/root.haml
-- lib/views/view.haml
+- lib/batsd-dash/views/layout.haml
+- lib/batsd-dash/views/loading.haml
+- lib/batsd-dash/views/missing.haml
+- lib/batsd-dash/views/root.haml
+- lib/batsd-dash/views/view.haml
+- lib/sass/_charts.scss
+- lib/sass/public.scss
 - test/helper.rb
-- test/test_connection_pool.rb
 - test/test_dash.rb
 homepage: https://github.com/mikeycgto/batsd-dash
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
 rubyforge_project: batsd-dash
-rubygems_version: 1.8.10
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: batsd-dash
 test_files: []
-has_rdoc: 
+has_rdoc: