concen 0.2.6 → 0.2.7

data/Gemfile

@@ -5,7 +5,7 @@ gem "sass-rails", "~> 3.1.3"
 
 # gemspec.
 gem "mustache", "~> 0.99.4"
-gem "redcarpet", "2.0.0"
+gem "redcarpet", "2.1.0"
 gem "mongoid", "~> 2.2"
 gem "mongo", "~> 1.3"
 gem "bson_ext", "~> 1.4.0"
@@ -20,4 +20,4 @@ gem "domainatrix", "~> 0.0.10"
 gem "capybara", ">= 0.4.0"
 gem "fabrication", "1.1.0"
 gem "database_cleaner", "0.6.0"
-gem "minitest", "~> 2.6.1"
+gem "turn", "0.8.3"

data/Gemfile.lock

@@ -31,6 +31,7 @@ GEM
     activesupport (3.1.0)
       multi_json (~> 1.0)
     addressable (2.2.6)
+    ansi (1.3.0)
     arel (2.2.1)
     bcrypt-ruby (3.0.0)
     bson (1.4.0)
@@ -60,7 +61,6 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    minitest (2.6.1)
     mongo (1.4.0)
       bson (= 1.4.0)
     mongo-rails-instrumentation (0.2.4)
@@ -102,7 +102,7 @@ GEM
       thor (~> 0.14.6)
     rake (0.9.2)
     rdoc (3.9.4)
-    redcarpet (2.0.0)
+    redcarpet (2.1.0)
     rubyzip (0.9.4)
     sass (3.1.7)
     sass-rails (3.1.3)
@@ -125,6 +125,8 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
+    turn (0.8.3)
+      ansi
     tzinfo (0.3.29)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -141,12 +143,12 @@ DEPENDENCIES
   domainatrix (~> 0.0.10)
   fabrication (= 1.1.0)
   mime-types (~> 1.16)
-  minitest (~> 2.6.1)
   mongo (~> 1.3)
   mongo-rails-instrumentation (~> 0.2.4)
   mongoid (~> 2.2)
   mustache (~> 0.99.4)
   rack-gridfs (~> 0.4.1)
   rails (>= 3.1.0)
-  redcarpet (= 2.0.0)
+  redcarpet (= 2.1.0)
   sass-rails (~> 3.1.3)
+  turn (= 0.8.3)

data/README.md

@@ -1,24 +1,18 @@
 # Concen
 
-Concen is a Rails Engine for controlling and monitoring a Rails application from a web interface. It includes content capturing system, real-time traffic monitoring, and real-time performance monitoring. It's built to be flexible and customizable to fit custom needs.
+Concen is a Rails Engine for managing and monitoring a Rails application from a web interface. It includes content management system, real-time traffic monitoring, and real-time performance monitoring. It's built to be flexible and customizable to fit custom needs.
 
 ## Requirements
 
 - **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.
+- **MongoDB 2.0.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 easily obtained from Typekit.
 
 ## Installation
 
 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
+    gem "concen", "~> 0.2.6"
 
 Run the rake task to setup Concen.
 
@@ -26,11 +20,9 @@ Run the rake task to setup Concen.
 
 Follow the brief guide upon completion of the rake task.
 
-## Content Capturing System
+## Content Management System
 
-Any Rails application will require static contents at some point or another. Many of us will just write those contents in the Rails views. Quite recently I have begun to think that this is a wrong approach. We don't need a full blown Content Management System (CMS) to handle them. We rather need a Content Capturing System (CCS). Most of these contents might not come from you, but other people. Most often, there are several people involved. A CCS does not focus in managing content. It focuses on capturing content from the content creators.
-
-The CCS itself has a simple text editor and a simple file uploader. Contents these days are not only in the form of text but also images, audios and videos. CCS offers a quick and easy way to capture all of them.
+Most of the Rails applications will likely need a Content Management System (CMS) at some point or another. It could be for a blog or just static content. For the static content, it is very simple to write in the Rails views. If the programmer was the writer himself, this approach is very straight forward. But often the writers are not programmers. Concen allows the writers to write the content easily from day one. Then, programmers can programatically include this content in the Rails views. The CMS itself has a simple text editor and a simple file uploader. Content can be represented in the form of text and files (images, videos, sounds, etc).
 
 Back to the Rails application, the developer/programmer could place these contents in the views. For example with the following method call.
 
