batsd-dash 0.3.0 → 0.3.1

data/batsd-dash.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/mikeycgto/batsd-dash"
 
   s.summary     = %q{batsd-dash}
-  s.description = %q{batsd-dash - graphs and stuff from batsd. yay!}
+  s.description = %q{batsd-dash - graphs and stuff for batsd. yay!}
 
   s.rubyforge_project = "batsd-dash"
 

data/lib/batsd-dash/graph.rb

@@ -22,6 +22,7 @@ module BatsdDash
         # loop through values to transform and zerofill
         while index < values.size - 1
           obj = transform_point_at!(index += 1, values)
+          next unless opts[:zero_fill]
 
           if obj.first <= time
             time += step
@@ -29,7 +30,7 @@ module BatsdDash
           end
 
           # need to insert zerofilled point (if zerofill is enabled)
-          values.insert(index, [time, 0]) if opts[:zero_fill]
+          values.insert(index, [time, 0])
           time += step
         end
       end

data/lib/batsd-dash/version.rb

@@ -1,3 +1,3 @@
 module BatsdDash
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/batsd-dash.rb

@@ -55,11 +55,8 @@ module BatsdDash
       return render_error('Invalid time range') unless range
       return render_error('Invalid metrics') if statistics.empty?
 
-			results = []
-			options = {
-				range: range.dup.map { |n| n * 1000 },
-				zero_fill: !params[:no_zero_fill]
-			}
+      results = []
+      options = { range: range.dup.map { |n| n * 1000 } }
 
       statistics.each do |datatype, metrics|
         metrics.each do |metric|
@@ -69,6 +66,7 @@ module BatsdDash
           deferrable.errback { |e| return render_error(e.message) }
           deferrable.callback do |json|
             options[:interval] ||= json['interval']
+            options[:zero_fill] = !statistic.start_with?('gauges') && params[!:no_zero_fill]
 
             points = json[statistic] || []
             values = values_for_graph(points, options)

data/lib/public/js/dash.js

@@ -34,7 +34,12 @@ var LocationHash=function(e){function r(){var e=location.hash.substr(1).split("&
 	var view = d3.select('button');
 
 	loading.toggle = function(){
-		this.style('display', this.style('display') == 'block' ? 'none' : 'block');
+		var action = this.style('display') == 'block';
+
+		//main_el.transition().style('opacity', action ? '1.0' : '1.0').call(function(){
+			main_el.style('display', action ? 'block' : 'none');
+			loading.style('display', action ? 'none' : 'block');
+		//});
 	};
 
 	function set_time_params(){
@@ -47,7 +52,7 @@ var LocationHash=function(e){function r(){var e=location.hash.substr(1).split("&
 	}
 
 	function time_axis_formatter(resp){
-		var format = { 600: '%x', 60: '%X', 10: '%X' }[resp.interval];
+		var format = { 600: '%x', 60: '%X', 10: '%X' }[resp.interval] || '%X';
 
 		return function(d){
 			return d3.time.format(format)(new Date(d));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: batsd-dash
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000Z
+date: 2012-08-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &17225500 !ruby/object:Gem::Requirement
+  requirement: &18453260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17225500
+  version_requirements: *18453260
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &17224080 !ruby/object:Gem::Requirement
+  requirement: &18434360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17224080
+  version_requirements: *18434360
 - !ruby/object:Gem::Dependency
   name: sinatra-synchrony
-  requirement: &17222960 !ruby/object:Gem::Requirement
+  requirement: &18431700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *17222960
+  version_requirements: *18431700
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &17222020 !ruby/object:Gem::Requirement
+  requirement: &18430480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17222020
+  version_requirements: *18430480
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &17221240 !ruby/object:Gem::Requirement
+  requirement: &18428960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17221240
+  version_requirements: *18428960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17220480 !ruby/object:Gem::Requirement
+  requirement: &18426900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17220480
+  version_requirements: *18426900
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &17219620 !ruby/object:Gem::Requirement
+  requirement: &18422820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17219620
+  version_requirements: *18422820
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &17218620 !ruby/object:Gem::Requirement
+  requirement: &18419360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17218620
+  version_requirements: *18419360
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &17217300 !ruby/object:Gem::Requirement
+  requirement: &18407960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17217300
+  version_requirements: *18407960
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &17216120 !ruby/object:Gem::Requirement
+  requirement: &18402940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,8 +121,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17216120
-description: batsd-dash - graphs and stuff from batsd. yay!
+  version_requirements: *18402940
+description: batsd-dash - graphs and stuff for batsd. yay!
 email:
 - mikeycgto@gmail.com
 - gatzby3jr@gmail.com