prosperity 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8043ea5a21b609bec47b7a5f4817d88d0bfcbc22
-  data.tar.gz: 3c3bd81fbe4b02cdec4d3f8d4d1fa34142f03560
+  metadata.gz: 1a284f5537871f1011c6a7b345a3769e6b6dbff2
+  data.tar.gz: 53a51339a32855d1626866ac3d1c982001089fdb
 SHA512:
-  metadata.gz: 59ee56c77f71309b14bba8380396d6546cb9b3aecea048b3769bc55c01cdde5813e366c1cecd2c7e3645c2f6e3317cee38e78610126420f95c0fe593ff75a667
-  data.tar.gz: a59381cfc4ac2fb7dfebf334cb7e7a5403846106e0ad49d580c92cc440cb523fc3db599b7fa32eb8f422bebff949a3f5b23fa046c7b291860056b1e0ed8b5942
+  metadata.gz: 4251f65a73946c06e891ef2cdb25ba2925862043d8b5a87916f2e8da8023db0d84cc1ae5912247bdaa22e7245279f1a681c3e168e915f1e028542ce626e889c3
+  data.tar.gz: 5acff210c62f4a5ce921baf198ca741968886bcb57bfbd09eaf35681cb0c7549f4b7159a895659a4a28a166e23033a4de80d45b0f6643e5817e83b08b572f020

data/app/assets/javascripts/prosperity/graph.js.coffee

@@ -57,7 +57,7 @@ class SubGraph
     @el
 
   class: =>
-    if @graphType == 'area'
+    if ['area', 'ratio'].indexOf(@graphType) >= 0
       Morris.Area
     else
       Morris.Line
@@ -66,8 +66,22 @@ class SubGraph
     # Because of a bug in Morris (https://github.com/morrisjs/morris.js/issues/388) 
     # it's not possible to add data on a hidden element. We just redraw the
     # entire thing in the meantime.
+    if @graphType == 'ratio'
+      @calculateRatios()
+
     @chart = new @class()(@chartOptions)
 
+  calculateRatios: ->
+    for item, index in @data
+      sum = 0
+      for key, value of item
+        sum += value unless key == 'x'
+      for key, value of item
+        if sum == 0
+          item[key] = 0 unless key == 'x'
+        else
+          item[key] = (value / sum) * 100 unless key == 'x'
+
 class Graph
   constructor: (options) ->
     @url = options.url

data/app/models/prosperity/graph.rb

@@ -8,7 +8,7 @@ module Prosperity
 
     attr_accessible *ATTR_ACCESSIBLE unless defined?(ActionController::StrongParameters)
 
-    VALID_GRAPH_TYPES = %w(line area)
+    VALID_GRAPH_TYPES = %w(line area ratio)
     validates :graph_type, inclusion: {in: VALID_GRAPH_TYPES}
 
     private

data/lib/prosperity/aggregate/average.rb

@@ -4,7 +4,7 @@ module Prosperity
       "AVG(#{column})"
     end
 
-    def apply(scope)
+    def apply(scope, options = {})
       scope.average(column)
     end
   end

data/lib/prosperity/aggregate/count.rb

@@ -4,7 +4,7 @@ module Prosperity
       "COUNT(1)"
     end
 
-    def apply(scope)
+    def apply(scope, options = {})
       scope.count
     end
   end

data/lib/prosperity/aggregate/maximum.rb

@@ -4,7 +4,7 @@ module Prosperity
       "MAX(#{column})"
     end
 
-    def apply(scope)
+    def apply(scope, options = {})
       scope.maximum(column)
     end
   end

data/lib/prosperity/aggregate/minimum.rb

@@ -4,7 +4,7 @@ module Prosperity
       "MIN(#{column})"
     end
 
-    def apply(scope)
+    def apply(scope, options = {})
       scope.minimum(column)
     end
   end

data/lib/prosperity/aggregate/sql.rb

@@ -7,6 +7,37 @@ module Prosperity
     def to_sql
       @sql
     end
