rails_blog_engine 0.0.2 → 0.0.3

data/README.md

@@ -37,7 +37,34 @@ writing the blog.  For example:
 You should now be able to access your blog at `http://0.0.0.0:3000/blog`
 and start posting!
 
-## What if I'm not already using `cancan`?
+If you're not using CanCan, keep reading for setup instructions.
+
+## Philosophy and planned features
+
+`rails_blog_engine` should...
+
+* ...be installable in under 5 minutes.
+* ...be simple and easily hackable.
+* ...be opinionated.
+* ...be customized by overriding templates or forking the source, not by
+  adding configuration options.
+* ...be secure.
+* ...follow all white-hat SEO best practices.
+* ...have excellent unit test coverage, including tests for JavaScript.
+
+CoffeeScript, SCSS and other standard Rails 3.1 features are fair game, as
+are RSpec, HAML and CanCan.
+
+The following features are on my wishlist:
+
+* More generators to aid customization
+* Caching
+* A basic editor: Auto-save, with preview and a "Publish" button
+
+In other words, we want just enough features to make blogging pleasant, and
+nothing more.
+
+## What if I'm not already using CanCan?
 
 You can still use `rails_blog_engine`!  First, install `rails_blog_engine`
 as described above, and then add the following lines to your `Gemfile`:
@@ -71,7 +98,7 @@ Once you have a working user model, you can generate a new
 
 ### How can I make this work without a Devise `User` class?
 
-Basically, all `cancan` cares about is whether your controller defines a
+Basically, all CanCan cares about is whether your controller defines a
 `current_ability` class.  So for example, if you don't use Devise, but the
 currently logged-in administrator is available as `current_admin`, you can
 edit `app/controllers/application_controller.rb` to override
@@ -114,35 +141,6 @@ Then launch your application using the `foreman start` command.  This will
 require adding the `foreman` gem to your `Gemfile`, and creating a
 `Procfile`.
 
-## Philosophy and planned features
-
-`rails_blog_engine` should...
-
-* ...be installable in under 5 minutes.
-* ...be simple and easily hackable.
-* ...be opinionated.
-* ...be customized by overriding templates or forking the source, not by
-  adding configuration options.
-* ...be secure.
-* ...follow all white-hat SEO best practices.
-* ...have excellent unit test coverage, including tests for JavaScript.
-
-CoffeeScript, SCSS and other standard Rails 3.1 features are fair game, as
-are RSpec, HAML and CanCan.
-
-The following features are on my wishlist:
-
-* Pagination
-* More generators to aid customization
-* Caching
-* Optional comments, with spam filtering via a 3rd-party service
-  * Why?  Intelligent discussion adds value and may make it easier
-    for searchers to find your blog posts.
-* A basic editor: Auto-save, with preview and a "Publish" button
-
-In other words, we want just enough features to make blogging pleasant, and
-nothing more.
-
 ## Syntax highlighting
 
 If you want to be able to display source code snippets with syntax

data/Rakefile

@@ -43,7 +43,7 @@ task :routes => 'app:environment' do
 
   Rails.application.reload_routes!
   all_routes = RailsBlogEngine::Engine.routes.routes
-  prefix = RailsBlogEngine::Engine.routes.url_helpers.root_path.sub(/\/\z/, '')
+  prefix = RailsBlogEngine::Engine.routes.url_helpers.blog_path.sub(/\/\z/, '')
 
   if ENV['CONTROLLER']
     all_routes = all_routes.select{ |route| route.defaults[:controller] == ENV['CONTROLLER'] }

data/TODO.txt

@@ -1,22 +1,13 @@
 Before public release
 
-/ Spam filtering for comments: rakismet
-/   Moderation by administrators
-/ Secure comment fields using attr_accessible
-/ Secure HTML in comments
-X Table changes - Not going to collapse migrations, so there's no rush.
-X   Comment author_id polymorphic
-X   Comment state index
-X   Collapse migrations into 1 giant migration
-/ Quick refactoring pass
 , Integrate into Kidd Software site
 
 Needed for 3rd-party use
 
