concen 0.1.7 → 0.2.0

data/Gemfile

@@ -1,23 +1,24 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.0.9"
+gem "rails", ">= 3.1.0"
 
-gem "compass", "~> 0.11.5"
+gem "sass-rails", "~> 3.1.0"
+gem "compass", "~> 0.12.alpha"
 gem "haml", "~> 3.1.0"
 gem "mustache", "~> 0.99.4"
-gem "redcarpet", "~> 2.0.0b3"
+gem "redcarpet", "~> 2.0.0b4"
 gem "mongoid", "~> 2.0.0"
 gem "mongo-rails-instrumentation", "~> 0.2.4"
 gem "bson_ext", "~> 1.3.0"
 gem "rack-gridfs", "~> 0.4.1"
 gem "chronic", "~> 0.4.3"
 gem "mime-types", "~> 1.16"
-gem "bcrypt-ruby", "~> 2.1.4"
+gem "bcrypt-ruby", "~> 3.0.0"
 gem "domainatrix", "~> 0.0.10"
 
 # For test.
 gem "capybara", ">= 0.4.0"
-gem "fabrication", "0.9.4"
+gem "fabrication", "1.1.0"
 gem "database_cleaner", "0.6.0"
 gem "ansi"
 gem "turn"

data/Gemfile.lock

@@ -1,40 +1,42 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
-      mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
     addressable (2.2.6)
     ansi (1.2.5)
-    arel (2.0.10)
-    bcrypt-ruby (2.1.4)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.0)
     bson (1.3.1)
     bson_ext (1.3.1)