+
+    def apply(scope, group_by_sql: nil)
+      # This is pretty hacky.. this assumes that the aggregate SQL can be
+      # inserted into this query and provide a valid query. We also leave it to
+      # the extractor to set this value if needed
+      if group_by_sql
+        s = scope.select("#{group_by_sql} AS bucket, #{to_sql}")
+        s.inject({}) {|accum, el|
+          attr = el.attributes.keys.select do |key|
+            !%w(id bucket).include?(key)
+          end.first
+          accum[el["bucket"]] = el.attributes[attr].to_f
+          accum
+        }
+      else
+        s = scope.select(to_sql)
+
+        # This isn't a group by, we should return a single value rather than a
+        # scope
+        if s.group_values.empty?
+          raise "Unexpected size" unless s.to_a.size == 1
+          record = s.first
+          # Assumes that the select statement as a single value attribute
+          # AR always add id, so get rid of that
+          value_attr = record.attributes.keys.first { |a| a != "id" }
+          record.attributes[value_attr]
+        else
+          s
+        end
+      end
+    end
   end
 end
 

data/lib/prosperity/aggregate/sum.rb

@@ -4,7 +4,7 @@ module Prosperity
       "SUM(#{column})"
     end
 
-    def apply(scope)
+    def apply(scope, options = {})
       scope.sum(column)
     end
   end

data/lib/prosperity/extractors/interval.rb

@@ -31,8 +31,9 @@ module Prosperity
         return data
       else
         s = scope.where("#{metric.group_by} BETWEEN ? AND ?", @start_time, @end_time)
-        s = s.group("to_char(#{metric.group_by}, '#{period.db_strf_str}')")
-        s = aggregate.apply(s)
+        group_by_sql = "to_char(#{metric.group_by}, '#{period.db_strf_str}')"
+        s = s.group(group_by_sql)
+        s = aggregate.apply(s, group_by_sql: group_by_sql)
       end
 
 

data/lib/prosperity/extractors/total.rb

@@ -13,7 +13,8 @@ module Prosperity
         elsif metric.ruby?
           data << metric.value_at.call(start_time, period)
         else
-          data << metric.aggregate.apply(scope.where("#{metric.group_by} < ?", start_time))
+          s = scope.where("#{metric.group_by} < ?", start_time)
+          data << metric.aggregate.apply(s)
         end
       end
 

data/lib/prosperity/version.rb

@@ -1,3 +1,3 @@
 module Prosperity
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/dummy/log/development.log

