concen 0.2.2 → 0.2.3

data/.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 .bundle/
 .rvmrc
+.rbenv-version
 *.gem
 log/*.log
 app/stylesheets/.sass-cache

data/Gemfile

@@ -2,14 +2,17 @@ source "http://rubygems.org"
 
 gem "rails", ">= 3.1.0"
 
-gem "sass-rails", "~> 3.1.0"
 gem "compass", "~> 0.12.alpha"
+gem "sass-rails", "~> 3.1.3"
+
+# gemspec.
 gem "haml", "~> 3.1.0"
 gem "mustache", "~> 0.99.4"
 gem "redcarpet", "2.0.0b5"
-gem "mongoid", "~> 2.0.0"
+gem "mongoid", "~> 2.2.2"
+gem "mongo", "~> 1.4.0"
+gem "bson_ext", "~> 1.4.0"
 gem "mongo-rails-instrumentation", "~> 0.2.4"
-gem "bson_ext", "~> 1.3.0"
 gem "rack-gridfs", "~> 0.4.1"
 gem "chronic", "~> 0.6.3"
 gem "mime-types", "~> 1.16"
@@ -20,5 +23,4 @@ gem "domainatrix", "~> 0.0.10"
 gem "capybara", ">= 0.4.0"
 gem "fabrication", "1.1.0"
 gem "database_cleaner", "0.6.0"
-gem "ansi"
-gem "turn"
+gem "minitest", "~> 2.6.1"

data/Gemfile.lock

@@ -31,11 +31,10 @@ GEM
     activesupport (3.1.0)
       multi_json (~> 1.0)
     addressable (2.2.6)
-    ansi (1.2.5)
     arel (2.2.1)
     bcrypt-ruby (3.0.0)
-    bson (1.3.1)
-    bson_ext (1.3.1)
+    bson (1.4.0)
+    bson_ext (1.4.0)
     builder (3.0.0)
     capybara (1.0.0)
       mime-types (>= 1.16)
@@ -68,10 +67,11 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
+    minitest (2.6.1)
+    mongo (1.4.0)
+      bson (= 1.4.0)
     mongo-rails-instrumentation (0.2.4)
-    mongoid (2.0.2)
+    mongoid (2.2.2)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
@@ -112,10 +112,12 @@ GEM
     redcarpet (2.0.0b5)
     rubyzip (0.9.4)
     sass (3.1.7)
-    sass-rails (3.1.0)
+    sass-rails (3.1.3)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
       sass (>= 3.1.4)
+      sprockets (~> 2.0.0)
+      tilt (~> 1.3.2)
     selenium-webdriver (0.2.1)
       childprocess (>= 0.1.7)
       ffi (>= 1.0.7)
@@ -124,14 +126,12 @@ GEM
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    turn (0.8.2)
-      ansi (>= 1.2.2)
     tzinfo (0.3.29)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -140,9 +140,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  ansi
   bcrypt-ruby (~> 3.0.0)
-  bson_ext (~> 1.3.0)
+  bson_ext (~> 1.4.0)
   capybara (>= 0.4.0)
   chronic (~> 0.6.3)
   compass (~> 0.12.alpha)
@@ -151,11 +150,12 @@ DEPENDENCIES
   fabrication (= 1.1.0)
   haml (~> 3.1.0)
   mime-types (~> 1.16)
+  minitest (~> 2.6.1)
+  mongo (~> 1.4.0)
   mongo-rails-instrumentation (~> 0.2.4)
-  mongoid (~> 2.0.0)
+  mongoid (~> 2.2.2)
   mustache (~> 0.99.4)
   rack-gridfs (~> 0.4.1)
   rails (>= 3.1.0)
   redcarpet (= 2.0.0b5)
-  sass-rails (~> 3.1.0)
-  turn
+  sass-rails (~> 3.1.3)

data/README.md

@@ -134,6 +134,14 @@ If you have used Concen for any of your websites and would like to be listed her
 
 ## Version History
 
+- **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.
+
 - **0.2.2**:
 
   - Update Chronic gem dependency.

data/Rakefile

@@ -7,13 +7,13 @@ rescue LoadError
 end
 
 require "rake"
-require "rake/rdoctask"
+require "rdoc/task"
 require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "lib"
   t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
+  t.test_files = Dir.glob("test/**/*_test.rb")
   t.verbose = false
 end
 

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

