concen 0.1.7 → 0.2.0

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

@@ -1,3 +1,5 @@
+@charset "utf-8"
+
 @import "compass"
 @import "partials/mixins"
 
@@ -9,8 +11,8 @@ ul.squares
 		p.date
 			$use-mozilla-ellipsis-binding: true
 			+ellipsis
-		
+
 #article-top
 	h2
 		$use-mozilla-ellipsis-binding: true
-		+ellipsis
+		+ellipsis

data/app/{stylesheets → assets/stylesheets/concen}/partials/_mixins.sass

@@ -1,8 +1,8 @@
-@mixin image-dimensions($path)
+=image-dimensions($path)
   height: image-height($path)
   width: image-width($path)
 
-@mixin background-image-with-dimension($path)
+=background-image-with-dimension($path)
   background: image-url($path)
   background-repeat: no-repeat
   +image-dimensions($path)

data/app/controllers/concen/visits_controller.rb

@@ -5,7 +5,7 @@ module Concen
 
     def visit_recorder_js
       if cookies[:visitor_id].blank?
-        cookies[:visitor_id] = {:value => ActiveSupport::SecureRandom.uuid, :expires => 20.years.from_now}
+        cookies[:visitor_id] = {:value => SecureRandom.uuid, :expires => 20.years.from_now}
       end
       render :layout => false, :mime_type => "text/javascript"
     end
@@ -31,7 +31,7 @@ module Concen
         {"$inc" => {:count => 1}, "$set" => {:domain => referral_domain}},
         :upsert => true, :safe => false
       )
-      image_path = "#{Rails.root}/public/concen/images/record-visit.gif"
+      image_path = "#{Concen::Engine.root}/app/assets/images/concen/record-visit.gif"
       send_file image_path, :type => "image/gif", :disposition => "inline"
     end
   end

data/app/models/concen/user.rb

@@ -59,8 +59,8 @@ module Concen
     end
 
     def self.send_invitation(email)