@@ -1,365 +1,7 @@
-
-
-Started GET "/prosperity/" for 127.0.0.1 at 2014-05-17 16:57:07 -0700
-  ActiveRecord::SchemaMigration Load (2.9ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Processing by Prosperity::MetricsController#index as HTML
-  Rendered /Users/simon/Documents/code/prosperity/app/views/prosperity/metrics/index.html.erb within layouts/prosperity/application (3.4ms)
-Completed 200 OK in 104ms (Views: 93.2ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/bootstrap.min.css?body=1" for 127.0.0.1 at 2014-05-17 16:57:08 -0700
-
-
-Started GET "/assets/bootstrap-theme.min.css?body=1" for 127.0.0.1 at 2014-05-17 16:57:08 -0700
-
-
-Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-05-17 16:57:08 -0700
-
-
-Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-05-17 16:57:08 -0700
-
-
-Started GET "/assets/prosperity/dashboards.js?body=1" for 127.0.0.1 at 2014-05-17 16:57:08 -0700
-
-
-Started GET "/assets/prosperity/graph.js?body=1" for 127.0.0.1 at 2014-05-17 16:57:08 -0700
-
-
-Started GET "/assets/prosperity/application.css?body=1" for 127.0.0.1 at 2014-05-17 16:57:09 -0700
-  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-
-
-Started GET "/assets/prosperity/graph.css?body=1" for 127.0.0.1 at 2014-05-17 16:57:10 -0700
-
-
-Started GET "/assets/prosperity/dashboards.css?body=1" for 127.0.0.1 at 2014-05-17 16:57:10 -0700
-
-
-Started GET "/assets/highcharts.js?body=1" for 127.0.0.1 at 2014-05-17 16:57:10 -0700
-
-
-Started GET "/assets/prosperity/application.js?body=1" for 127.0.0.1 at 2014-05-17 16:57:10 -0700
-
-
-Started GET "/prosperity/" for 127.0.0.1 at 2014-07-29 22:34:13 -0700
-  ActiveRecord::SchemaMigration Load (2.9ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Processing by Prosperity::MetricsController#index as HTML
-  Rendered /Users/simon/Documents/code/prosperity/app/views/prosperity/metrics/index.html.erb within layouts/prosperity/application (3.2ms)
-Completed 200 OK in 104ms (Views: 91.5ms | ActiveRecord: 0.0ms)
-
-
-Started GET "/assets/bootstrap.min.css?body=1" for 127.0.0.1 at 2014-07-29 22:34:13 -0700
-
-
-Started GET "/assets/prosperity/application.css?body=1" for 127.0.0.1 at 2014-07-29 22:34:13 -0700
-
-
-Started GET "/assets/prosperity/graph.css?body=1" for 127.0.0.1 at 2014-07-29 22:34:13 -0700
-
-
-Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-07-29 22:34:13 -0700
-
-
-Started GET "/assets/prosperity/dashboards.js?body=1" for 127.0.0.1 at 2014-07-29 22:34:13 -0700
-
-
-Started GET "/assets/prosperity/graph.js?body=1" for 127.0.0.1 at 2014-07-29 22:34:13 -0700
-
-
-Started GET "/assets/bootstrap-theme.min.css?body=1" for 127.0.0.1 at 2014-07-29 22:34:15 -0700
-  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-
-
-Started GET "/assets/prosperity/dashboards.css?body=1" for 127.0.0.1 at 2014-07-29 22:34:15 -0700
-
-
-Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-07-29 22:34:15 -0700
-
-
-Started GET "/assets/highcharts.js?body=1" for 127.0.0.1 at 2014-07-29 22:34:15 -0700
-
-
-Started GET "/assets/prosperity/application.js?body=1" for 127.0.0.1 at 2014-07-29 22:34:15 -0700
-
-
-Started GET "/prosperity/" for 127.0.0.1 at 2014-07-31 21:55:02 -0700
-  ActiveRecord::SchemaMigration Load (1.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-
-ActiveRecord::PendingMigrationError (
-
-Migrations are pending. To resolve this issue, run:
-
-	bin/rake db:migrate RAILS_ENV=development
-
-):
-  activerecord (4.1.4) lib/active_record/migration.rb:389:in `check_pending!'
-  activerecord (4.1.4) lib/active_record/migration.rb:377:in `call'
-  actionpack (4.1.4) lib/action_dispatch/middleware/callbacks.rb:29:in `block in call'
-  activesupport (4.1.4) lib/active_support/callbacks.rb:82:in `run_callbacks'
-  actionpack (4.1.4) lib/action_dispatch/middleware/callbacks.rb:27:in `call'
-  actionpack (4.1.4) lib/action_dispatch/middleware/reloader.rb:73:in `call'
-  actionpack (4.1.4) lib/action_dispatch/middleware/remote_ip.rb:76:in `call'
-  actionpack (4.1.4) lib/action_dispatch/middleware/debug_exceptions.rb:17:in `call'
-  actionpack (4.1.4) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
-  railties (4.1.4) lib/rails/rack/logger.rb:38:in `call_app'
-  railties (4.1.4) lib/rails/rack/logger.rb:20:in `block in call'
-  activesupport (4.1.4) lib/active_support/tagged_logging.rb:68:in `block in tagged'
-  activesupport (4.1.4) lib/active_support/tagged_logging.rb:26:in `tagged'
-  activesupport (4.1.4) lib/active_support/tagged_logging.rb:68:in `tagged'
-  railties (4.1.4) lib/rails/rack/logger.rb:20:in `call'
-  actionpack (4.1.4) lib/action_dispatch/middleware/request_id.rb:21:in `call'
-  rack (1.5.2) lib/rack/methodoverride.rb:21:in `call'
-  rack (1.5.2) lib/rack/runtime.rb:17:in `call'
-  activesupport (4.1.4) lib/active_support/cache/strategy/local_cache_middleware.rb:26:in `call'
-  rack (1.5.2) lib/rack/lock.rb:17:in `call'
-  actionpack (4.1.4) lib/action_dispatch/middleware/static.rb:64:in `call'
-  rack (1.5.2) lib/rack/sendfile.rb:112:in `call'
-  railties (4.1.4) lib/rails/engine.rb:514:in `call'
-  railties (4.1.4) lib/rails/application.rb:144:in `call'
-  /Users/simon/Library/Application Support/Pow/Versions/0.4.1/node_modules/nack/lib/nack/server.rb:145:in `handle'
-  /Users/simon/Library/Application Support/Pow/Versions/0.4.1/node_modules/nack/lib/nack/server.rb:99:in `rescue in block (2 levels) in start'
-  /Users/simon/Library/Application Support/Pow/Versions/0.4.1/node_modules/nack/lib/nack/server.rb:96:in `block (2 levels) in start'
-  /Users/simon/Library/Application Support/Pow/Versions/0.4.1/node_modules/nack/lib/nack/server.rb:86:in `each'
-  /Users/simon/Library/Application Support/Pow/Versions/0.4.1/node_modules/nack/lib/nack/server.rb:86:in `block in start'
-  /Users/simon/Library/Application Support/Pow/Versions/0.4.1/node_modules/nack/lib/nack/server.rb:66:in `loop'
-  /Users/simon/Library/Application Support/Pow/Versions/0.4.1/node_modules/nack/lib/nack/server.rb:66:in `start'
-  /Users/simon/Library/Application Support/Pow/Versions/0.4.1/node_modules/nack/lib/nack/server.rb:13:in `run'
-  /Users/simon/Library/Application Support/Pow/Versions/0.4.1/node_modules/nack/bin/nack_worker:4:in `<main>'
-
-
-  Rendered /Users/simon/.rvm/gems/ruby-2.1.0@prosperity/gems/actionpack-4.1.4/lib/action_dispatch/middleware/templates/rescues/_source.erb (0.6ms)
-  Rendered /Users/simon/.rvm/gems/ruby-2.1.0@prosperity/gems/actionpack-4.1.4/lib/action_dispatch/middleware/templates/rescues/_trace.html.erb (1.3ms)
-  Rendered /Users/simon/.rvm/gems/ruby-2.1.0@prosperity/gems/actionpack-4.1.4/lib/action_dispatch/middleware/templates/rescues/_request_and_response.html.erb (0.9ms)
-  Rendered /Users/simon/.rvm/gems/ruby-2.1.0@prosperity/gems/actionpack-4.1.4/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb within rescues/layout (19.5ms)
-  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to AddGraphTypeToGraphs (20140516222642)
-   (0.6ms)  BEGIN
-   (10.3ms)  ALTER TABLE "prosperity_graphs" ADD COLUMN "graph_type" character varying(255)
-   (2.1ms)  UPDATE prosperity_graphs SET graph_type='line'
-   (3.2ms)  ALTER TABLE "prosperity_graphs" ALTER COLUMN "graph_type" TYPE character varying(255)
-   (0.2ms)  ALTER TABLE "prosperity_graphs" ALTER "graph_type" SET NOT NULL
-  SQL (6.0ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20140516222642"]]
-   (189.6ms)  COMMIT
-Migrating to CreateTransactions (20140606175543)
-   (0.1ms)  BEGIN
-   (28.9ms)  CREATE TABLE "transactions" ("id" serial primary key, "date" timestamp NOT NULL, "amount_in_cents" integer NOT NULL, "created_at" timestamp, "updated_at" timestamp) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20140606175543"]]
-   (1.0ms)  COMMIT
-  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-
-
-Started GET "/prosperity/" for 127.0.0.1 at 2014-07-31 21:55:23 -0700
-  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Processing by Prosperity::DashboardsController#index as HTML
-  Prosperity::Dashboard Load (1.7ms)  SELECT "prosperity_dashboards".* FROM "prosperity_dashboards"
-  Rendered /Users/simon/Documents/code/prosperity/app/views/prosperity/dashboards/index.html.erb within layouts/prosperity/application (10.4ms)
-  Rendered /Users/simon/Documents/code/prosperity/app/views/layouts/prosperity/base.html.erb (11.3ms)
-Completed 200 OK in 1029ms (Views: 1018.9ms | ActiveRecord: 3.8ms)
-
-
-Started GET "/assets/bootstrap.min.css?body=1" for 127.0.0.1 at 2014-07-31 21:55:24 -0700
-
-
-Started GET "/assets/morris.css?body=1" for 127.0.0.1 at 2014-07-31 21:55:24 -0700
-
-
-Started GET "/assets/prosperity/application.css?body=1" for 127.0.0.1 at 2014-07-31 21:55:24 -0700
-
-
-Started GET "/assets/prosperity/graph.css?body=1" for 127.0.0.1 at 2014-07-31 21:55:24 -0700
-
-
-Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:24 -0700
-
-
-Started GET "/assets/raphael-min-2.1.2.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:24 -0700
-
-
-Started GET "/assets/prosperity/deletable_attribute.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:24 -0700
-
-
-Started GET "/assets/prosperity/graph.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:24 -0700
-
-
-Started GET "/assets/prosperity/application.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:24 -0700
-
-
-Started GET "/assets/bootstrap-theme.min.css?body=1" for 127.0.0.1 at 2014-07-31 21:55:26 -0700
-  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-
-
-Started GET "/assets/prosperity/dashboards.css?body=1" for 127.0.0.1 at 2014-07-31 21:55:26 -0700
-
-
-Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:26 -0700
-
-
-Started GET "/assets/morris.min-0.5.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:26 -0700
-
-
-Started GET "/assets/prosperity/dashboards.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:26 -0700
-
-
-Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:26 -0700
-
-
-Started GET "/assets/morris.min-0.5.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:26 -0700
-
-
-Started GET "/assets/raphael-min-2.1.2.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:26 -0700
-
-
-Started GET "/assets/prosperity/dashboards.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:26 -0700
-
-
-Started GET "/prosperity/" for 127.0.0.1 at 2014-07-31 21:55:28 -0700
-Processing by Prosperity::DashboardsController#index as HTML
-  Prosperity::Dashboard Load (0.5ms)  SELECT "prosperity_dashboards".* FROM "prosperity_dashboards"
-  Rendered /Users/simon/Documents/code/prosperity/app/views/prosperity/dashboards/index.html.erb within layouts/prosperity/application (2.2ms)
-  Rendered /Users/simon/Documents/code/prosperity/app/views/layouts/prosperity/base.html.erb (1.4ms)
-Completed 200 OK in 12ms (Views: 11.3ms | ActiveRecord: 0.5ms)
-
-
-Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:28 -0700
-
-
-Started GET "/assets/morris.min-0.5.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:28 -0700
-
-
-Started GET "/assets/raphael-min-2.1.2.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:28 -0700
-
-
-Started GET "/assets/prosperity/deletable_attribute.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:28 -0700
-
-
-Started GET "/assets/prosperity/dashboards.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:28 -0700
-
-
-Started GET "/assets/prosperity/application.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:28 -0700
-
-
-Started GET "/assets/prosperity/graph.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:28 -0700
-
-
-Started GET "/prosperity/metrics" for 127.0.0.1 at 2014-07-31 21:55:29 -0700
-Processing by Prosperity::MetricsController#index as HTML
-  Rendered /Users/simon/Documents/code/prosperity/app/views/prosperity/metrics/index.html.erb within layouts/prosperity/application (2.2ms)
-  Rendered /Users/simon/Documents/code/prosperity/app/views/layouts/prosperity/base.html.erb (1.4ms)
-Completed 200 OK in 20ms (Views: 10.4ms | ActiveRecord: 0.0ms)
-
-
-
-
-Started GET "/assets/raphael-min-2.1.2.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:29 -0700
-Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:29 -0700
-
-
-
-
-Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:29 -0700
-Started GET "/assets/morris.min-0.5.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:29 -0700
-
-
-Started GET "/assets/prosperity/dashboards.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:29 -0700
-
-
-Started GET "/assets/prosperity/deletable_attribute.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:29 -0700
-
-
-
-
-Started GET "/assets/prosperity/graph.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:29 -0700
-Started GET "/assets/prosperity/application.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:29 -0700
-
-
-Started GET "/prosperity/dashboards" for 127.0.0.1 at 2014-07-31 21:55:31 -0700
-Processing by Prosperity::DashboardsController#index as HTML
-  Prosperity::Dashboard Load (0.4ms)  SELECT "prosperity_dashboards".* FROM "prosperity_dashboards"
-  Rendered /Users/simon/Documents/code/prosperity/app/views/prosperity/dashboards/index.html.erb within layouts/prosperity/application (2.0ms)
-  Rendered /Users/simon/Documents/code/prosperity/app/views/layouts/prosperity/base.html.erb (1.3ms)
-Completed 200 OK in 10ms (Views: 9.8ms | ActiveRecord: 0.4ms)
-
-
-
-
-Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:31 -0700
-Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:31 -0700
-
-
-Started GET "/assets/raphael-min-2.1.2.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:31 -0700
-
-
-Started GET "/assets/morris.min-0.5.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:31 -0700
-
-
-Started GET "/assets/prosperity/deletable_attribute.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:31 -0700
-
-
-Started GET "/assets/prosperity/dashboards.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:31 -0700
-
-
-Started GET "/assets/prosperity/application.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:31 -0700
-
-
-Started GET "/assets/prosperity/graph.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:31 -0700
-
-
-Started GET "/prosperity/dashboards/1" for 127.0.0.1 at 2014-07-31 21:55:32 -0700
-Processing by Prosperity::DashboardsController#show as HTML
-  Parameters: {"id"=>"1"}
-  Prosperity::Dashboard Load (6.1ms)  SELECT  "prosperity_dashboards".* FROM "prosperity_dashboards"  WHERE "prosperity_dashboards"."id" = $1 LIMIT 1  [["id", 1]]
-  Rendered /Users/simon/Documents/code/prosperity/app/views/prosperity/shared/_date_range.html.erb (1.0ms)
-  Prosperity::Graph Exists (2.1ms)  SELECT  1 AS one FROM "prosperity_graphs" INNER JOIN "prosperity_dashboard_graphs" ON "prosperity_graphs"."id" = "prosperity_dashboard_graphs"."graph_id" WHERE "prosperity_dashboard_graphs"."dashboard_id" = $1 LIMIT 1  [["dashboard_id", 1]]
-  Prosperity::Graph Load (0.3ms)  SELECT "prosperity_graphs".* FROM "prosperity_graphs" INNER JOIN "prosperity_dashboard_graphs" ON "prosperity_graphs"."id" = "prosperity_dashboard_graphs"."graph_id" WHERE "prosperity_dashboard_graphs"."dashboard_id" = $1  [["dashboard_id", 1]]
-  Rendered /Users/simon/Documents/code/prosperity/app/views/prosperity/graphs/_render_graph.html.erb (0.4ms)
-  Rendered /Users/simon/Documents/code/prosperity/app/views/prosperity/dashboards/show.html.erb within layouts/prosperity/application (115.3ms)
-  Rendered /Users/simon/Documents/code/prosperity/app/views/layouts/prosperity/base.html.erb (1.2ms)
-Completed 200 OK in 131ms (Views: 118.0ms | ActiveRecord: 10.9ms)
-
-
-Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:32 -0700
-
-
-Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:32 -0700
-
-
-Started GET "/assets/morris.min-0.5.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:32 -0700
-
-
-Started GET "/assets/prosperity/dashboards.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:32 -0700
-
-
-Started GET "/assets/raphael-min-2.1.2.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:32 -0700
-
-
-Started GET "/assets/prosperity/graph.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:32 -0700
-
-
-Started GET "/assets/prosperity/deletable_attribute.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:32 -0700
-
-
-Started GET "/assets/prosperity/application.js?body=1" for 127.0.0.1 at 2014-07-31 21:55:32 -0700
-
-
-Started GET "/prosperity/graphs/1?end_time=2014-07-31+21%3A55%3A32+-0700&start_time=2014-04-30+21%3A55%3A32+-0700" for 127.0.0.1 at 2014-07-31 21:55:32 -0700
-Processing by Prosperity::GraphsController#show as JSON
-  Parameters: {"end_time"=>"2014-07-31 21:55:32 -0700", "start_time"=>"2014-04-30 21:55:32 -0700", "id"=>"1"}
-  Prosperity::Graph Load (0.8ms)  SELECT  "prosperity_graphs".* FROM "prosperity_graphs"  WHERE "prosperity_graphs"."id" = $1 LIMIT 1  [["id", 1]]
-  Prosperity::GraphLine Load (2.0ms)  SELECT "prosperity_graph_lines".* FROM "prosperity_graph_lines"  WHERE "prosperity_graph_lines"."graph_id" = $1  [["graph_id", 1]]
-Completed 200 OK in 18ms (Views: 0.4ms | ActiveRecord: 5.1ms)
-
-
-Started GET "/prosperity/metrics/UsersMetric/data?end_time=2014-07-31+21%3A55%3A32+-0700&extractor=change&option=default&period=month&start_time=2014-04-30+21%3A55%3A32+-0700" for 127.0.0.1 at 2014-07-31 21:55:33 -0700
-Processing by Prosperity::MetricsController#data as JSON
-  Parameters: {"end_time"=>"2014-07-31 21:55:32 -0700", "extractor"=>"change", "option"=>"default", "period"=>"month", "start_time"=>"2014-04-30 21:55:32 -0700", "id"=>"UsersMetric"}
-   (4.3ms)  SELECT COUNT(*) FROM "users"  WHERE (created_at < '2014-04-01 07:00:00.000000')
-   (0.6ms)  SELECT COUNT(*) FROM "users"  WHERE (created_at < '2014-03-01 08:00:00.000000')
-   (0.5ms)  SELECT COUNT(*) FROM "users"  WHERE (created_at < '2014-05-01 07:00:00.000000')
-  CACHE (0.0ms)  SELECT COUNT(*) FROM "users"  WHERE (created_at < '2014-04-01 07:00:00.000000')
-   (0.5ms)  SELECT COUNT(*) FROM "users"  WHERE (created_at < '2014-06-01 07:00:00.000000')
-  CACHE (0.0ms)  SELECT COUNT(*) FROM "users"  WHERE (created_at < '2014-05-01 07:00:00.000000')
-   (0.5ms)  SELECT COUNT(*) FROM "users"  WHERE (created_at < '2014-07-01 07:00:00.000000')
-  CACHE (0.0ms)  SELECT COUNT(*) FROM "users"  WHERE (created_at < '2014-06-01 07:00:00.000000')
-   (0.5ms)  SELECT COUNT(*) FROM "users"  WHERE (created_at < '2014-08-01 07:00:00.000000')
-  CACHE (0.0ms)  SELECT COUNT(*) FROM "users"  WHERE (created_at < '2014-07-01 07:00:00.000000')
-Completed 200 OK in 20ms (Views: 0.3ms | ActiveRecord: 8.8ms)
+  ActiveRecord::SchemaMigration Load (2.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to Dashboards (20131127042251)
+   (0.1ms)  BEGIN
+   (9.6ms)  CREATE TABLE "prosperity_dashboards" ("id" serial primary key, "title" character varying(255) NOT NULL, "default" boolean NOT NULL, "created_at" timestamp, "updated_at" timestamp) 
+PG::DuplicateTable: ERROR:  relation "prosperity_dashboards" already exists
+: CREATE TABLE "prosperity_dashboards" ("id" serial primary key, "title" character varying(255) NOT NULL, "default" boolean NOT NULL, "created_at" timestamp, "updated_at" timestamp) 
+   (0.1ms)  ROLLBACK