@@ -47,9 +39,9 @@ Generating static content should not be performed for every request because it i
     expires_in 5.minutes, :public => true
     fresh_when :etag => @article, :public => true
 
-## Writing Style for Content Capturing System
+## Writing Style for Content Management System
 
-There are no rules enforced for writing content with Concen CCS. But there are certain writing styles that will help writing content more manageable and convenient.
+There are no rules enforced for writing content in the CMS. But there are certain writing styles that will help writing content more convenient and manageable.
 
 Here is an example with single-segment content.
 
@@ -134,47 +126,52 @@ If you have used Concen for any of your websites and would like to be listed her
 
 ## Versions
 
+- **0.2.7**:
+  - Better time formatting
+  - Show full name in user list
+  - Update Redcarpet to version 2.1.0
+
 - **0.2.6**:
-  - Update Redcarpet to version 2.0.0.
+  - Update Redcarpet to version 2.0.0
 
 - **0.2.5**:
 
-  - Temporary fix for Redcarpet's smartypants extension.
-  - Minor color changes.
-  - Remove Compass dependency.
-  - Remove Haml dependency.
+  - Temporary fix for Redcarpet's smartypants extension
+  - Minor color changes
+  - Remove Compass dependency
+  - Remove Haml dependency
 
 - **0.2.4**:
 
-  - Set Mongoid dependency at "~> 2.2" for flexibility.
-  - The fields for Concen::Response are now predefined.
+  - Set Mongoid dependency at "~> 2.2" for flexibility
+  - The fields for Concen::Response are now predefined
 
 - **0.2.3**:
 
-  - Update Mongoid version (2.2.2).
-  - UI design enhancements.
-  - Tests are now using MiniTest.
-  - Add ancestor_slugs field for Page model.
-  - Page is given a default title if none is present.
+  - Update Mongoid version (2.2.2)
+  - UI design enhancements
+  - Tests are now using MiniTest
+  - Add ancestor_slugs field for Page model
+  - Page is given a default title if none is present
 
 - **0.2.2**:
 
-  - Update Chronic gem dependency.
-  - Fix set_position and reset_position.
+  - Update Chronic gem dependency
+  - Fix set_position and reset_position
 
 - **0.2.1**:
 
-  - Minor bug fixes.
-  - Update jQuery to 1.6.4.
-  - Update Redcarpet to 2.0.0b5 (fixes for inline HTML bug in Markdown parser).
+  - Minor bug fixes
+  - Update jQuery to 1.6.4
+  - Update Redcarpet to 2.0.0b5 (fixes for inline HTML bug in Markdown parser)
 
 - **0.2.0**:
 
-  - Rails 3.1 compatibility.
+  - Rails 3.1 compatibility
 
 - **0.1.7**:
 
-  - Fix installation error when using Ruby 1.8.7.
+  - Fix installation error when using Ruby 1.8.7
 
 - **0.1.6**:
 
@@ -186,22 +183,22 @@ If you have used Concen for any of your websites and would like to be listed her
 
 - **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.
+  - 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**: Minor bug fixes.
+- **0.1.3**: Minor bug fixes
 
-- **0.1.2**: Minor bug fixes.
+- **0.1.2**: Minor bug fixes
 
-- **0.1.1**: Minor bug fixes.
+- **0.1.1**: Minor bug fixes
 
-- **0.1**: Initial release.
+- **0.1**: Initial release
 
 ## Upcoming Features
 
-- Time range selection in traffic statistics.
-- Time range selection in performance statistics.
+- Time range selection in traffic statistics
+- Time range selection in performance statistics
 
 ## License
 

data/app/views/concen/performances/_runtimes.html.erb

@@ -2,7 +2,7 @@
   <% for stat in @runtimes_stats %>
     <li>
       <p><%= stat.first %></p>