@@ -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/app/assets/javascripts/concen/pages.js

@@ -115,7 +115,7 @@ $(document).ready(function() {
 		helper:	"clone",
 		handle: "span.handle",
 		items: "li",
-		maxLevels: 3,
+		maxLevels: 0,
 		opacity: .6,
 		placeholder: "placeholder",
 		revert: 250,

data/app/assets/stylesheets/concen/application.css.sass

@@ -122,9 +122,10 @@ ul.pages
     vertical-align: middle
     span, a
       vertical-align: middle
-  ul
-    p
-      // background: $gray-90
+      color: $color-2
+    &.author
+      span, a
+        color: $color-1
   a, ul a
     margin-left: 4px
   ul

data/app/assets/stylesheets/concen/partials/_variables.sass

@@ -1,10 +1,10 @@
 // Colors.
 
-$color-1: hsl(230, 60%, 20%) // #141F52
-$color-2: hsl(230, 20%, 60%) // #858BAD
-$color-3: hsl(230, 20%, 94%) // #EDEEF3
-$color-4: hsl(230, 20%, 96%) // #F3F3F7
-$color-5: hsl(230, 20%, 88%) // #DADCE7
+$color-1: hsl(220, 100%, 20%) // #002266
+$color-2: hsl(220, 16%, 45%) // #606D85
+$color-3: hsl(220, 16%, 90%) // #E1E4EA
+$color-4: hsl(220, 16%, 95%) // #F0F2F4
+$color-5: hsl(220, 16%, 88%) // #DCDFE5
 $gray-20: hsl(0, 0%, 20%)
 $gray-60: hsl(0, 0%, 60%)
 $gray-80: hsl(0, 0%, 80%)

data/app/controllers/concen/pages_controller.rb

@@ -15,7 +15,6 @@ module Concen
       else
         @page = Page.new
       end
-      @page.level = params[:level].to_i if params[:level]
     end
 
     def create

data/app/models/concen/page.rb

@@ -19,6 +19,7 @@ module Concen
     field :title, :type => String
     field :description, :type => String
     field :slug, :type => String
+    field :ancestor_slugs, :type => Array, :default => []
     field :raw_text, :type => String
     field :content, :type => Hash, :default => {}
     field :position, :type => Integer
@@ -34,9 +35,12 @@ module Concen
     validates_uniqueness_of :slug, :scope => [:parent_id, :level], :case_sensitive => false
 
     before_validation :parse_raw_text
+    before_validation :set_title
     before_validation :set_slug
+    before_validation :set_position
+    before_validation :set_level
     before_save :set_publish_month
-    before_create :set_position
+    before_save :set_ancestor_slugs
     after_save :unset_unused_dynamic_fields
     after_destroy :destroy_children
     after_destroy :destroy_grid_files
@@ -61,10 +65,10 @@ module Concen
 
     # Get the list of dynamic fields by checking againts this array.
     # Values should mirror the listed fields above.
-    PREDEFINED_FIELDS = [:_id, :parent_id, :level, :created_at, :updated_at, :slug, :content, :raw_text, :position, :grid_files, :title, :description, :publish_time, :labels, :authors, :status]
+    PREDEFINED_FIELDS = [:_id, :parent_id, :level, :created_at, :updated_at, :slug, :ancestor_slugs, :content, :raw_text, :position, :grid_files, :title, :description, :publish_time, :labels, :authors, :status]
 
     # These fields can't be overwritten by user's meta data when parsing raw_text.
-    PROTECTED_FIELDS = [:_id, :parent_id, :level, :created_at, :updated_at, :content, :raw_text, :position, :grid_files]
+    PROTECTED_FIELDS = [:_id, :parent_id, :level, :created_at, :updated_at, :content, :raw_text, :position, :grid_files, :ancestor_slugs]
 
     def content_in_html(key = "main", data={})
       if content = self.content.try(:[], key)
@@ -109,12 +113,16 @@ module Concen
     end
 
     def underscore_hash_keys(hash)
-      new_hash = {}
-      hash.each do |key, value|
-        value = underscore_hash_keys(value) if value.is_a?(Hash)
-        new_hash[key.gsub(" ","_").downcase.to_sym] = value
+      if hash.is_a? Hash
+        new_hash = {}
+        hash.each do |key, value|
+          value = underscore_hash_keys(value) if value.is_a?(Hash)
+          new_hash[key.gsub(" ","_").downcase.to_sym] = value
+        end
+        new_hash
+      else
+        return nil
       end
-      new_hash
     end
 
     def parse_publish_time(publish_time_string)
@@ -222,33 +230,6 @@ module Concen
 
     protected
 
-    def set_slug
-      if self.slug.blank?
-        self.slug = self.title.parameterize if self.title
-      else
-        self.slug = self.slug.parameterize
-      end
-    end
-
-    def set_position
-      siblings = Page.where :parent_id => self.parent_id
-      if siblings.count > 0
-        self.position = siblings.with_position.asc(:position).last.position + 1
-      else
-        self.position = 1
-      end
-    end
-
-    def reset_position
-      affected_pages = Page.with_position.where :parent_id => self.parent_id, :position.gt => self.position
-      if affected_pages.count > 0
-        for page in affected_pages
-          page.position = page.position - 1
-          page.save
-        end
-      end
-    end
-
     def parse_raw_text
       if self.raw_text && self.raw_text.length > 0 && (self.new? || self.raw_text_changed?)
         self.content = {}
@@ -273,22 +254,23 @@ module Concen
           self.content = {}
         end
 
-        # Set each value of meta data.
-        meta_data = underscore_hash_keys(YAML.load(meta_data))
-        meta_data.each do |key, value|
-          unless PROTECTED_FIELDS.include?(key)
-            if key == :publish_time
-              self.parse_publish_time(value)
-            else
-              self.write_attribute(key, value)
+        if meta_data = underscore_hash_keys(YAML.load(meta_data))
+          # Set each value of meta data.
+          meta_data.each do |key, value|
+            unless PROTECTED_FIELDS.include?(key)
+              if key == :publish_time
+                self.parse_publish_time(value)
+              else
+                self.write_attribute(key, value)
+              end
             end
           end
-        end
 
-        # Set the field to nil if the value isn't present in meta data.
-        # Except for authors.
-        (self.attributes.keys.map{ |k| k.to_sym } - PROTECTED_FIELDS).each do |field|
-          self[field] = nil if !meta_data.keys.include?(field) && field != :authors
+          # Set the field to nil if the value isn't present in meta data.
+          # Except for authors.
+          (self.attributes.keys.map{ |k| k.to_sym } - PROTECTED_FIELDS).each do |field|
+            self[field] = nil if !meta_data.keys.include?(field) && field != :authors
+          end
         end
 
         self.update_raw_text
@@ -311,18 +293,6 @@ module Concen
       self.raw_text = meta_data.join + self.raw_text.match(/(?:\r?\n-{3,}\r?\n)/).to_s + raw_text_array.join
     end
 
-    def destroy_children
-      for child in self.children
-        child.destroy
-      end
-    end
-
-    def destroy_grid_files
-      for grid_file in self.grid_files
-        grid_file.destroy
-      end
-    end
-
     def unset_unused_dynamic_fields
       target_fields = {}
       for field in self.attributes.keys
@@ -333,10 +303,92 @@ module Concen
       Page.collection.update({"_id" => self.id}, {"$unset" => target_fields})
     end
 
+    # Give default title ("Untitled n") when no title is given.
+    def set_title
+      unless self.title
+        if self.parent
+          if last_untitled_page = self.parent.children.where(:title => /Untitled /i).asc(:title).last
+            last_untitled_number = last_untitled_page.title.split(" ").last.to_i
+            self.title = "Untitled #{last_untitled_number+1}"
+          else
+            self.title = "Untitled 1"
+          end
+        else
+          self.title = "Untitled 1"
+        end
+      end
+    end
+
+    def set_slug
+      if self.slug.blank?
+        self.slug = self.title.parameterize if self.title
+      else
+        self.slug = self.slug.parameterize
+      end
+    end
+
+    def set_position
+      # Only set position for newly created record.
+      # It will be used by before_validation callback
+      # just in case this field is used to validate something.
+      unless self.persisted?
+        siblings = Page.where :parent_id => self.parent_id
+        if siblings.count > 0
+          self.position = siblings.with_position.asc(:position).last.position + 1
+        else
+          self.position = 1
+        end
+      end
+    end
+
+    def reset_position
+      affected_pages = Page.with_position.where :parent_id => self.parent_id, :position.gt => self.position
+      if affected_pages.count > 0
+        for page in affected_pages
+          page.position = page.position - 1
+          page.save
+        end
+      end
+    end
+
+    def set_level
+      # Only set level for newly created record.
+      # It will be used by before_validation callback
+      # because level is part of uniqness validation of :title and :slug.
+      unless self.persisted?
+        if self.parent_id
+          self.level = self.parent.level + 1
+        else
+          self.level = 0
+        end
+      end
+    end
+
     def set_publish_month
       if self.publish_time
         self.publish_month = Time.zone.local(self.publish_time.year, self.publish_time.month)
       end
     end
+
+    def set_ancestor_slugs
+      parent = self.parent
+      while parent
+        self.ancestor_slugs << parent.slug
+        parent = parent.parent
+      end
+      self.ancestor_slugs.reverse! if self.ancestor_slugs
+    end
+
+    def destroy_children
+      for child in self.children
+        child.destroy
+      end
+    end
+
+    def destroy_grid_files
+      for grid_file in self.grid_files
+        grid_file.destroy
+      end
+    end
   end
 end

data/app/views/concen/pages/_form.html.haml

@@ -10,7 +10,6 @@
       #text-editor
   = f.text_area :raw_text, :class => "text-editor-content hidden"
   = f.hidden_field :parent_id
-  = f.hidden_field :level
   .actions.flush
     = f.submit "Save"
     - if @page.persisted?

data/app/views/concen/pages/_nested_list.html.haml

@@ -5,11 +5,11 @@
 %ul{:class => children.first.level == 0 && "pages", :data => {:level => children.first.level}}
   - for child in children
     %li{:data => {:id => "page-#{child.id}"}}
-      %p
+      %p{:class => "#{'author' if child.authors_as_user.map(&:_id).include? current_concen_user.id}"}
         %span.handle
         = link_to child.title, edit_concen_page_path(child), :class => "title"
-        = link_to "Add", new_concen_page_path(:level => child.level + 1, :parent_id => child.id), :class => "link-button hidden"
+        = link_to "Add", new_concen_page_path(:parent_id => child.id), :class => "link-button hidden"
         = link_to "Edit", edit_concen_page_path(child), :class => "link-button hidden"
         = link_to "Delete", concen_page_path(child), :method => :delete, :confirm => "Are you sure?", :class => "link-button hidden"
       - if Concen::Page.where(:parent_id => child.id).count > 0
-        = render :partial => "nested_list", :locals => {:page => child, :root => false}
+        = render :partial => "nested_list", :locals => {:page => child, :root => false}

data/app/views/concen/pages/index.html.haml

@@ -6,7 +6,7 @@
     = one_line do
       %span Pages
       - unless @page
-        = link_to "New Page", new_concen_page_path(:level => 0), :class => "link-button"
+        = link_to "New Page", new_concen_page_path, :class => "link-button"
 
   - if @page
     = render :partial => "nested_list", :locals => {:page => @page, :root => true}

data/concen.gemspec

@@ -25,9 +25,10 @@ Gem::Specification.new do |s|
   s.add_dependency("haml", "~> 3.1.0")
   s.add_dependency("mustache", "~> 0.99.4")
   s.add_dependency("redcarpet", "~> 2.0.0b5")
-  s.add_dependency("mongoid", "~> 2.0.0")
+  s.add_dependency("mongoid", "~> 2.2.2")
+  s.add_dependency("mongo", "~> 1.4.0")
+  s.add_dependency("bson_ext", "~> 1.4.0")
   s.add_dependency("mongo-rails-instrumentation", "~> 0.2.4")
-  s.add_dependency("bson_ext", "~> 1.3.0")
   s.add_dependency("rack-gridfs", "~> 0.4.1")
   s.add_dependency("chronic", "~> 0.6.3")
   s.add_dependency("mime-types", "~> 1.16")

data/config/initializers/assets.rb

@@ -1,2 +1,2 @@
 Rails.application.config.assets.precompile += ["concen/ie.css", "concen/non_ios.css"]
-Rails.application.config.assets.precompile += ["concen/pages.js", "concen/performances.js", "concen/statuses.js", "concen/traffics.js", "concen/users.js"]
+Rails.application.config.assets.precompile += ["concen/pages.js", "concen/performances.js", "concen/statuses.js", "concen/traffics.js", "concen/users.js", "concen/excanvas.js"]

data/lib/concen/version.rb

@@ -1,3 +1,3 @@
 module Concen
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/test/test_helper.rb

@@ -5,7 +5,6 @@ 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,7 +1,13 @@
-require 'test_helper'
+require "test_helper"
+require "minitest/spec"
+require "minitest/autorun"
 
-class ConcenTest < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, Concen
+describe Concen do
+  before do
+    DatabaseCleaner.clean
+  end
+
+  it "must be a Module" do
+    Concen.must_be_kind_of Module
   end
 end

data/test/unit/grid_file_test.rb

@@ -1,41 +1,47 @@
 require "test_helper"
+require "minitest/spec"
+require "minitest/autorun"
 
-class GridFileTest < ActiveSupport::TestCase
-  test "should store file in GridFS" do
+describe Concen::GridFile do
+  before do
+    DatabaseCleaner.clean
+  end
+
+  it "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"
-    assert_equal grid_file.read, File.read("#{Rails.root}/public/404.html")
+    grid_file.read.must_equal File.read("#{Rails.root}/public/404.html")
   end
 
-  test "should delete file from GridFS when page is deleted" do
+  it "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
-    assert_raise(Mongo::GridFileNotFound) { grid.get(grid_id).read }
+    lambda { grid.get(grid_id).read }.must_raise(Mongo::GridFileNotFound)
   end
 
-  test "should delete associated grid_file when page is deleted" do
+  it "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"
     page.destroy
   end
 
-  test "should store correct original_filename" do
+  it "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"
-    assert_equal grid_file.original_filename, "404.html"
+    grid_file.original_filename.must_equal "404.html"
   end
 
-  test "should include id in filename" do
+  it "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"
-    assert grid_file.filename.include?(grid_file.grid_id.to_s), "Filename does not include grid_id."
+    grid_file.filename.must_include grid_file.grid_id.to_s
   end
 end

data/test/unit/page_test.rb

@@ -1,128 +1,164 @@
 require "test_helper"
+require "minitest/spec"
+require "minitest/autorun"
 
-class PageTest < ActiveSupport::TestCase
-  test "should create page" do
+describe Concen::Page do
+  before do
+    DatabaseCleaner.clean
+  end
+
+  it "can create page" do
     page = Fabricate "concen/page"
-    assert_not_nil page.id
+    page.id.wont_be_nil
   end
 
-  test "should create child page" do
+  it "can create child page" do
     page = Fabricate "concen/page"
     child_page = page.children.create :title => "1984"
-    assert_not_nil child_page.id
-    assert_equal page.id, child_page.parent.id
+    child_page.id.wont_be_nil
+    page.id.must_equal child_page.parent.id
   end
 
-  test "should parse title from raw_text" do
+  it "must parse title from raw_text" do
     page = Fabricate "concen/page", :title => nil, :raw_text => "Title: Page Title"
-    assert_equal page.title, "Page Title"
+    page.title.must_equal "Page Title"
+  end
+
+  it "must get default title when none is present" do
+    page = Fabricate "concen/page", :title => nil
+    page.title.must_equal "Untitled 1"
+  end
+
+  it "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"
   end
 
-  test "should parse publish_time from raw_text" do
+  it "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
-    assert_not_nil page.publish_time
-    assert_not_equal page.raw_text, raw_text
+    page.publish_time.wont_be_nil
+    page.raw_text.wont_equal raw_text
   end
 
-  test "should parse multi content from raw_text and conver to html correctly" do
+  it "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
-    assert_not_nil page.content
-    assert_equal page.content.keys, ["part_1", "part_2"]
-    assert_not_nil page.content_in_html("part_1")
-    assert_not_nil page.content_in_html("part_2")
-    assert_equal page.content_in_html("part_1") + page.content_in_html("part_2"), html
+    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
   end
 
-  test "should parse content with SmartyPants supported entities and convert to html correctly" do
+  it "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"
-    assert_not_nil raw_text_smartypants
-    assert_not_nil raw_text_smartypants_escape
+    raw_text_smartypants.wont_be_nil
+    raw_text_smartypants_escape.wont_be_nil
 
     page1 = Fabricate "concen/page", :title => nil, :raw_text => raw_text_smartypants
-    assert_equal page1.content_in_html, page1.content_in_html("main")
-    assert_equal page1.content_in_html, File.read("#{File.dirname(__FILE__)}/../support/raw_text/smartypants.html")
+    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")
 
     page2 = Fabricate "concen/page", :title => nil, :raw_text => raw_text_smartypants_escape
-    assert_equal page2.content_in_html, page2.content_in_html("main")
-    assert_equal page2.content_in_html, File.read("#{File.dirname(__FILE__)}/../support/raw_text/smartypants_escape.html")
+    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")
   end
 
-  test "should parse content with code blocks and convert to html correctly" do
+  it "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"
-    assert_not_nil raw_text_code_blocks
+    raw_text_code_blocks.wont_be_nil
 
     page = Fabricate "concen/page", :title => nil, :raw_text => raw_text_code_blocks
-    assert_equal page.content_in_html, page.content_in_html("main")
-    assert_equal page.content_in_html, File.read("#{File.dirname(__FILE__)}/../support/raw_text/code_blocks.html")
+    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")
   end
 
-  test "should parse content with inline HTML and convert to html correctly" do
+  it "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"
-    assert_not_nil raw_text_code_blocks
+    raw_text_code_blocks.wont_be_nil
 
     page = Fabricate "concen/page", :title => nil, :raw_text => raw_text_code_blocks
-    assert_equal page.content_in_html, page.content_in_html("main")
-    assert_equal page.content_in_html, File.read("#{File.dirname(__FILE__)}/../support/raw_text/inline_html.html")
+    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")
   end
 
-  test "should have slug automatically generated" do
+  it "has slug automatically generated" do
     page1 = Fabricate "concen/page", :title => "Something New"
-    assert_equal page1.slug, "something-new"
+    page1.slug.must_equal "something-new"
 
     page2 = Fabricate.build "concen/page", :title => nil
     page2.raw_text = File.read "#{File.dirname(__FILE__)}/../support/raw_text/title.txt"
     page2.save
-    assert_equal page2.slug, "something-new"
+    page2.slug.must_equal "something-new"
   end
 
-  test "should be able to set slug from raw_text" do
+  it "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
-    assert_equal page.slug, "something-else"
+    page.slug.must_equal "something-else"
   end
 
-  test "should not be created without title" do
-    page = Fabricate.build "concen/page", :title => nil
-    assert_raise(Mongoid::Errors::Validations) { page.save! }
-		assert_equal page.errors[:title].first, "can't be blank"
-  end
-
-  test "should have authors" do
+  it "has authors" do
     page = Fabricate.build "concen/page", :authors => ["user1", "user2", "user3"]
-    assert_equal page.authors.count, 3
+    page.authors.count.must_equal 3
   end
 
-  test "should get correct author_as_user" do
+  it "must get correct author_as_user" do
     user = Fabricate "concen/user"
     page = Fabricate.build "concen/page", :authors => [user.username, "user2"]
-    assert_equal page.authors.count, 2
-    assert_equal page.authors_as_user.count, 1
-    assert page.authors_as_user.include?(user.reload), "Does not include a correct user."
+    page.authors.count.must_equal 2
+    page.authors_as_user.count.must_equal 1
+    page.authors_as_user.must_include user.reload
   end
 
-  test "should get the correct slug" do
+  it "must get the correct slug" do
     page = Fabricate "concen/page", :title => "New Title"
-    assert_equal page.slug, "new-title"
+    page.slug.must_equal "new-title"
     page.write_attribute :slug, "new-slug"
     page.save
-    assert_equal page.slug, "new-slug"
+    page.slug.must_equal "new-slug"
   end
 
-  test "should get position set/reset correctly" do
+  it "must set/reset position correctly" do
     page = Fabricate "concen/page"
     child_page_1 = page.children.create :title => "Position 1"
-    assert_equal child_page_1.position, 1
+    child_page_1.position.must_equal 1
+
     child_page_2 = page.children.create :title => "Position 2"
-    assert_equal child_page_2.position, 2
+    child_page_2.position.must_equal 2
+
     child_page_3 = page.children.create :title => "Position 3"
-    assert_equal child_page_3.position, 3
+    child_page_3.position.must_equal 3
 
     child_page_2.destroy
-    assert_equal child_page_3.reload.position, 2
+    child_page_3.reload.position.must_equal 2
+  end
+
+  it "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"]
+
+    page_3 = page_2.children.create :title => "C"
+    page_3.ancestor_slugs.must_equal ["a", "b"]
+  end
+
+  it "must have level" do
+    page_1 = Fabricate "concen/page", :title => "A"
+    page_1.level.must_equal 0
+
+    page_2 = page_1.children.create :title => "B"
+    page_2.level.must_equal 1
+
+    page_3 = page_2.children.create :title => "C"
+    page_3.level.must_equal 2
   end
 end

data/test/unit/user_test.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concen
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70181456877540 !ruby/object:Gem::Requirement
+  requirement: &70307512129060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.alpha
   type: :development
   prerelease: false
-  version_requirements: *70181456877540
+  version_requirements: *70307512129060
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70181456876960 !ruby/object:Gem::Requirement
+  requirement: &70307512128260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70181456876960
+  version_requirements: *70307512128260
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70181456876380 !ruby/object:Gem::Requirement
+  requirement: &70307512127260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.99.4
   type: :runtime
   prerelease: false
-  version_requirements: *70181456876380
+  version_requirements: *70307512127260
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70181456875800 !ruby/object:Gem::Requirement
+  requirement: &70307512125880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,43 +54,54 @@ dependencies:
         version: 2.0.0b5
   type: :runtime
   prerelease: false
-  version_requirements: *70181456875800
+  version_requirements: *70307512125880
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70181456866080 !ruby/object:Gem::Requirement
+  requirement: &70307512125080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70181456866080
+  version_requirements: *70307512125080
 - !ruby/object:Gem::Dependency
-  name: mongo-rails-instrumentation
-  requirement: &70181456865600 !ruby/object:Gem::Requirement
+  name: mongo
+  requirement: &70307512124280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70181456865600
+  version_requirements: *70307512124280
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70181456865100 !ruby/object:Gem::Requirement
+  requirement: &70307512123400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70307512123400
+- !ruby/object:Gem::Dependency
+  name: mongo-rails-instrumentation
+  requirement: &70307512154900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70181456865100
+  version_requirements: *70307512154900
 - !ruby/object:Gem::Dependency
   name: rack-gridfs
-  requirement: &70181456864520 !ruby/object:Gem::Requirement
+  requirement: &70307512154380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70181456864520
+  version_requirements: *70307512154380
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70181456863940 !ruby/object:Gem::Requirement
+  requirement: &70307512153820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +120,10 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70181456863940
+  version_requirements: *70307512153820
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70181456863360 !ruby/object:Gem::Requirement
+  requirement: &70307512153260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +131,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70181456863360
+  version_requirements: *70307512153260
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70181456862800 !ruby/object:Gem::Requirement
+  requirement: &70307512152700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +142,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70181456862800
+  version_requirements: *70307512152700
 - !ruby/object:Gem::Dependency
   name: domainatrix
-  requirement: &70181456862220 !ruby/object:Gem::Requirement
+  requirement: &70307512152080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +153,7 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70181456862220
+  version_requirements: *70307512152080
 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.
@@ -185,7 +196,7 @@ files:
 - app/assets/images/concen/original/search-field.png
 - app/assets/images/concen/record-visit.gif
 - app/assets/images/concen/search-field.png
-- app/assets/javascripts/concen/application.js.coffee
+- app/assets/javascripts/concen/application.js
 - app/assets/javascripts/concen/pages.js
 - app/assets/javascripts/concen/performances.js
 - app/assets/javascripts/concen/statuses.js
@@ -404,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: concen
-rubygems_version: 1.8.9
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Control and monitor Rails application.

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

@@ -1,12 +0,0 @@
-#= 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