concen 0.2.4 → 0.2.5

data/concen.gemspec

@@ -21,8 +21,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency("compass", "~> 0.12.alpha")
-  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.2")

data/lib/concen/engine.rb

@@ -1,5 +1,4 @@
 require "rails"
-require "haml"
 require "mongoid"
 require "mongo/rails/instrumentation/railtie"
 

data/lib/concen/version.rb

@@ -1,3 +1,3 @@
 module Concen
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/test/support/raw_text/smartypants.html

@@ -1,3 +1,3 @@
-<p>He sat back. A sense of complete helplessness had descended upon him. To begin with, he did not know with any certainty that this was 1984. It must be round about that date, since he was &ldquo;fairly&rdquo; sure that his age was thirty-nine, and he &lsquo;believed&rsquo; that he had been born in 1944&ndash;1945; but it was never possible nowadays to pin down any date within a year or two.</p>
+<p>George was at the teachers&rsquo; meeting. He sat back. A sense of complete helplessness had descended upon him. To begin with, he didn&rsquo;t know with any certainty that this was 1984. It must be round about that date, since he was &ldquo;fairly&rdquo; sure that his age was thirty-nine, and he &lsquo;believed&rsquo; that he had been born in 1944&ndash;1945; but it was never possible nowadays to pin down any date within a year or two.</p>
 
 <p>For whom, it suddenly occurred to him to wonder, was he writing this diary? For the future, for the unborn. His mind hovered &mdash; for a moment round the doubtful date on the page, and then fetched up with a bump against the Newspeak word doublethink. For the first time the magnitude of what he had undertaken came home to him. How could you communicate with the future? It was of its nature impossible. Either the future would resemble the present, in which case it would not listen to him: or it would be different from it, and his predicament would be meaningless&hellip;</p>

data/test/support/raw_text/smartypants.txt

@@ -6,6 +6,6 @@ Publish Time: 2011-07-22 02:28:53 +0800
 
 -----
 
-He sat back. A sense of complete helplessness had descended upon him. To begin with, he did not know with any certainty that this was 1984. It must be round about that date, since he was "fairly" sure that his age was thirty-nine, and he 'believed fdfds' that he had been born in 1944--1945; but it was never possible nowadays to pin down any date within a year or two.
+George was at the teachers' meeting. He sat back. A sense of complete helplessness had descended upon him. To begin with, he didn't know with any certainty that this was 1984. It must be round about that date, since he was "fairly" sure that his age was thirty-nine, and he 'believed' that he had been born in 1944--1945; but it was never possible nowadays to pin down any date within a year or two.
 
 For whom, it suddenly occurred to him to wonder, was he writing this diary? For the future, for the unborn. His mind hovered --- for a moment round the doubtful date on the page, and then fetched up with a bump against the Newspeak word doublethink. For the first time the magnitude of what he had undertaken came home to him. How could you communicate with the future? It was of its nature impossible. Either the future would resemble the present, in which case it would not listen to him: or it would be different from it, and his predicament would be meaningless...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concen
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-01 00:00:00.000000000 Z
+date: 2011-11-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: compass
-  requirement: &70263056816320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.12.alpha
-  type: :development
-  prerelease: false
-  version_requirements: *70263056816320
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &70263056812780 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70263056812780
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70263056810380 !ruby/object:Gem::Requirement
+  requirement: &70330993430240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +21,10 @@ dependencies:
         version: 0.99.4
   type: :runtime
   prerelease: false
-  version_requirements: *70263056810380
+  version_requirements: *70330993430240
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70263056806840 !ruby/object:Gem::Requirement
+  requirement: &70330993429720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +32,10 @@ dependencies:
         version: 2.0.0b5
   type: :runtime
   prerelease: false
-  version_requirements: *70263056806840
+  version_requirements: *70330993429720
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70263056802160 !ruby/object:Gem::Requirement
+  requirement: &70330993429140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +43,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70263056802160
+  version_requirements: *70330993429140
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70263056799140 !ruby/object:Gem::Requirement
+  requirement: &70330993428520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +54,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70263056799140
+  version_requirements: *70330993428520
 - !ruby/object:Gem::Dependency
   name: mongo-rails-instrumentation
-  requirement: &70263056599820 !ruby/object:Gem::Requirement
+  requirement: &70330993427540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +65,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70263056599820
+  version_requirements: *70330993427540
 - !ruby/object:Gem::Dependency
   name: rack-gridfs
-  requirement: &70263056596520 !ruby/object:Gem::Requirement
+  requirement: &70330993426840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +76,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70263056596520
+  version_requirements: *70330993426840
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70263056595600 !ruby/object:Gem::Requirement
+  requirement: &70330993426240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +87,10 @@ dependencies:
         version: 0.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *70263056595600