-      <p class="right"><%= stat.last %></p>
+      <p class="right"><%= number_to_human(stat.last, :units => {:unit => "ms", :thousand => "s"}).delete(" ") %></p>
     </li>
   <% end %>
 </ul>

data/app/views/concen/users/index.html.erb

@@ -25,6 +25,7 @@
         <% for user in @users %>
           <tr>
             <td><%= user.username %></td>
+            <td><%= user.full_name %></td>
             <td><%= user.email %></td>
             <td><%= user.created_at.strftime("%d %B %Y") %></td>
             <td><%= Concen::Page.where(:authors.in => [user.username, user.full_name, user.email]).count %></td>

data/concen.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("mustache", "~> 0.99.4")
-  s.add_dependency("redcarpet", "~> 2.0.0")
+  s.add_dependency("redcarpet", "~> 2.1.0")
   s.add_dependency("mongoid", "~> 2.2")
   s.add_dependency("bson_ext", "~> 1.3")
   s.add_dependency("mongo-rails-instrumentation", "~> 0.2.4")

data/lib/concen/version.rb

@@ -1,3 +1,3 @@
 module Concen
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/test/integration/navigation_test.rb

@@ -1,7 +1,7 @@
-require 'test_helper'
-
-class NavigationTest < ActiveSupport::IntegrationCase
-  test "truth" do
-    assert_kind_of Dummy::Application, Rails.application
-  end
-end
+# require "test_helper"
+# 
+# class NavigationTest < ActiveSupport::IntegrationCase
+#   test "truth" do
+#     assert_kind_of Dummy::Application, Rails.application
+#   end
+# end

data/test/support/integration_case.rb

@@ -1,5 +1,5 @@
-# Define a bare test case to use with Capybara
-class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
-  include Capybara
-  include Rails.application.routes.url_helpers
-end
+# # Define a bare test case to use with Capybara
+# class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
+#   include Capybara
+#   include Rails.application.routes.url_helpers
+# end

data/test/test_helper.rb

@@ -5,6 +5,7 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require File.expand_path("../fabricators.rb",  __FILE__)
 require "rails/test_help"
 require "database_cleaner"
+require "turn"
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true

data/test/unit/concen_test.rb

@@ -1,13 +1,11 @@
 require "test_helper"
-require "minitest/spec"
-require "minitest/autorun"
 
-describe Concen do
-  before do
+class ConcenTest < ActiveSupport::TestCase  
+  def setup
     DatabaseCleaner.clean
   end
-
-  it "must be a Module" do
-    Concen.must_be_kind_of Module
+  
+  test "must be a Module" do
+    assert_kind_of Module, Concen
   end
 end

data/test/unit/grid_file_test.rb

@@ -1,47 +1,47 @@
 require "test_helper"
-require "minitest/spec"
-require "minitest/autorun"
 
-describe Concen::GridFile do
-  before do
+class GridFileTest < ActiveSupport::TestCase  
+  def setup
     DatabaseCleaner.clean
   end
-
-  it "can store file in GridFS" do
+  
+  test "can store file in GridFS" do
     page = Fabricate "concen/page"
     grid_file = page.grid_files.build
     grid_file.store File.read("#{Rails.root}/public/404.html"), "404.html"
-    grid_file.read.must_equal File.read("#{Rails.root}/public/404.html")
+    assert_equal File.read("#{Rails.root}/public/404.html"), grid_file.read
   end
 
-  it "must delete file from GridFS when page is deleted" do
+  test "must delete file from GridFS when page is deleted" do
     page = Fabricate "concen/page"
     grid_file = page.grid_files.build
     grid_file.store File.read("#{Rails.root}/public/404.html"), "404.html"
     grid_id = grid_file.grid_id.dup
     page.destroy
     grid = Mongo::Grid.new Mongoid.database
-    lambda { grid.get(grid_id).read }.must_raise(Mongo::GridFileNotFound)
+    assert_raise(Mongo::GridFileNotFound) { grid.get(grid_id).read }
   end
 