-    builder (2.1.2)
+    builder (3.0.0)
     capybara (1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -45,24 +47,23 @@ GEM
     childprocess (0.1.9)
       ffi (~> 1.0.6)
     chronic (0.4.4)
-    chunky_png (1.2.0)
-    compass (0.11.5)
+    chunky_png (1.2.1)
+    compass (0.12.alpha.0)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
     database_cleaner (0.6.0)
     domainatrix (0.0.10)
       addressable
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    fabrication (0.9.4)
+    erubis (2.7.0)
+    fabrication (1.1.0)
     ffi (1.0.9)
     fssm (0.2.7)
     haml (3.1.2)
-    i18n (0.5.0)
+    hike (1.2.1)
+    i18n (0.6.0)
     json_pure (1.5.2)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -74,48 +75,64 @@ GEM
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
+    multi_json (1.0.3)
     mustache (0.99.4)
     nokogiri (1.4.5)
-    polyglot (0.3.1)
-    rack (1.2.3)
+    polyglot (0.3.2)
+    rack (1.3.2)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
     rack-gridfs (0.4.1)
       mime-types
       mongo (~> 1.2)
       rack
-    rack-mount (0.6.14)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (0.9.2)
-    rdoc (3.6.1)
-    redcarpet (2.0.0b3)
+    rdoc (3.9.4)
+    redcarpet (2.0.0b4)
     rubyzip (0.9.4)
-    sass (3.1.5)
+    sass (3.1.7)
+    sass-rails (3.1.0)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (>= 3.1.4)
     selenium-webdriver (0.2.1)
       childprocess (>= 0.1.7)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
     thor (0.14.6)
-    treetop (1.4.9)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
     turn (0.8.2)
       ansi (>= 1.2.2)
-    tzinfo (0.3.28)
+    tzinfo (0.3.29)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -124,20 +141,21 @@ PLATFORMS
 
 DEPENDENCIES
   ansi
-  bcrypt-ruby (~> 2.1.4)
+  bcrypt-ruby (~> 3.0.0)
   bson_ext (~> 1.3.0)
   capybara (>= 0.4.0)
   chronic (~> 0.4.3)
-  compass (= 0.11.5)
+  compass (~> 0.12.alpha)
   database_cleaner (= 0.6.0)
   domainatrix (~> 0.0.10)
-  fabrication (= 0.9.4)
+  fabrication (= 1.1.0)
   haml (~> 3.1.0)
   mime-types (~> 1.16)
   mongo-rails-instrumentation (~> 0.2.4)
   mongoid (~> 2.0.0)
   mustache (~> 0.99.4)
   rack-gridfs (~> 0.4.1)
-  rails (~> 3.0.9)
-  redcarpet (~> 2.0.0b3)
+  rails (>= 3.1.0)
+  redcarpet (~> 2.0.0b4)
+  sass-rails (~> 3.1.0)
   turn

data/README.md

@@ -4,7 +4,7 @@ Concen is a Rails Engine for controlling and monitoring a Rails application from
 
 ## Requirements
 
-- **Rails 3.0.x**. Concen only supports Rails 3.0 application. Support for Rails 3.1 is planned to be added in near future.
+- **Rails 3.1. Concen only supports Rails 3.1 application.
 - **MongoDB 1.8.x**. All data are stored in MongoDB database, including all of the files uploaded (stored in GridFS).
 - **Typekit** (optional). Concen uses [Proxima Nova](http://typekit.com/fonts/proxima-nova) font. This font can be obtained from Typekit.
 
@@ -14,6 +14,12 @@ Add the following to the Gemfile of a Rails application.
 
     gem "concen", "~> 0.1"
 
+Concen uses Compass to generate its stylesheets so include Compass' gem in assets group in the Gemfile. If you face a problem when precompiling the assets it's most likely because Compass' gem isn't included in the Gemfile.
+
+    group :assets do
+      gem "compass", "~> 0.12.alpha"
+    end
+
 Run the rake task to setup Concen.
 
     rake concen:setup
@@ -128,28 +134,32 @@ If you have used Concen for any of your websites and would like to be listed her
 
 ## Version History
 
-- **0.1.7** (24 August 2011):
+- **0.2.0**:
+
+  - Rails 3.1 compatibility.
+
+- **0.1.7**:
 
   - Fix installation error when using Ruby 1.8.7.
 
-- **0.1.6** (24 August 2011):
+- **0.1.6**:
 
   - Fix gemspec encoding issue.
 
-- **0.1.5** (23 August 2011):
+- **0.1.5**:
 
   - A better approach of handling slug. Slug by default is generated from title. It can then be overwritten by specifying "Slug" in metadata declaration (from the text editor).
 
-- **0.1.4** (22 August 2011):
+- **0.1.4**:
 
   - Simpler setup process (only in 2 steps).
   - Brief guide is available upon the completion of setup.
   - Fix a bug in file path drag and drop function.
 
-- **0.1.3** (21 August 2011): Minor bug fixes.
+- **0.1.3**: Minor bug fixes.
 
-- **0.1.2** (19 August 2011): Minor bug fixes.
+- **0.1.2**: Minor bug fixes.
 
-- **0.1.1** (19 August 2011): Minor bug fixes.
+- **0.1.1**: Minor bug fixes.
 
-- **0.1** (19 August 2011): Initial release.
+- **0.1**: Initial release.

data/app/assets/javascripts/concen/application.js.coffee

@@ -0,0 +1,12 @@
+#= require concen/modernizr
+#= require concen/jquery
+#= require concen/jquery-ui/jquery.ui.core
+#= require concen/jquery-ui/jquery.ui.widget
+#= require concen/jquery-ui/jquery.ui.mouse
+#= require concen/jquery-ui/jquery.ui.position
+#= require concen/jquery-ui/jquery.ui.sortable
+#= require concen/jquery-ui/jquery.ui.resizable
+#= require concen/jquery-ui/jquery.ui.draggable
+#= require concen/jquery-ui/jquery.ui.droppable
+#= require concen/jquery.ui.nestedSortable
+#= require concen/jquery_ujs

data/{public/concen/javascripts/page.js → app/assets/javascripts/concen/pages.js}

@@ -1,3 +1,7 @@
+//= require concen/ace/ace
+//= require concen/fileuploader
+//= require_self
+
 $(document).ready(function() {
 	$("#file-manager a.new-file").live("click", function(event) {
     var filename = prompt("Filename", "");

data/{public/concen/javascripts/performance.js → app/assets/javascripts/concen/performances.js}

@@ -1,3 +1,8 @@
+//= require concen/jquery.flot
+//= require concen/jquery.flot.stack
+//= require concen/jquery.flot.resize
+//= require_self
+
 $(function() {
   function plotWithOptions(data) {
     window.plot = $.plot($("#recent-responses"), [{label: "Total Runtime", data: data.total_runtime}, {label: "View Runtime", data: data.view_runtime},{label: "MongoDB Runtime", data: data.mongo_runtime}], {

data/{public/concen/javascripts/traffic.js → app/assets/javascripts/concen/traffics.js}

@@ -1,3 +1,8 @@
+//= require concen/jquery.flot
+//= require concen/jquery.flot.stack
+//= require concen/jquery.flot.resize
+//= require_self
+
 $(function() {
   function plotWithOptions() {
     window.plot = $.plot($("#recent-visits"), [{label: "Visits", data: []}], {

data/{public/concen/javascripts/user.js → app/assets/javascripts/concen/users.js}

@@ -11,4 +11,4 @@ $(document).ready(function() {
     });
 
   });
-});
+});

data/app/{stylesheets/application.sass → assets/stylesheets/concen/application.css.sass}

@@ -1,13 +1,17 @@
+//= require_self
+//= require concen/fileuploader
+//= require concen/flot
+//= require concen/jquery.ui.resizable
+@charset "utf-8"
+
 @import "compass"
 @import "compass/reset"
 @import "compass/typography/text/force-wrap"
 @import "blueprint/print"
-@import "partials/variables"
-@import "partials/mixins"
-@import "partials/base"
-@import "partials/form"
-@import "partials/fileuploader"
-@import "partials/flot"
+@import "concen/partials/variables"
+@import "concen/partials/mixins"
+@import "concen/partials/base"
+@import "concen/partials/form"
 
 @media print
   +blueprint-print
@@ -64,10 +68,9 @@ header
   input#keyword
     font-size: 12px
     line-height: 15px
-    +background-image-with-dimension('magnifying-glass.png')
-    background-position: 6px 5px
-    border: 1px solid lighten(#000, 70%)
+    background: image-url("concen/magnifying-glass.png") no-repeat 6px 5px
     outline: none
+    border: 1px solid lighten(#000, 70%)
     +border-radius(60px)
     -webkit-appearance: none
     min-width: 120px
@@ -110,7 +113,7 @@ ul.pages
   margin-left: 0
   font-size: 14px
   span.handle
-    background: url("/concen/images/icon-handle.png")
+    background: image-url("concen/icon-handle.png")
     width: 12px
     height: 12px
     +inline-block
@@ -152,29 +155,6 @@ footer
     margin: 15px 0 0 0
     font-size: 12px
 
-// Buttons
-
-a.prev
-  +background-image-with-dimension("button-prev.png")
-  text-indent: -9999px
-  display: block
-
-a.prev.disabled
-  +background-image-with-dimension("button-prev-disabled.png")
-
-a.next
-  +background-image-with-dimension("button-next.png")
-  text-indent: -9999px
-  display: block
-
-a.next.disabled
-  +background-image-with-dimension("button-next-disabled.png")
-
-a.grid
-  +background-image-with-dimension("button-grid.png")
-  text-indent: -9999px
-  display: block
-
 #file-list
   width: 260px
   float: right
@@ -216,15 +196,15 @@ a.grid
           text-indent: -9999px
           float: left
         .check
-          +background-image-with-dimension("glyph-small-check.png")
+          background: image-url("concen/glyph-small-check.png") no-repeat
         .activate
-          +background-image-with-dimension("glyph-small-check-alt.png")
+          background: image-url("concen/glyph-small-check-alt.png") no-repeat
         .activate:hover
-          +background-image-with-dimension("glyph-small-check.png")
+          background: image-url("concen/glyph-small-check.png") no-repeat
         .handle
-          +background-image-with-dimension("glyph-small-handle.png")
+          background: image-url("concen/glyph-small-handle.png") no-repeat
         .delete
-          +background-image-with-dimension("glyph-small-delete.png")
+          background: image-url("concen/glyph-small-delete.png") no-repeat
 
 .panels
   margin-bottom: 30px