+  version_requirements: *70330993426240
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70263056594800 !ruby/object:Gem::Requirement
+  requirement: &70330993447760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +98,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70263056594800
+  version_requirements: *70330993447760
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70263056593760 !ruby/object:Gem::Requirement
+  requirement: &70330993447300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +109,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70263056593760
+  version_requirements: *70330993447300
 - !ruby/object:Gem::Dependency
   name: domainatrix
-  requirement: &70263056589660 !ruby/object:Gem::Requirement
+  requirement: &70330993446840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +120,7 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70263056589660
+  version_requirements: *70330993446840
 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.
@@ -192,6 +170,84 @@ files:
 - app/assets/javascripts/concen/traffics.js
 - app/assets/javascripts/concen/users.js
 - app/assets/stylesheets/concen/application.css.sass
+- app/assets/stylesheets/concen/compass/_css3.scss
+- app/assets/stylesheets/concen/compass/_layout.scss
+- app/assets/stylesheets/concen/compass/_reset-legacy.scss
+- app/assets/stylesheets/concen/compass/_reset.scss
+- app/assets/stylesheets/concen/compass/_support.scss
+- app/assets/stylesheets/concen/compass/_typography.scss
+- app/assets/stylesheets/concen/compass/_utilities.scss
+- app/assets/stylesheets/concen/compass/css3/_appearance.scss
+- app/assets/stylesheets/concen/compass/css3/_background-clip.scss
+- app/assets/stylesheets/concen/compass/css3/_background-origin.scss
+- app/assets/stylesheets/concen/compass/css3/_background-size.scss
+- app/assets/stylesheets/concen/compass/css3/_border-radius.scss
+- app/assets/stylesheets/concen/compass/css3/_box-shadow.scss
+- app/assets/stylesheets/concen/compass/css3/_box-sizing.scss
+- app/assets/stylesheets/concen/compass/css3/_box.scss
+- app/assets/stylesheets/concen/compass/css3/_columns.scss
+- app/assets/stylesheets/concen/compass/css3/_font-face.scss
+- app/assets/stylesheets/concen/compass/css3/_gradient.scss
+- app/assets/stylesheets/concen/compass/css3/_images.scss
+- app/assets/stylesheets/concen/compass/css3/_inline-block.scss
+- app/assets/stylesheets/concen/compass/css3/_opacity.scss
+- app/assets/stylesheets/concen/compass/css3/_pie.scss
+- app/assets/stylesheets/concen/compass/css3/_shared.scss
+- app/assets/stylesheets/concen/compass/css3/_text-shadow.scss
+- app/assets/stylesheets/concen/compass/css3/_transform-legacy.scss
+- app/assets/stylesheets/concen/compass/css3/_transform.scss
+- app/assets/stylesheets/concen/compass/css3/_transition.scss
+- app/assets/stylesheets/concen/compass/layout/_grid-background.scss
+- app/assets/stylesheets/concen/compass/layout/_sticky-footer.scss
+- app/assets/stylesheets/concen/compass/layout/_stretching.scss
+- app/assets/stylesheets/concen/compass/reset/_utilities-legacy.scss
+- app/assets/stylesheets/concen/compass/reset/_utilities.scss
+- app/assets/stylesheets/concen/compass/typography/_links.scss
+- app/assets/stylesheets/concen/compass/typography/_lists.scss
+- app/assets/stylesheets/concen/compass/typography/_text.scss
+- app/assets/stylesheets/concen/compass/typography/_vertical_rhythm.scss
+- app/assets/stylesheets/concen/compass/typography/links/_hover-link.scss
+- app/assets/stylesheets/concen/compass/typography/links/_link-colors.scss
+- app/assets/stylesheets/concen/compass/typography/links/_unstyled-link.scss
+- app/assets/stylesheets/concen/compass/typography/lists/_bullets.scss
+- app/assets/stylesheets/concen/compass/typography/lists/_horizontal-list.scss
+- app/assets/stylesheets/concen/compass/typography/lists/_inline-block-list.scss
+- app/assets/stylesheets/concen/compass/typography/lists/_inline-list.scss
+- app/assets/stylesheets/concen/compass/typography/text/_ellipsis.scss
+- app/assets/stylesheets/concen/compass/typography/text/_force-wrap.scss
+- app/assets/stylesheets/concen/compass/typography/text/_nowrap.scss
+- app/assets/stylesheets/concen/compass/typography/text/_replacement.scss
+- app/assets/stylesheets/concen/compass/utilities/_color.scss
+- app/assets/stylesheets/concen/compass/utilities/_general.scss
+- app/assets/stylesheets/concen/compass/utilities/_links.scss
+- app/assets/stylesheets/concen/compass/utilities/_lists.scss
+- app/assets/stylesheets/concen/compass/utilities/_print.scss
+- app/assets/stylesheets/concen/compass/utilities/_sprites.scss
+- app/assets/stylesheets/concen/compass/utilities/_tables.scss
+- app/assets/stylesheets/concen/compass/utilities/_text.scss
+- app/assets/stylesheets/concen/compass/utilities/color/_contrast.scss
+- app/assets/stylesheets/concen/compass/utilities/general/_clearfix.scss
+- app/assets/stylesheets/concen/compass/utilities/general/_float.scss
+- app/assets/stylesheets/concen/compass/utilities/general/_hacks.scss
+- app/assets/stylesheets/concen/compass/utilities/general/_min.scss
+- app/assets/stylesheets/concen/compass/utilities/general/_reset.scss
+- app/assets/stylesheets/concen/compass/utilities/general/_tabs.scss
+- app/assets/stylesheets/concen/compass/utilities/general/_tag-cloud.scss
+- app/assets/stylesheets/concen/compass/utilities/links/_hover-link.scss
+- app/assets/stylesheets/concen/compass/utilities/links/_link-colors.scss
+- app/assets/stylesheets/concen/compass/utilities/links/_unstyled-link.scss
+- app/assets/stylesheets/concen/compass/utilities/lists/_bullets.scss
+- app/assets/stylesheets/concen/compass/utilities/lists/_horizontal-list.scss
+- app/assets/stylesheets/concen/compass/utilities/lists/_inline-block-list.scss
+- app/assets/stylesheets/concen/compass/utilities/lists/_inline-list.scss
+- app/assets/stylesheets/concen/compass/utilities/sprites/_base.scss
+- app/assets/stylesheets/concen/compass/utilities/sprites/_sprite-img.scss
+- app/assets/stylesheets/concen/compass/utilities/tables/_alternating-rows-and-columns.scss
+- app/assets/stylesheets/concen/compass/utilities/tables/_borders.scss
+- app/assets/stylesheets/concen/compass/utilities/tables/_scaffolding.scss
+- app/assets/stylesheets/concen/compass/utilities/text/_ellipsis.scss
+- app/assets/stylesheets/concen/compass/utilities/text/_nowrap.scss
+- app/assets/stylesheets/concen/compass/utilities/text/_replacement.scss
 - app/assets/stylesheets/concen/ie.css.sass
 - app/assets/stylesheets/concen/non_ios.css.sass
 - app/assets/stylesheets/concen/partials/.sass