-  it "must delete associated grid_file when page is deleted" do
+  test "must delete associated grid_file when page is deleted" do
     page = Fabricate "concen/page"
     grid_file = page.grid_files.build
     grid_file.store File.read("#{Rails.root}/public/404.html"), "404.html"
+    refute_nil page.grid_files.where(:_id => grid_file.id).first
     page.destroy
+    assert_nil page.grid_files.where(:_id => grid_file.id).first
   end
-
-  it "must store correct original_filename" do
+  
+  test "must store correct original_filename" do
     page = Fabricate "concen/page"
     grid_file = page.grid_files.build
     grid_file.store File.read("#{Rails.root}/public/404.html"), "404.html"
-    grid_file.original_filename.must_equal "404.html"
+    assert_equal "404.html", grid_file.original_filename
   end
-
-  it "must include id in filename" do
+  
+  test "must include id in filename" do
     page = Fabricate "concen/page"
     grid_file = page.grid_files.build
     grid_file.store File.read("#{Rails.root}/public/404.html"), "404.html"
-    grid_file.filename.must_include grid_file.grid_id.to_s
+    assert grid_file.filename.include?(grid_file.grid_id.to_s)
   end
 end

data/test/unit/page_test.rb

@@ -1,164 +1,163 @@
 require "test_helper"
-require "minitest/spec"
-require "minitest/autorun"
 
-describe Concen::Page do
-  before do
+class ConcenTest < ActiveSupport::TestCase  
+  def setup
     DatabaseCleaner.clean
   end
-
-  it "can create page" do
+  
+  test "can create page" do
     page = Fabricate "concen/page"
-    page.id.wont_be_nil
+    refute_nil page.id
   end
 
-  it "can create child page" do
+  test "can create child page" do
     page = Fabricate "concen/page"
     child_page = page.children.create :title => "1984"
-    child_page.id.wont_be_nil
-    page.id.must_equal child_page.parent.id
+    refute_nil child_page.id
+    assert_equal child_page.parent.id, page.id
   end
 
-  it "must parse title from raw_text" do
+  test "must parse title from raw_text" do
     page = Fabricate "concen/page", :title => nil, :raw_text => "Title: Page Title"
-    page.title.must_equal "Page Title"
+    assert_equal "Page Title", page.title
   end
 
-  it "must get default title when none is present" do
+  test "must get default title when none is present" do
     page = Fabricate "concen/page", :title => nil
-    page.title.must_equal "Untitled 1"
+    assert_equal "Untitled 1", page.title
   end
 
-  it "validates uniqueness of title" do
+  test "validates uniqueness of title" do
     parent_page = Fabricate "concen/page", :title => "Parent"
     child_page_1 = parent_page.children.create :title => "Child"
     child_page_2 = parent_page.children.build :title => "Child"
-    lambda { child_page_2.save! }.must_raise(Mongoid::Errors::Validations)
-    child_page_2.errors[:title].first.must_equal "is already taken"
+    assert_raise(Mongoid::Errors::Validations) { child_page_2.save! }
+    assert_equal "is already taken", child_page_2.errors[:title].first
   end
 
-  it "must parse publish_time from raw_text" do
+  test "must parse publish_time from raw_text" do
     raw_text = "Title: Page Title 2\n\nPublish Time: now"
     page = Fabricate "concen/page", :title => nil, :raw_text => raw_text
-    page.publish_time.wont_be_nil
-    page.raw_text.wont_equal raw_text
+    refute_nil page.publish_time
+    refute_equal raw_text, page.raw_text
+    assert page.raw_text.include?(Time.now.utc.strftime("%Y-%m-%d"))
   end
 
-  it "must parse multi content from raw_text and conver to html correctly" do
+  test "must parse multi content from raw_text and conver to html correctly" do
     raw_text = File.read "#{File.dirname(__FILE__)}/../support/raw_text/multi_content.txt"
     html = File.read("#{File.dirname(__FILE__)}/../support/raw_text/multi_content.html")
     page = Fabricate "concen/page", :title => nil, :raw_text => raw_text