-      password = ActiveSupport::SecureRandom.hex(4)
-      username = "user#{ActiveSupport::SecureRandom.hex(4)}"
+      password = SecureRandom.hex(4)
+      username = "user#{SecureRandom.hex(4)}"
       new_user = self.new(
         :full_name => username,
         :username => username,
@@ -75,7 +75,7 @@ module Concen
     end
 
     def generate_token(field)
-      self.write_attribute(field.to_sym, ActiveSupport::SecureRandom.urlsafe_base64)
+      self.write_attribute(field.to_sym, SecureRandom.urlsafe_base64)
     end
 
     def nulify_unused_token

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

@@ -1,8 +1,3 @@
-- content_for :head_javascripts do
-  = javascript_include_tag "/concen/javascripts/ace/ace.js"
-  = javascript_include_tag "/concen/javascripts/fileuploader.js"
-  = javascript_include_tag "/concen/javascripts/page.js"
-
 #content
   %h1= "Edit #{@grid_file.original_filename}"
   .clearfix

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

@@ -1,8 +1,3 @@
-- content_for :head_javascripts do
-  = javascript_include_tag "/concen/javascripts/ace/ace.js"
-  = javascript_include_tag "/concen/javascripts/fileuploader.js"
-  = javascript_include_tag "/concen/javascripts/page.js"
-
 #content
   %h1 Edit Page
   = render "form"

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

@@ -1,6 +1,3 @@
-- content_for :head_javascripts do
-  = javascript_include_tag "/concen/javascripts/page.js"
-
 #content
   %h1
     = one_line do

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

@@ -1,8 +1,3 @@
-- content_for :head_javascripts do
-  = javascript_include_tag "/concen/javascripts/ace/ace.js"
-  = javascript_include_tag "/concen/javascripts/fileuploader.js"
-  = javascript_include_tag "/concen/javascripts/page.js"
-
 #content
   %h1 New Page
   .clearfix

data/app/views/concen/performances/show.html.haml

@@ -1,10 +1,6 @@
 - content_for :head_javascripts do
   /[if lte IE 8]
-    = javascript_include_tag "/concen/javascripts/excanvas.js"
-  = javascript_include_tag "/concen/javascripts/jquery.flot.js"
-  = javascript_include_tag "/concen/javascripts/jquery.flot.stack.js"
-  = javascript_include_tag "/concen/javascripts/jquery.flot.resize.js"
-  = javascript_include_tag "/concen/javascripts/performance.js"
+    = javascript_include_tag "concen/excanvas"
 
 #content
   .panels

data/app/views/concen/statuses/show.html.haml

@@ -1,6 +1,3 @@
-- content_for :head_javascripts do
-  = javascript_include_tag "/concen/javascripts/status.js"
-
 #content
   .panels
     .panel.pages

data/app/views/concen/traffics/show.html.haml

@@ -1,10 +1,6 @@
 - content_for :head_javascripts do
   /[if lte IE 8]
-    = javascript_include_tag "/concen/javascripts/excanvas.js"
-  = javascript_include_tag "/concen/javascripts/jquery.flot.js"
-  = javascript_include_tag "/concen/javascripts/jquery.flot.stack.js"
-  = javascript_include_tag "/concen/javascripts/jquery.flot.resize.js"
-  = javascript_include_tag "/concen/javascripts/traffic.js"
+    = javascript_include_tag "concen/excanvas"
 
 #content
   .panels

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

@@ -1,6 +1,3 @@
-- content_for :head_javascripts do
-  = javascript_include_tag "/concen/javascripts/user.js"
-
 #content
   %h1
     = one_line do

data/app/views/layouts/concen/application.html.haml

@@ -12,29 +12,16 @@
     %meta{:name => "viewport", :content => "width = 1024"}
     %meta{"http-equiv" => "X-UA-Compatible", :content => "IE=edge"}
     = csrf_meta_tag
-    = stylesheet_link_tag "/concen/stylesheets/application.css"
-    = stylesheet_link_tag "/concen/stylesheets/jquery.ui.resizable.css"
+    = stylesheet_link_tag "concen/application"
+    = stylesheet_link_tag params[:controller]
     - if content_for?(:head_stylesheets)
       = yield :head_stylesheets
     /[if lt IE 8]
-      = stylesheet_link_tag "/concen/stylesheets/ie.css"
+      = stylesheet_link_tag "concen/ie"
     %script{:type => "text/javascript", :src => "http://use.typekit.com/#{Concen.typekit_id}.js"}
     %script{:type => "text/javascript"} try{Typekit.load();}catch(e){}
-    - if Rails.env == "production"
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/modernizr/2.0.6/modernizr.min.js"
-      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/jquery/1.6.2/jquery.min.js"
-    - else
-      = javascript_include_tag "/concen/javascripts/modernizr.js", "/concen/javascripts/jquery.js"
-    = javascript_include_tag "/concen/javascripts/jquery-ui/jquery.ui.core.js"
-    = javascript_include_tag "/concen/javascripts/jquery-ui/jquery.ui.widget.js"
-    = javascript_include_tag "/concen/javascripts/jquery-ui/jquery.ui.mouse.js"
-    = javascript_include_tag "/concen/javascripts/jquery-ui/jquery.ui.position.js"
-    = javascript_include_tag "/concen/javascripts/jquery-ui/jquery.ui.sortable.js"
-    = javascript_include_tag "/concen/javascripts/jquery-ui/jquery.ui.resizable.js"
-    = javascript_include_tag "/concen/javascripts/jquery-ui/jquery.ui.draggable.js"
-    = javascript_include_tag "/concen/javascripts/jquery-ui/jquery.ui.droppable.js"
-    = javascript_include_tag "/concen/javascripts/jquery.ui.nestedSortable.js"
-    = javascript_include_tag "/concen/javascripts/jquery_ujs.js"
+    = javascript_include_tag "concen/application"
+    = javascript_include_tag params[:controller]
     - if content_for?(:head_javascripts)
       = yield :head_javascripts
     - if content_for?(:head)

data/concen.gemspec

@@ -21,16 +21,16 @@ 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.11.5")
+  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.0b3")
+  s.add_dependency("redcarpet", "~> 2.0.0b4")
   s.add_dependency("mongoid", "~> 2.0.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.4.3")
   s.add_dependency("mime-types", "~> 1.16")
-  s.add_dependency("bcrypt-ruby", "~> 2.1.4")
+  s.add_dependency("bcrypt-ruby", "~> 3.0.0")
   s.add_dependency("domainatrix", "~> 0.0.10")
 end

data/config/initializers/assets.rb

@@ -0,0 +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"]

data/config/initializers/prepend_routing_paths.rb

@@ -1,6 +1,7 @@
 # TODO: Use Rails.application.routes.prepend on Rails 3.1
 # and disasble the following code block.
-Concen::Engine.paths.config.routes.to_a.each do |route|
+Concen::Engine.paths["config/routes"].to_a.each do |route|
   Rails.application.routes_reloader.paths.unshift(route) if File.exists?(route)
   Rails.application.routes_reloader.paths.uniq!
 end
+

data/lib/concen/railties/setup.rake

@@ -6,9 +6,6 @@ namespace :concen do
     if ["development", "test"].include? Rails.env
       Rake::Task["concen:generate_mongoid_config"].invoke
       Rake::Task["concen:generate_initializer"].invoke
-      Rake::Task["concen:symlink_assets"].invoke
-    else
-      Rake::Task["concen:copy_assets"].invoke
     end
     message = "Concen setup for #{Rails.env} environment is complete."
     puts "\n\e[32m#{message}\e[0m\n" # Green.
@@ -62,26 +59,4 @@ INITIALIZER
       puts "\n\e[32m#{message}\e[0m\n" # Green.
     end
   end
-
-  desc "Copy assets for Control Center."
-  task :copy_assets do
-    origin      = File.join(Concen::Engine.root, "public")
-    destination = File.join(Rails.root, "public")
-    if Dir.exist?("#{destination}/concen") || File.exist?("#{destination}/concen")
-      FileUtils.rm_r "#{destination}/concen"
-    end
-    FileUtils.cp_r "#{origin}/concen/", "#{destination}/"
-    message = "Assets have been copied to #{destination}."
-    puts "\n\e[32m#{message}\e[0m\n" # Green.
-  end
-
-  desc "Symlink assets."
-  task :symlink_assets do
-    origin      = File.join(Concen::Engine.root, "public")
-    destination = File.join(Rails.root, "public")
-    FileUtils.rm_r "#{destination}/concen" if File.directory?("#{destination}/concen")
-    FileUtils.ln_s "#{origin}/concen/", "#{destination}/"
-    message = "Assets have been symlinked to #{destination}."
-    puts "\n\e[32m#{message}\e[0m\n" # Green.
-  end
 end

data/lib/concen/version.rb

@@ -1,3 +1,3 @@
 module Concen
-  VERSION = "0.1.7"
-end
+  VERSION = "0.2.0"
+end

data/test/dummy/config/application.rb

@@ -1,9 +1,10 @@
 require File.expand_path('../boot', __FILE__)
 
-require "active_model/railtie"
 require "action_controller/railtie"
-require "action_view/railtie"
 require "action_mailer/railtie"
+require "active_resource/railtie"
+require "rails/test_unit/railtie"
+require "sprockets/railtie"
 
 Bundler.require
 require "concen"
@@ -40,5 +41,7 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    config.assets.enabled = true
   end
 end

data/test/dummy/config/environments/development.rb

@@ -23,4 +23,3 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 end
-