+  What should we do about route helpers in the application layout?
   Generators
     rails_blog_engine:templates
     rails_blog_engine:filter
-  Config class?  Either implement or remove initializer
 
 Needed for use as a product or company blog
 
@@ -25,7 +16,3 @@ Needed for use as a product or company blog
     Auto-save
     Publish / Unpublish button
 , SEO best practices
-
-Needed for 1.0
-
-  Recent articles list

data/app/controllers/rails_blog_engine/application_controller.rb

@@ -1,14 +1,19 @@
 module RailsBlogEngine
   class ApplicationController < ActionController::Base
-    # Use our parent application's layout, so that we "auto-blend" into
-    # the existing look-and-feel of the site.
-    layout 'application'
+    layout :choose_layout
 
     helper_method :post_permalink_url
     helper_method :post_permalink_path
 
     protected
 
+    # We normally use one of our parent application's layouts, so that we
+    # "auto-blend" into the existing look-and-feel of the site.  The
+    # specific layout is specified by our initializer.
+    def choose_layout
+      Rails.configuration.rails_blog_engine.layout
+    end
+
     def post_permalink_local_path(post)
       date = post.published_at.utc
       sprintf('%04d/%02d/%02d/%s', date.year, date.month,
@@ -16,11 +21,11 @@ module RailsBlogEngine
     end
 
     def post_permalink_path(post)
-      root_path + post_permalink_local_path(post)
+      blog_path + post_permalink_local_path(post)
     end
 
     def post_permalink_url(post)
-      root_url + post_permalink_local_path(post)
+      blog_url + post_permalink_local_path(post)
     end
   end
 end

data/app/helpers/rails_blog_engine/application_helper.rb

@@ -1,5 +1,12 @@
 module RailsBlogEngine
   module ApplicationHelper
+    # Wrap a block of content up as a blog page.  This is basically a
+    # nested layout with some wrapper classes and a sidebar.
+    def blog_page(&block)
+      content_for(:rails_blog_engine_content, &block)
+      render :partial => 'layouts/rails_blog_engine/blog_page'
+    end
+
     # Process a block of text as Markdown, using our filters, and sanitize
     # any usafe HTML.  You can pass <code>:trusted? => true</code> to allow
     # images and links without nofollow.
@@ -12,7 +19,7 @@ module RailsBlogEngine
     # The URL of our Atom feed. Rails refuses to generate this in any simple
     # fashion, so we do it manually.
     def feed_url
-      root_url + "posts.atom"
+      blog_url + "posts.atom"
     end
 
     # Get extra HTML classes for the specified comment.
@@ -29,6 +36,28 @@ module RailsBlogEngine
       end
     end
 
+    # Returns an object providing the standard application helpers for our
+    # containing application.  This is necessary when we are rendered using
+    # an application-wide layout from inside an engine-specific controller,
+    # which normally makes it impossible to access the application's helper
+    # methods.
+    def app_helpers
+      @app_helpers ||= Class.new do
+        include Rails.application.routes.url_helpers
+        include ::ApplicationHelper
+      end.new
+    end
+
+    # Intercept calls to our containing application's helpers, and explain
+    # to our caller how to make them work.
+    def method_missing(name, *args, &block)
+      if app_helpers.respond_to?(name)
+        raise "Please call #{name} as app_helpers.#{name}"
+      else
+        super(name, *args, &block)
+      end
+    end
+
     protected
 
     # Choose a configuration for the Sanitizer gem.

data/app/views/layouts/rails_blog_engine/_blog_page.html.haml

@@ -0,0 +1,11 @@
+- content_for :head do
+  = auto_discovery_link_tag :atom, feed_url
+
+.rails_blog_engine
+  .rails_blog_engine_content
+    .rails_blog_engine_column
+      = content_for(:rails_blog_engine_content)
+  .rails_blog_engine_sidebar
+    .rails_blog_engine_column.rails_blog_engine_body
+      = render :partial => 'layouts/rails_blog_engine/sidebar'
+  .clearfix

data/app/views/layouts/rails_blog_engine/_sidebar.html.haml

@@ -0,0 +1,12 @@
+%h3 About ACME, Inc.
+
+%p
+  Edit <code>_sidebar.html.haml</code> to describe your company, your bio
+  or your blog.
+
+%h3 Recent Posts
+
+%ul
+  - RailsBlogEngine::Post.recently_published.limit(10).each do |post|
+    %li
+      = link_to(post.title, post_permalink_path(post))

data/app/views/rails_blog_engine/comments/_comment.html.haml

@@ -7,4 +7,5 @@
       said
       %a{:class => "comment-link", :href => "#comment-#{comment.id}"}= distance_of_time_in_words_to_now(comment.created_at)
       ago:
-  %div.body~ markdown(comment.body, :trusted? => comment.author_can_post?)
+  %div.rails_blog_engine_body
+    ~ markdown(comment.body, :trusted? => comment.author_can_post?)

data/app/views/rails_blog_engine/posts/_post.html.haml

@@ -9,7 +9,7 @@
     ago by
     = post.author_byline
 
-  %div.body~ markdown(post.body, :trusted? => true)
+  %div.rails_blog_engine_body~ markdown(post.body, :trusted? => true)
 
   - if current_page?(post_permalink_path(post))
     = render(:partial => 'rails_blog_engine/posts/comments_section',

data/app/views/rails_blog_engine/posts/edit.html.haml

@@ -1,5 +1,6 @@
 - content_for :title do
   Edit Post
-%h1 Edit Post
 
-= render :partial => 'form', :locals => { :post => @post }
+= blog_page do
+  %h1 Edit Post
+  = render :partial => 'form', :locals => { :post => @post }

data/app/views/rails_blog_engine/posts/index.atom.builder

@@ -1,4 +1,4 @@
-atom_feed(:root_url => root_url, :url => feed_url) do |feed|
+atom_feed(:root_url => blog_url, :url => feed_url) do |feed|
   feed.title t('rails_blog_engine.blog.title')
   feed.updated @posts.map(&:updated_at).sort.reverse.first
   @posts.each do |post|

data/app/views/rails_blog_engine/posts/index.html.haml

@@ -1,15 +1,17 @@
 - content_for :title do
   = t('rails_blog_engine.blog.title')
+
 - content_for :head do
-  = auto_discovery_link_tag :atom, feed_url
   - if params[:page]
     -# Don't index pages after the first, but still follow links.
     - content_for :head do
       %meta(name="robots" content="noindex, follow")
 
-.rails_blog_engine_posts
-  - if can?(:create, RailsBlogEngine::Post)
-    = link_to "New Post", new_post_path, :class => "new_post btn large primary"
+= blog_page do
+  .rails_blog_engine_posts
+    - if can?(:create, RailsBlogEngine::Post)
+      = link_to("New Post", new_post_path,
+                :class => "new_post btn large primary")
 
-  = render @posts
-  = paginate @posts
+    = render @posts
+    = paginate @posts

data/app/views/rails_blog_engine/posts/new.html.haml

@@ -1,5 +1,6 @@
 - content_for :title do
   New Post
-%h1 New Post
 
-= render :partial => 'form', :locals => { :post => @post }
+= blog_page do
+  %h1 New Post
+  = render :partial => 'form', :locals => { :post => @post }

data/app/views/rails_blog_engine/posts/show.html.haml

@@ -2,7 +2,6 @@
   = @post.title
   —
   = t('rails_blog_engine.blog.title')
-- content_for :head do
-  = auto_discovery_link_tag :atom, feed_url
 
-= render @post
+= blog_page do
+  = render @post

data/config/routes.rb

@@ -6,7 +6,7 @@ RailsBlogEngine::Engine.routes.draw do
   get 'page/:page' => 'posts#index', :constraints => { :page => /\d+/ }
 
   # Home page.
-  root :to => 'posts#index'
+  root :to => 'posts#index', :as => :blog
 
   # Public article pages.
   get(':year/:month/:day/:permalink' => 'posts#show',

data/lib/assets/stylesheets/rails_blog_engine/_config.css.scss

@@ -0,0 +1,8 @@
+// Configuration parameters for the rails_blog_engine stylesheets.  This file
+// should contain no CSS rules, only constants.
+
+// How big should a blank line between paragraphs be?
+$blank_line_height: 10px;
+
+// How wide should the padding be around a box?
+$box_padding: 10px;

data/lib/assets/stylesheets/rails_blog_engine/comments.css.scss

@@ -0,0 +1,33 @@
+@import "rails_blog_engine/config";
+
+.rails_blog_engine {
+
+  .rails_blog_engine_comment.show {
+    border: 1px solid lightgrey;
+    padding: $box_padding $box_padding
+             ($box_padding - $blank_line_height) $box_padding;
+    margin-bottom: $blank_line_height*2;
+
+    &.spam {
+      background: lighten(#ffb6c1, 10%);
+      border-color: lighten(#ffb6c1, 5%);
+      color: darkgrey;
+    }
+
+    >.byline {
+      margin-top: 0;
+      font-weight: normal;
+
+      a.comment-link {
+        color: inherit;
+        &:link, &:visited { text-decoration: none; }
+        &:hover, &:active { text-decoration: underline; }
+      }
+    }
+
+    >.comment-tools {
+      float: right;
+      margin: 0 0 $blank_line_height $blank_line_height;
+    }
+  }
+}

data/lib/assets/stylesheets/rails_blog_engine/customizations.css.scss

@@ -0,0 +1,5 @@
+@import "rails_blog_engine/config";
+
+// Use this file to customize the appearance of your blog.
+.rails_blog_engine {
+}

data/lib/assets/stylesheets/rails_blog_engine/layout.css.scss

@@ -0,0 +1,33 @@
+@import "rails_blog_engine/config";
+
+// The layout for our blog pages.
+.rails_blog_engine {
+  // Customize this element appropriately.  For example, if you want the
+  // blog to be 960 pixels wide and centered on the page, you could use:
+  //width: 960px;
+  //margin: 0 auto 0 auto;
+
+  // Set up a two-column model with 2/3rds of the space for the blog posts,
+  // and 1/3rd for the sidebar.  These defaults are designed to fit into a
+  // 960-pixel grid with 940 pixels of content, and to look reasonable
+  // elsewhere.  Tweak as needed.
+  .rails_blog_engine_content, .rails_blog_engine_sidebar { float: left; }
+  .rails_blog_engine_content { width: 66.67%; }
+  .rails_blog_engine_sidebar { width: 33.33%; }
+
+  // We put the column gutters in a separate element so that we can use
+  // percentage widths above without messing up the box model.  If your grid
+  // doesn't leave 10 pixels of padding around each column, repalace this
+  // with something more appropriate.
+  .rails_blog_engine_column { padding: 0 10px; }
+
+  // Make a container stretch to contain floating columns.
+  .clearfix { clear: both; }
+
+  // Formatting for post bodies, comment bodies, and sidebar content.  We
+  // eliminate the top margin, and use the bottom margin to space blocks.
+  blockquote, dl, embed, h1, h2, h3, h4, h5, h6, hr, object, ol,
+  p, pre, table, ul, aside, figure, header, hgroup, section {
+    margin: 0 0 $blank_line_height 0;
+  }
+}

data/lib/assets/stylesheets/rails_blog_engine/posts.css.scss

@@ -0,0 +1,37 @@
+@import "rails_blog_engine/config";
+
+// Place all the styles for posts and lists of posts here.  We assume a
+// light background color.
+.rails_blog_engine {
+
+  // Formatting for lists of posts.
+  .rails_blog_engine_posts {
+    .new_post.btn, nav {
+      margin-bottom: $blank_line_height*2;
+    }
+  }
+
+  // Formatting for individual posts, either standalone or in a list.
+  .rails_blog_engine_post {
+    color: black;
+    margin-bottom: $blank_line_height*2;
+
+    >h1 {
+      margin-bottom: 0;
+      .btn {
+        vertical-align: text-bottom;
+      }
+    }
+
+    >p.byline {
+      color: grey;
+    }
+
+    // We use this for moderation warnings.
+    >.flash.notice {
+      border: 1px solid #049cdb;
+      background: #c7eefe;
+      padding: $box_padding;
+    }
+  }
+}

data/{app/assets/stylesheets/rails_blog_engine → lib/assets/stylesheets/rails_blog_engine/ui}/bootstrap_extracts.css.scss

@@ -119,7 +119,7 @@ $baseline:          18px;
 	       opacity: $opacity / 100;
 }
 
-.rails_blog_engine_posts, .rails_blog_engine_post {
+.rails_blog_engine {
 
 // Base .btn styles
 .btn {

data/{app/assets/stylesheets/rails_blog_engine → lib/assets/stylesheets/rails_blog_engine/ui}/simple_form.css.scss

@@ -1,4 +1,4 @@
-.rails_blog_engine_post.simple_form, .rails_blog_engine_post .simple_form {
+.rails_blog_engine .simple_form {
 
 // Copied from
 // https://github.com/plataformatec/simple_form/wiki/CSS-for-simple_form,

data/lib/assets/stylesheets/rails_blog_engine.css

@@ -0,0 +1,12 @@
+/*
+ * Include the CSS files required by rails_blog_engine.
+ *
+ *= require rails_blog_engine/ui/bootstrap_extracts
+ *= require rails_blog_engine/ui/simple_form
+ *= require rails_blog_engine/filters/code
+ *
+ *= require rails_blog_engine/layout
+ *= require rails_blog_engine/posts
+ *= require rails_blog_engine/comments
+ *= require rails_blog_engine/customizations
+*/

data/lib/generators/rails_blog_engine/install/install_generator.rb

@@ -20,6 +20,16 @@ class RailsBlogEngine::InstallGenerator < Rails::Generators::Base
     copy_matching_files_from_gem('config/locales/rails_blog_engine.*.yml')
   end
 
+  def copy_sidebar
+    copy_matching_files_from_gem('app/views/layouts/rails_blog_engine/_sidebar.html.haml')
+  end
+
+  def copy_stylesheets
+    copy_matching_files_from_gem('lib/assets/stylesheets/rails_blog_engine/_config.css.scss')
+    copy_matching_files_from_gem('lib/assets/stylesheets/rails_blog_engine/layout.css.scss')
+    copy_matching_files_from_gem('lib/assets/stylesheets/rails_blog_engine/customizations.css.scss')
+  end
+
   def register_javascripts
     in_root do
       append_file("app/assets/javascripts/application.js",

data/lib/generators/rails_blog_engine/install/templates/rails_blog_engine.rb

@@ -1,5 +1,8 @@
 # Configure RailsBlogEngine here.
 
+# Which application layout should we use to render the blog?
+#Rails.application.config.rails_blog_engine.layout = 'application'
+
 # If you want to activate the built-in spam filter, visit http://akismet.com/
 # and sign up for an API key.
 Rails.application.config.rakismet.key = ENV['RAKISMET_KEY']

data/lib/rails_blog_engine/engine.rb

@@ -1,5 +1,20 @@
 module RailsBlogEngine
   class Engine < Rails::Engine
     isolate_namespace RailsBlogEngine
+
+    # Define some initialization parameters and their default values.
+    config.rails_blog_engine = ActiveSupport::OrderedOptions.new
+    config.rails_blog_engine.layout = 'application'
+
+    config.to_prepare do
+      ::ApplicationHelper.class_eval do
+        # Returns the current object.  This can be called from a layout or
+        # view used with rails_blog_engine to access the containing
+        # application's helpers.
+        def app_helpers
+          self
+        end
+      end
+    end
   end
 end

data/lib/rails_blog_engine/version.rb

@@ -1,3 +1,3 @@
 module RailsBlogEngine
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/rails_blog_engine.rb

@@ -15,6 +15,4 @@ require "rails_blog_engine/ability"
 require "rails_blog_engine/filters"
 
 module RailsBlogEngine
-  class Railtie < ::Rails::Railtie
-  end
 end

data/spec/acceptance/rails_blog_engine/posts_spec.rb

@@ -36,14 +36,16 @@ feature 'Posts', %q{
   end
 
   scenario 'Looking for posts on page 2' do
-    # Force our original post off the front page.
-    5.times { RailsBlogEngine::Post.make!(:published) }
+    # Force our original post off the front page (and off the recent posts
+    # list, too).
+    10.times { RailsBlogEngine::Post.make!(:published) }
 
     visit '/blog'
     page.should_not have_content("Test Post")
     click_on "Next"
+    click_on "Next"
     page.should have_content("Test Post")
-    current_path.should == '/blog/page/2'
+    current_path.should == '/blog/page/3'
   end
 
   scenario 'Adding a comment' do

data/spec/dummy/app/assets/stylesheets/layout.css.scss

@@ -0,0 +1,6 @@
+// Simulate a 960-pixel grid system, so that we have a realistic way to
+// test out application layout.
+.content {
+  width: 960px;
+  margin: 0 auto 0 auto;
+}

data/spec/dummy/app/views/layouts/application.html.erb

@@ -9,7 +9,9 @@
 </head>
 <body>
 
-<%= yield %>
+<div class="content">
+  <%= yield %>
+</div>
 
 </body>
 </html>

data/spec/dummy/config/initializers/rails_blog_engine.rb

@@ -1,5 +1,8 @@
 # Configure RailsBlogEngine here.
 
+# Which application layout should we use to render the blog?
+#Rails.application.config.rails_blog_engine.layout = 'application'
+
 # If you want to activate the built-in spam filter, visit http://akismet.com/
 # and sign up for an API key.
 Rails.application.config.rakismet.key = ENV['RAKISMET_KEY']

data/spec/lib/generators/rails_blog_engine/install_generator_spec.rb

@@ -53,6 +53,13 @@ EOD
             end
           end
         end
+        directory "views" do
+          directory "layouts" do
+            directory "rails_blog_engine" do
+              file "_sidebar.html.haml"
+            end
+          end
+        end
       end
       directory "config" do
         file "routes.rb" do
@@ -73,6 +80,17 @@ EOD
           file "20110913190319_add_fields_to_rails_blog_engine_post.rb"
         end
       end
+      directory "lib" do
+        directory "assets" do
+          directory "stylesheets" do
+            directory "rails_blog_engine" do
+              file "_config.css.scss"
+              file "layout.css.scss"
+              file "customizations.css.scss"
+            end
+          end
+        end
+      end
     }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_blog_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-27 00:00:00.000000000Z
+date: 2011-11-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &24056660 !ruby/object:Gem::Requirement
+  requirement: &18672980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *24056660
+  version_requirements: *18672980
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &24056140 !ruby/object:Gem::Requirement
+  requirement: &18672480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *24056140
+  version_requirements: *18672480
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &24055640 !ruby/object:Gem::Requirement
+  requirement: &18672020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *24055640
+  version_requirements: *18672020
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &24055120 !ruby/object:Gem::Requirement
+  requirement: &18671560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *24055120
+  version_requirements: *18671560
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &24054660 !ruby/object:Gem::Requirement
+  requirement: &18671100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *24054660
+  version_requirements: *18671100
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &24054180 !ruby/object:Gem::Requirement
+  requirement: &18670640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *24054180
+  version_requirements: *18670640
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &24043380 !ruby/object:Gem::Requirement
+  requirement: &18670180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *24043380
+  version_requirements: *18670180
 - !ruby/object:Gem::Dependency
   name: rakismet
-  requirement: &24042880 !ruby/object:Gem::Requirement
+  requirement: &18669720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *24042880
+  version_requirements: *18669720
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &24042360 !ruby/object:Gem::Requirement
+  requirement: &18669260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *24042360
+  version_requirements: *18669260
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &24041860 !ruby/object:Gem::Requirement
+  requirement: &18668800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *24041860
+  version_requirements: *18668800
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &24041360 !ruby/object:Gem::Requirement
+  requirement: &18668340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *24041360
+  version_requirements: *18668340
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &24040900 !ruby/object:Gem::Requirement
+  requirement: &18667880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *24040900
+  version_requirements: *18667880
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &24040500 !ruby/object:Gem::Requirement
+  requirement: &18667500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24040500
+  version_requirements: *18667500
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &24040020 !ruby/object:Gem::Requirement
+  requirement: &18667040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24040020
+  version_requirements: *18667040
 - !ruby/object:Gem::Dependency
   name: steak
-  requirement: &24039600 !ruby/object:Gem::Requirement
+  requirement: &18666620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24039600
+  version_requirements: *18666620
 - !ruby/object:Gem::Dependency
   name: foreman
-  requirement: &24039180 !ruby/object:Gem::Requirement
+  requirement: &18666200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24039180
+  version_requirements: *18666200
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &24038660 !ruby/object:Gem::Requirement
+  requirement: &18665700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *24038660
+  version_requirements: *18665700
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &24038240 !ruby/object:Gem::Requirement
+  requirement: &18687340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24038240
+  version_requirements: *18687340
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &24037740 !ruby/object:Gem::Requirement
+  requirement: &18686880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24037740
+  version_requirements: *18686880
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &24037240 !ruby/object:Gem::Requirement
+  requirement: &18686460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24037240
+  version_requirements: *18686460
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &24036660 !ruby/object:Gem::Requirement
+  requirement: &18685960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: 2.0.0.beta2
   type: :development
   prerelease: false
-  version_requirements: *24036660
+  version_requirements: *18685960
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &24036240 !ruby/object:Gem::Requirement
+  requirement: &18685540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24036240
+  version_requirements: *18685540
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &24035640 !ruby/object:Gem::Requirement
+  requirement: &18685080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,10 +263,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24035640
+  version_requirements: *18685080
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &24034260 !ruby/object:Gem::Requirement
+  requirement: &18684660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,10 +274,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24034260
+  version_requirements: *18684660
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &24033800 !ruby/object:Gem::Requirement
+  requirement: &18684240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -285,10 +285,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24033800
+  version_requirements: *18684240
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &24033360 !ruby/object:Gem::Requirement
+  requirement: &18683820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -296,7 +296,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24033360
+  version_requirements: *18683820
 description: Rails 3.1 drop-in blog engine for existing Rails applications
 email:
 - eric@kiddsoftware.com
@@ -320,12 +320,6 @@ files:
 - app/assets/javascripts/rails_blog_engine.js
 - app/assets/javascripts/rails_blog_engine/comments.js
 - app/assets/javascripts/rails_blog_engine/posts.js
-- app/assets/stylesheets/rails_blog_engine.css
-- app/assets/stylesheets/rails_blog_engine/bootstrap_extracts.css.scss
-- app/assets/stylesheets/rails_blog_engine/code.css.scss
-- app/assets/stylesheets/rails_blog_engine/comments.css.scss
-- app/assets/stylesheets/rails_blog_engine/posts.css.scss
-- app/assets/stylesheets/rails_blog_engine/simple_form.css.scss
 - app/controllers/rails_blog_engine/application_controller.rb
 - app/controllers/rails_blog_engine/comments_controller.rb
 - app/controllers/rails_blog_engine/posts_controller.rb
@@ -334,6 +328,8 @@ files:
 - app/helpers/rails_blog_engine/posts_helper.rb
 - app/models/rails_blog_engine/comment.rb
 - app/models/rails_blog_engine/post.rb
+- app/views/layouts/rails_blog_engine/_blog_page.html.haml
+- app/views/layouts/rails_blog_engine/_sidebar.html.haml
 - app/views/rails_blog_engine/comments/_comment.html.haml
 - app/views/rails_blog_engine/comments/_form.html.haml
 - app/views/rails_blog_engine/comments/_tools.html.haml
@@ -353,6 +349,15 @@ files:
 - db/migrate/20110912153527_create_rails_blog_engine_posts.rb
 - db/migrate/20110913190319_add_fields_to_rails_blog_engine_post.rb
 - db/migrate/20111125111958_create_rails_blog_engine_comments.rb
+- lib/assets/stylesheets/rails_blog_engine.css
+- lib/assets/stylesheets/rails_blog_engine/_config.css.scss
+- lib/assets/stylesheets/rails_blog_engine/comments.css.scss
+- lib/assets/stylesheets/rails_blog_engine/customizations.css.scss
+- lib/assets/stylesheets/rails_blog_engine/filters/code.css.scss
+- lib/assets/stylesheets/rails_blog_engine/layout.css.scss
+- lib/assets/stylesheets/rails_blog_engine/posts.css.scss
+- lib/assets/stylesheets/rails_blog_engine/ui/bootstrap_extracts.css.scss
+- lib/assets/stylesheets/rails_blog_engine/ui/simple_form.css.scss
 - lib/generators/rails_blog_engine/install/USAGE
 - lib/generators/rails_blog_engine/install/install_generator.rb
 - lib/generators/rails_blog_engine/install/templates/rails_blog_engine.rb
@@ -377,6 +382,7 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/stylesheets/layout.css.scss
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/home_controller.rb
 - spec/dummy/app/helpers/application_helper.rb

data/app/assets/stylesheets/rails_blog_engine/comments.css.scss

@@ -1,29 +0,0 @@
-.rails_blog_engine_comment.show {
-  border: 1px solid lightgrey;
-  padding: 10px 10px 0 10px;
-  margin-bottom: 20px;
-  max-width: 600px;
-
-  &.spam {
-    background: lighten(#ffb6c1, 10%);
-    border-color: lighten(#ffb6c1, 5%);
-    color: darkgrey;
-  }
-
-  >.byline {
-    margin-top: 0;
-    margin-bottom: 10px;
-    font-weight: normal;
-
-    a.comment-link {
-      color: inherit;
-      &:link, &:visited { text-decoration: none; }
-      &:hover, &:active { text-decoration: underline; }
-    }
-  }
-
-  >.comment-tools {
-    float: right;
-    margin: 0 0 10px 10px;
-  }
-}

data/app/assets/stylesheets/rails_blog_engine/posts.css.scss

@@ -1,46 +0,0 @@
-// Place all the styles for posts and lists of posts here.  We assume a
-// light background color.
-
-.rails_blog_engine_posts {
-  .new_post.btn, nav {
-    margin-bottom: 20px;
-  }
-}
-
-.rails_blog_engine_post {
-  color: black;
-  margin-bottom: 20px;
-
-  // Clear top margins. We'll use the bottom margin for spacing.
-  >h1, >p.byline, >.body {
-    margin-top: 0;
-  }
-
-  >h1 {
-    margin-bottom: 0px;
-    .btn {
-      vertical-align: text-bottom;
-    }
-  }
-
-  >p.byline {
-    margin-bottom: 10px;
-    color: grey;
-  }
-
-  // This works at both the top level and in nested comments.
-  .body {
-    >blockquote, >dl, >embed, >h1, >h2, >h3, >h4, >h5, >h6, >hr, >object, >ol,
-    >p, >pre, >table, >ul, >aside, >figure, >header, >hgroup, >section {
-      margin-bottom: 10px;
-    }
-  }
-
-  // We use this for moderation warnings.
-  >.flash.notice {
-    border: 1px solid #049cdb;
-    background: #c7eefe;
-    padding: 10px;
-    max-width: 600px;
-  }
-}

data/app/assets/stylesheets/rails_blog_engine.css

@@ -1,6 +0,0 @@
-/*
- * Include the CSS files required by rails_blog_engine.
- *
- *= require_self
- *= require_tree ./rails_blog_engine
-*/