-    page.content.wont_be_nil
-    page.content.keys.must_equal ["part_1", "part_2"]
-    page.content_in_html("part_1").wont_be_nil
-    page.content_in_html("part_2").wont_be_nil
-    (page.content_in_html("part_1") + page.content_in_html("part_2")).must_equal html
+    refute_nil page.content
+    assert_equal ["part_1", "part_2"], page.content.keys
+    refute_nil page.content_in_html("part_1")
+    refute_nil page.content_in_html("part_2")
+    assert_equal html, (page.content_in_html("part_1") + page.content_in_html("part_2"))
   end
 
-  it "must parse content with SmartyPants supported entities and convert to html correctly" do
+  test "must parse content with SmartyPants supported entities and convert to html correctly" do
     raw_text_smartypants = File.read "#{File.dirname(__FILE__)}/../support/raw_text/smartypants.txt"
     raw_text_smartypants_escape = File.read "#{File.dirname(__FILE__)}/../support/raw_text/smartypants_escape.txt"
-    raw_text_smartypants.wont_be_nil
-    raw_text_smartypants_escape.wont_be_nil
+    refute_nil raw_text_smartypants
+    refute_nil raw_text_smartypants_escape
 
     page1 = Fabricate "concen/page", :title => nil, :raw_text => raw_text_smartypants
-    page1.content_in_html.must_equal page1.content_in_html("main")
-    page1.content_in_html.must_equal File.read("#{File.dirname(__FILE__)}/../support/raw_text/smartypants.html")
+    assert_equal page1.content_in_html("main"), page1.content_in_html
+    assert_equal File.read("#{File.dirname(__FILE__)}/../support/raw_text/smartypants.html"), page1.content_in_html
 
     page2 = Fabricate "concen/page", :title => nil, :raw_text => raw_text_smartypants_escape
-    page2.content_in_html.must_equal page2.content_in_html("main")
-    page2.content_in_html.must_equal File.read("#{File.dirname(__FILE__)}/../support/raw_text/smartypants_escape.html")
+    assert_equal page2.content_in_html("main"), page2.content_in_html
+    assert_equal File.read("#{File.dirname(__FILE__)}/../support/raw_text/smartypants_escape.html"), page2.content_in_html
   end
 
-  it "must parse content with code blocks and convert to html correctly" do
+  test "must parse content with code blocks and convert to html correctly" do
     raw_text_code_blocks = File.read "#{File.dirname(__FILE__)}/../support/raw_text/code_blocks.txt"
-    raw_text_code_blocks.wont_be_nil
+    refute_nil raw_text_code_blocks
 
     page = Fabricate "concen/page", :title => nil, :raw_text => raw_text_code_blocks
-    page.content_in_html.must_equal page.content_in_html("main")
-    page.content_in_html.must_equal File.read("#{File.dirname(__FILE__)}/../support/raw_text/code_blocks.html")
+    assert_equal page.content_in_html("main"), page.content_in_html
+    assert_equal File.read("#{File.dirname(__FILE__)}/../support/raw_text/code_blocks.html"), page.content_in_html
   end
 
-  it "must parse content with inline HTML and convert to html correctly" do
+  test "must parse content with inline HTML and convert to html correctly" do
     raw_text_code_blocks = File.read "#{File.dirname(__FILE__)}/../support/raw_text/inline_html.txt"
-    raw_text_code_blocks.wont_be_nil
+    refute_nil raw_text_code_blocks
 
     page = Fabricate "concen/page", :title => nil, :raw_text => raw_text_code_blocks
-    page.content_in_html.must_equal page.content_in_html("main")
-    page.content_in_html.must_equal File.read("#{File.dirname(__FILE__)}/../support/raw_text/inline_html.html")
+    assert_equal page.content_in_html("main"), page.content_in_html
+    assert_equal File.read("#{File.dirname(__FILE__)}/../support/raw_text/inline_html.html"), page.content_in_html
   end
 
-  it "has slug automatically generated" do
+  test "has slug automatically generated" do
     page1 = Fabricate "concen/page", :title => "Something New"