@@ -217,37 +273,37 @@ files:
 - app/models/concen/user.rb
 - app/models/concen/visit/page.rb
 - app/models/concen/visit/referral.rb
-- app/views/concen/grid_files/_form.html.haml
-- app/views/concen/grid_files/edit.html.haml
-- app/views/concen/pages/_file_list.haml
-- app/views/concen/pages/_files.haml
-- app/views/concen/pages/_form.html.haml
-- app/views/concen/pages/_nested_list.html.haml
-- app/views/concen/pages/edit.html.haml
-- app/views/concen/pages/index.html.haml
-- app/views/concen/pages/new.html.haml
-- app/views/concen/performances/_runtimes.html.haml
-- app/views/concen/performances/show.html.haml
-- app/views/concen/sessions/new.html.haml
-- app/views/concen/statuses/_server.html.haml
-- app/views/concen/statuses/show.html.haml
-- app/views/concen/traffics/_pages.html.haml
-- app/views/concen/traffics/_referrals.html.haml
-- app/views/concen/traffics/show.html.haml
-- app/views/concen/users/_form.html.haml
-- app/views/concen/users/_password_reset.html.haml
-- app/views/concen/users/_settings.html.haml
-- app/views/concen/users/edit.html.haml
-- app/views/concen/users/index.html.haml
-- app/views/concen/users/new.html.haml
-- app/views/concen/users/new_invite.html.haml
-- app/views/concen/users/new_reset_password.html.haml
+- app/views/concen/grid_files/_form.html.erb
+- app/views/concen/grid_files/edit.html.erb
+- app/views/concen/pages/_file_list.erb
+- app/views/concen/pages/_files.erb
+- app/views/concen/pages/_form.html.erb
+- app/views/concen/pages/_nested_list.html.erb
+- app/views/concen/pages/edit.html.erb
+- app/views/concen/pages/index.html.erb
+- app/views/concen/pages/new.html.erb
+- app/views/concen/performances/_runtimes.html.erb
+- app/views/concen/performances/show.html.erb
+- app/views/concen/sessions/new.html.erb
+- app/views/concen/statuses/_server.html.erb
+- app/views/concen/statuses/show.html.erb
+- app/views/concen/traffics/_pages.html.erb
+- app/views/concen/traffics/_referrals.html.erb
+- app/views/concen/traffics/show.html.erb
+- app/views/concen/users/_form.html.erb
+- app/views/concen/users/_password_reset.html.erb
+- app/views/concen/users/_settings.html.erb
+- app/views/concen/users/edit.html.erb
+- app/views/concen/users/index.html.erb
+- app/views/concen/users/new.html.erb
+- app/views/concen/users/new_invite.html.erb
+- app/views/concen/users/new_reset_password.html.erb
 - app/views/concen/visits/visit_recorder_js.erb