-    page1.slug.must_equal "something-new"
+    assert_equal "something-new", page1.slug
 
     page2 = Fabricate.build "concen/page", :title => nil
     page2.raw_text = File.read "#{File.dirname(__FILE__)}/../support/raw_text/title.txt"
     page2.save
-    page2.slug.must_equal "something-new"
+    assert_equal "something-new", page2.slug
   end
 
-  it "must be able to set slug from raw_text" do
+  test "must be able to set slug from raw_text" do
     page = Fabricate.build "concen/page", :title => nil
     page.raw_text = File.read "#{File.dirname(__FILE__)}/../support/raw_text/slug.txt"
     page.save
-    page.slug.must_equal "something-else"
+    assert_equal "something-else", page.slug
   end
 
-  it "has authors" do
+  test "has authors" do
     page = Fabricate.build "concen/page", :authors => ["user1", "user2", "user3"]
-    page.authors.count.must_equal 3
+    assert_equal 3, page.authors.count
   end
 
-  it "must get correct author_as_user" do
+  test "must get correct author_as_user" do
     user = Fabricate "concen/user"
     page = Fabricate.build "concen/page", :authors => [user.username, "user2"]
-    page.authors.count.must_equal 2
-    page.authors_as_user.count.must_equal 1
-    page.authors_as_user.must_include user.reload
+    assert_equal 2, page.authors.count
+    assert_equal 1, page.authors_as_user.count
+    assert page.authors_as_user.include?(user.reload)
   end
 
-  it "must get the correct slug" do
+  test "must get the correct slug" do
     page = Fabricate "concen/page", :title => "New Title"
-    page.slug.must_equal "new-title"
+    assert_equal "new-title", page.slug
     page.write_attribute :slug, "new-slug"
     page.save
-    page.slug.must_equal "new-slug"
+    assert_equal "new-slug", page.slug
   end
 
-  it "must set/reset position correctly" do
+  test "must set/reset position correctly" do
     page = Fabricate "concen/page"
     child_page_1 = page.children.create :title => "Position 1"
-    child_page_1.position.must_equal 1
+    assert_equal 1, child_page_1.position
 
     child_page_2 = page.children.create :title => "Position 2"
-    child_page_2.position.must_equal 2
+    assert_equal 2, child_page_2.position
 
     child_page_3 = page.children.create :title => "Position 3"
-    child_page_3.position.must_equal 3
+    assert_equal 3, child_page_3.position
 
     child_page_2.destroy
-    child_page_3.reload.position.must_equal 2
+    assert_equal 2, child_page_3.reload.position
   end
 
-  it "must have ancestor_slugs" do
+  test "must have ancestor_slugs" do
     page_1 = Fabricate "concen/page", :title => "A"
 
     page_2 = page_1.children.create :title => "B"
-    page_2.ancestor_slugs.must_equal ["a"]
+    assert_equal ["a"], page_2.ancestor_slugs
 
     page_3 = page_2.children.create :title => "C"
-    page_3.ancestor_slugs.must_equal ["a", "b"]
+    assert_equal ["a", "b"], page_3.ancestor_slugs
   end
 
-  it "must have level" do
+  test "must have level" do
     page_1 = Fabricate "concen/page", :title => "A"
-    page_1.level.must_equal 0
+    assert_equal 0, page_1.level
 
     page_2 = page_1.children.create :title => "B"
-    page_2.level.must_equal 1
+    assert_equal 1, page_2.level
 
     page_3 = page_2.children.create :title => "C"
-    page_3.level.must_equal 2
+    assert_equal 2, page_3.level
   end
 end

data/test/unit/user_test.rb

@@ -1,50 +1,48 @@
 require "test_helper"
-require "minitest/spec"
-require "minitest/autorun"
 
-describe Concen::User do
-  before do
+class UserTest < ActiveSupport::TestCase  
+  def setup
     DatabaseCleaner.clean
   end
-
-  it "can create user" do
+  
+  test "can create user" do
     user = Fabricate "concen/user"
-    user.id.wont_be_nil
+    assert_not_nil user.id
   end
 
-  it "has password_digest" do
+  test "has password_digest" do
     user = Fabricate "concen/user"
-    user.password_digest.wont_be_nil
+    assert_not_nil user.password_digest
   end
 
-  it "has auth_token" do
+  test "has auth_token" do
     user = Fabricate "concen/user"
-    user.auth_token.wont_be_nil
+    assert_not_nil user.auth_token
   end
 
-  it "has username" do
+  test "has username" do
     user = Fabricate.build "concen/user", :username => nil
-    lambda { user.save! }.must_raise(Mongoid::Errors::Validations)
-    user.errors[:username].first.must_equal "can't be blank"
+    assert_raise(Mongoid::Errors::Validations) { user.save! }    
+    assert_equal "can't be blank", user.errors[:username].first
   end
-
-  it "has email" do
+  
+  test "has email" do
     user = Fabricate.build "concen/user", :email => nil
-    lambda { user.save! }.must_raise(Mongoid::Errors::Validations)
-    user.errors[:email].first.must_equal "can't be blank"
+    assert_raise(Mongoid::Errors::Validations) { user.save! }
+    assert_equal "can't be blank", user.errors[:email].first
   end
-
-  it "has full_name" do
+  
+  test "has full_name" do
     user = Fabricate.build("concen/user", :full_name => nil)
-    lambda { user.save! }.must_raise(Mongoid::Errors::Validations)
-    user.errors[:full_name].first.must_equal "can't be blank"
+    assert_raise(Mongoid::Errors::Validations) { user.save! }
+    assert_equal "can't be blank", user.errors[:full_name].first
   end
-
-  it "must authenticate user" do
+  
+  test "must authenticate user" do
     password = {:password => "newpassword", :password_confirmation => "newpassword"}
     user = Fabricate "concen/user", password
     authenticated_user = user.authenticate("newpassword")
-    authenticated_user.wont_equal false
-    authenticated_user.must_be_instance_of Concen::User
+    refute_equal false, authenticated_user
+    assert_instance_of Concen::User, authenticated_user
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concen
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70126238293000 !ruby/object:Gem::Requirement
+  requirement: &70205435655000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 0.99.4
   type: :runtime
   prerelease: false
-  version_requirements: *70126238293000
+  version_requirements: *70205435655000
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70126238292520 !ruby/object:Gem::Requirement
+  requirement: &70205435649660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70126238292520
+  version_requirements: *70205435649660
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70126238292060 !ruby/object:Gem::Requirement
+  requirement: &70205435649180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70126238292060
+  version_requirements: *70205435649180
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70126238291580 !ruby/object:Gem::Requirement
+  requirement: &70205435648720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70126238291580
+  version_requirements: *70205435648720
 - !ruby/object:Gem::Dependency
   name: mongo-rails-instrumentation
-  requirement: &70126238291100 !ruby/object:Gem::Requirement
+  requirement: &70205435648260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70126238291100
+  version_requirements: *70205435648260
 - !ruby/object:Gem::Dependency
   name: rack-gridfs
-  requirement: &70126238290640 !ruby/object:Gem::Requirement
+  requirement: &70205435647780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70126238290640
+  version_requirements: *70205435647780
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70126238290180 !ruby/object:Gem::Requirement
+  requirement: &70205435647120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70126238290180
+  version_requirements: *70205435647120
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70126238289720 !ruby/object:Gem::Requirement
+  requirement: &70205435646440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70126238289720
+  version_requirements: *70205435646440
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70126238289260 !ruby/object:Gem::Requirement
+  requirement: &70205435645540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70126238289260
+  version_requirements: *70205435645540
 - !ruby/object:Gem::Dependency
   name: domainatrix
-  requirement: &70126238288800 !ruby/object:Gem::Requirement
+  requirement: &70205435644880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70126238288800
+  version_requirements: *70205435644880
 description: A Rails Engine to control and monitor Rails application from a web interface.
   It includes content capturing system, real-time traffic monitoring, and real-time
   performance monitoring. It is built to be flexible and customizable.