-- app/views/layouts/concen/_additional_header_links.haml
-- app/views/layouts/concen/_header.html.haml
-- app/views/layouts/concen/_iphone.html.haml
-- app/views/layouts/concen/application.html.haml
-- app/views/layouts/concen/maintenance.html.haml
+- app/views/layouts/concen/_additional_header_links.html.erb
+- app/views/layouts/concen/_header.html.erb
+- app/views/layouts/concen/_iphone.html.erb
+- app/views/layouts/concen/application.html.erb
+- app/views/layouts/concen/maintenance.html.erb
 - concen.gemspec
 - config/initializers/assets.rb
 - config/initializers/notification.rb

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

@@ -1,15 +0,0 @@
-= form_for [@page, @grid_file], :url => concen_page_grid_file_path(@page, @grid_file), :html => {:class => "with-text-editor wide"} do |f|
-  - if @grid_file.errors.any?
-    #errorExplanation
-      %h3= "#{pluralize(@page.errors.count, "error")} prohibited this parent from being saved:"
-      %ul
-        - @page.errors.full_messages.each do |msg|
-          %li= msg
-  .field.text-editor
-    .border
-      #text-editor.wide
-  = text_area_tag :concen_grid_file_page, @grid_file.read.force_encoding("utf-8"), :class => "text-editor-content hidden"
-  .actions.flush
-    = f.submit "Save"
-    = link_to "Delete", concen_page_grid_file_path(@page, @grid_file), :method => :delete
-    = link_to "Cancel", edit_concen_page_path(@page)

data/app/views/concen/grid_files/edit.html.haml

@@ -1,7 +0,0 @@
-- content_for :head_javascripts do
-  = javascript_include_tag "concen/pages"
-
-#content
-  %h1= "Edit #{@grid_file.original_filename}"
-  .clearfix
-    = render "form"

data/app/views/concen/pages/_file_list.haml

@@ -1,7 +0,0 @@
-%ul
-  - files.each_with_index do |file, index|
-    %li
-      = link_to "#{file.original_filename} (#{number_to_human_size(file.size)})", file.url(root_url), :class => "filename", "data-path" => file.path
-      - if file.text?
-        = link_to "Edit", edit_concen_page_grid_file_path(file.page, file)
-      = link_to "Delete", concen_page_grid_file_path(file.page, file), :class => "delete"

data/app/views/concen/pages/_files.haml

@@ -1,24 +0,0 @@
-.files
-  .stylesheets
-    %h3
-      %span Stylesheets
-      = link_to "New", concen_page_grid_files_path(@page, :file_type => "css"), :class => "link-button new-file"
-    - if @page.stylesheets.any?
-      = render :partial => "concen/pages/file_list", :locals => {:files => @page.stylesheets}
-
-  .javascripts
-    %h3
-      %span JavaScripts
-      = link_to "New", concen_page_grid_files_path(@page, :file_type => "js"), :class => "link-button new-file"
-    - if @page.javascripts.any?
-      = render :partial => "concen/pages/file_list", :locals => {:files => @page.javascripts}
-
-  - if @page.images.any?
-    .images
-      %h3 Images
-      = render :partial => "concen/pages/file_list", :locals => {:files => @page.images}
-
-  - if @page.others.any?
-    .others
-      %h3 Others
-      = render :partial => "concen/pages/file_list", :locals => {:files => @page.others}

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

@@ -1,17 +0,0 @@
-= form_for @page, {:html => {:class => "with-text-editor #{'wide' if !@page.persisted?}"}} do |f|
-  - if @page.errors.any?
-    #errorExplanation
-      %h3= "#{pluralize(@page.errors.count, "error")} prohibited this parent from being saved:"
-      %ul
-        - @page.errors.full_messages.each do |msg|
-          %li= msg
-  .field.text-editor
-    .border
-      #text-editor
-  = f.text_area :raw_text, :class => "text-editor-content hidden"
-  = f.hidden_field :parent_id
-  .actions.flush
-    = f.submit "Save"
-    - if @page.persisted?
-      = link_to "Delete", concen_page_path(@page), :method => :delete
-    = link_to "Cancel", concen_pages_path

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

@@ -1,15 +0,0 @@
-- if root && page.level == 0
-  - children = [page]
-- else
-  - children = Concen::Page.where(:parent_id => page.id).asc(:position)
-%ul{:class => children.first.level == 0 && "pages", :data => {:level => children.first.level}}
-  - for child in children
-    %li{:data => {:id => "page-#{child.id}"}}
-      %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(: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}