jabe 0.5.6 → 0.5.7

data/Gemfile

@@ -27,6 +27,7 @@ group :development, :test do
   gem 'redgreen'
   gem 'rspec-rails', '2.0.1'
   gem 'ruby-debug'
+  gem 'mysql'
   gem 'sqlite3-ruby'
   gem 'wirble'
 end

data/Gemfile.lock

@@ -107,6 +107,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    mysql (2.8.1)
     nokogiri (1.4.4)
     pickle (0.4.4)
       cucumber (>= 0.8)
@@ -195,6 +196,7 @@ DEPENDENCIES
   jquery-rails
   launchy
   machinist (>= 2.0.0.beta2)
+  mysql
   pickle
   rails (~> 3.0.3)
   rcov

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/app/controllers/admin/settings_controller.rb

@@ -2,7 +2,7 @@ class Admin::SettingsController < Admin::BaseController
 
   def update
     if SETTINGS.update_attributes(params[:settings])
-      Time.zone = SETTINGS.time_zone
+      SETTINGS.do_updates
       redirect_to admin_root_path, :notice => 'Settings updated'
     else
       render :edit

data/app/helpers/jabe_helper.rb

@@ -1,9 +1,9 @@
 module JabeHelper
   def public_entry_path(entry)
-    "/#{entry.published_at.to_s(:url_part)}/#{entry.to_param}"
+    "/#{entry.published_at.in_time_zone.to_s(:url_part)}/#{entry.to_param}"
   end
 
   def public_entry_url(entry)
-    "#{SETTINGS.site_url}/#{public_entry_url(entry)}"
+    "#{SETTINGS.site_url}#{public_entry_path(entry)}"
   end
 end

data/app/models/settings.rb

@@ -1,2 +1,7 @@
 class Settings < ActiveRecord::Base
+
+  def do_updates
+    Time.zone = self.time_zone
+    ActionMailer::Base.default_url_options[:host] = self.site_url
+  end
 end

data/app/stylesheets/jabe.scss

@@ -15,11 +15,10 @@
   );
 }
 
-.grid_1, .grid_2, .grid_3, .grid_4, .grid_5, .grid_6, .grid_7, .grid_8, .grid_9, .grid_10, .grid_11, .grid_12 {
+#container {
+  width:768px;
+  margin:auto;
   background-color:#eee;
-}
-
-.grid_12 {
   border-left:solid #222 1px;
   border-right:solid #222 1px;
 }
@@ -46,11 +45,38 @@ h1#site-tagline {
 }
 
 #main {
-  padding-top:20px
+  padding:20px;
+}
+
+#content {
+  padding-right:10px;
+  float:left;
+  width:70%;
 }
 
+#sidebar {
+  padding-left:10px;
+  float:right;
+  width:27%;
+
+  .link {
+    padding:2px 10px;
+  }
+
+  #github-badge {
+    margin-top:20px;
+
+    .header {
+      .title {
+        display:none;
+      }
+    }
+  }
+
+}
 .entry {
-  padding:20px 0;
+  margin: 0 0 30px 0;
+  padding:0 0 30px 0;
   border-bottom:solid 1px #333;
 
   .title {
@@ -110,19 +136,6 @@ h1#site-tagline {
   }
 }
 
-
-.button {
-  @include gradients;
-  color:#eee;
-  height:30px;
-  -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  border-radius: 5px;
-  border:solid 1px #333;
-  padding: 0 10px !important;
-  overflow: visible;
-}
-
 pre {
   color:#eee;
   background-color:#222;
@@ -209,6 +222,7 @@ footer {
   height:64px;
   line-height:64px;
   text-align:center;
+  clear:both;
 }
 
 form {
@@ -224,10 +238,19 @@ form {
 
   input[type=submit] {
     margin:10px 10px 10px auto !important;
+    @include gradients;
+    color:#eee;
+    height:30px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    border:solid 1px #333;
+    padding: 0 10px !important;
+    overflow: visible;
   }
 
   input[type=text], input[type=url], input[type=email], input[type=password] {
-    width:50%;
+    width:80%;
     padding:5px !important;
     font-size:1.5em !important;
   }

data/app/views/admin/entries/_form.html.haml

@@ -2,5 +2,5 @@
   = form.input :title
   = form.input :body
   = form.input :published_at if entry.published_at
-  = form.submit 'Save as draft', :class => 'button'
-  = form.submit 'Publish', :class => 'button'
+  = form.submit 'Save as draft'
+  = form.submit 'Publish'

data/app/views/admin/settings/edit.html.haml

@@ -1,9 +1,14 @@
 %h2 Site Settings
 = semantic_form_for SETTINGS, :url => admin_settings_path do |form|
-  = form.input :site_url
+  = form.input :host_name, :label => 'Domain and port', :hint => '(e.g. pixels-and-bits.com or localhost:3000)'
   = form.input :site_name
   = form.input :tagline
   = form.input :time_zone, :label => 'Your local time zone'
   = form.input :entries_per_page, :label => 'Entries on the home page'
-  
-  = form.submit 'Save', :class => 'button'
+  = form.input :sidebar_heading
+  = form.input :github_username
+  = form.input :show_github_badge
+  = form.input :twitter_username
+  = form.input :facebook_url
+
+  = form.submit 'Save'

data/app/views/entries/index.html.haml

@@ -1,4 +1,4 @@
-#entries.grid_8
+#entries
   - @entries.each do |entry|
     .entry{ :class => entry == @entries.last ? 'last' : '' }
       .title
@@ -8,6 +8,6 @@
       .content
         ~ entry.body.html_safe
       .meta
-        = link_to "Comments: #{entry.comments.count}", entry_path(entry, :anchor => 'comments')
+        = link_to "Comments: #{entry.comments.count}", public_entry_path(entry) + '#comments'
   #pagination.apple_pagination
     = will_paginate @entries

data/app/views/entries/show.html.haml

@@ -33,4 +33,4 @@
           = form.input :email, :label => 'Email (not shown to the public)'
           = form.input :url, :label => 'Website'
           = form.input :body, :label => 'Comment'
-          = form.submit 'Add comment', :class => 'button'
+          = form.submit 'Add comment'

data/app/views/feed/index.xml.builder

@@ -4,7 +4,7 @@ atom_feed do |feed|
   feed.updated @entries.first.try(:published_at)
 
   @entries.each do |post|
-    feed.entry(post) do |entry|
+    feed.entry(post, :url => public_entry_url(post)) do |entry|
       entry.title h post.title
       entry.content post.body, :type => 'html'
 

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

@@ -0,0 +1,21 @@
+%h2
+  = SETTINGS.sidebar_heading
+
+- if SETTINGS.github_username
+  .link
+    = link_to 'Github', SETTINGS.github_username
+
+- if SETTINGS.twitter_username
+  .link
+    = link_to 'Twitter', SETTINGS.twitter_username
+
+- if SETTINGS.facebook_url
+  .link
+    = link_to 'Facebook', SETTINGS.facebook_url
+
+- if SETTINGS.show_github_badge
+  #github-badge
+
+  :javascript
+    GITHUB_USERNAME="#{SETTINGS.github_username}";
+  = javascript_include_tag 'http://drnicjavascript.rubyforge.org/github_badge/dist/github-badge-launcher.js'

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

@@ -16,24 +16,24 @@
     %link{:href => "/favicon.ico", :rel => "shortcut icon"}/
     %link{:href => "/apple-touch-icon.png", :rel => "apple-touch-icon"}/
     = auto_discovery_link_tag :atom, feed_path
-    = stylesheet_link_tag 'grid', 'boilerplate', 'jabe', 'application'
+    = stylesheet_link_tag 'boilerplate', 'jabe', 'application'
     = javascript_include_tag 'libs/modernizr-1.6.min.js'
   %body
-    #container.container_12
-      %header.grid_12
+    #container
+      %header
         = render 'layouts/header'
       - if admin_signed_in?
-        %nav.grid_12.nav.admin
+        %nav.nav.admin
           %ul
             %li= link_to 'Entries', admin_entries_path
             %li= link_to 'Settings', edit_admin_settings_path
             %li= link_to 'Logout', destroy_admin_session_path
-      #main.grid_12
-        #content.grid_9
+      #main
+        #content
           = yield
-        #sidebar.grid_2
+        #sidebar
           = render 'layouts/sidebar'
-      %footer.grid_12
+      %footer
         = render 'layouts/footer'
     %script{:src => "//ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.js"}
     :javascript

data/config/initializers/settings.rb

@@ -1,5 +1,5 @@
 begin
   SETTINGS = Settings.first || Settings.create
-  Time.zone = SETTINGS.time_zone
+  SETTINGS.do_updates
 rescue ActiveRecord::StatementInvalid
 end

data/config/initializers/time_formats.rb

@@ -1,4 +1,4 @@
 Time::DATE_FORMATS[:url_part] = lambda { |time| 
   month = time.strftime('%m').gsub(/^0/, '')
-  time.strftime("%Y/#{month}/%e")
+  time.strftime("%Y/#{month}/%e").gsub(/\s+/, '')
 }

data/lib/generators/jabe/migrations/migrations_generator.rb

@@ -15,6 +15,7 @@ module Jabe
           devise_create_admins.rb
           create_entries.rb
           create_comments.rb
+          add_new_settings.rb
         ).reject { |file|
           existing_migrations.any? { |migration|
             match = migration.match(/#{file}$/)

data/lib/generators/jabe/stylesheets/stylesheets_generator.rb

@@ -1,7 +1,7 @@
 module Jabe
   module Generators
     class StylesheetsGenerator < Rails::Generators::Base
-      %w( grid boilerplate handheld jabe ).each do |sheet|
+      %w( boilerplate handheld jabe ).each do |sheet|
         system("bundle exec sass #{Jabe::Engine.root}/app/stylesheets/#{sheet}.scss public/stylesheets/#{sheet}.css")
       end
     end

data/lib/generators/jabe/templates/migrations/add_new_settings.rb

@@ -0,0 +1,17 @@
+class AddNewSettings < ActiveRecord::Migration
+  def self.up
+    add_column :settings, :sidebar_heading, :string
+    add_column :settings, :github_username, :string
+    add_column :settings, :twitter_username, :string
+    add_column :settings, :show_github_badge, :boolean
+    add_column :settings, :facebook_url, :string
+  end
+
+  def self.down
+    remove_column :settings, :sidebar_heading
+    remove_column :settings, :facebook_url
+    remove_column :settings, :show_github_badge
+    remove_column :settings, :twitter_username
+    remove_column :settings, :github_username
+  end
+end

data/lib/jabe.rb

@@ -8,7 +8,7 @@ module Jabe
 
     initializer "static assets" do |app|
       if app.config.serve_static_assets
-        app.middleware.insert 0, ::ActionDispatch::Static, "#{root}/public"
+        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
       end
     end
 

data/test/dummy/db/migrate/20110104004400_add_new_settings.rb

@@ -0,0 +1,17 @@
+class AddNewSettings < ActiveRecord::Migration
+  def self.up
+    add_column :settings, :sidebar_heading, :string
+    add_column :settings, :github_username, :string
+    add_column :settings, :twitter_username, :string
+    add_column :settings, :show_github_badge, :boolean
+    add_column :settings, :facebook_url, :string
+  end
+
+  def self.down
+    # remove_column :settings, :sidebar_heading
+    remove_column :settings, :facebook_url
+    remove_column :settings, :show_github_badge
+    remove_column :settings, :twitter_username
+    remove_column :settings, :github_username
+  end
+end

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20101229224031) do
+ActiveRecord::Schema.define(:version => 20110104004400) do
 
   create_table "admins", :force => true do |t|
     t.string   "email",                               :default => "", :null => false
@@ -31,26 +31,49 @@ ActiveRecord::Schema.define(:version => 20101229224031) do
   add_index "admins", ["email"], :name => "index_admins_on_email", :unique => true
   add_index "admins", ["reset_password_token"], :name => "index_admins_on_reset_password_token", :unique => true
 
+  create_table "authors", :force => true do |t|
+    t.string   "email",                               :default => "", :null => false
+    t.string   "encrypted_password",   :limit => 128, :default => "", :null => false
+    t.string   "password_salt",                       :default => "", :null => false
+    t.string   "reset_password_token"
+    t.string   "remember_token"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",                       :default => 0
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.integer  "failed_attempts",                     :default => 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "authors", ["email"], :name => "index_authors_on_email", :unique => true
+  add_index "authors", ["reset_password_token"], :name => "index_authors_on_reset_password_token", :unique => true
+  add_index "authors", ["unlock_token"], :name => "index_authors_on_unlock_token", :unique => true
+
   create_table "comments", :force => true do |t|
     t.integer  "entry_id"
     t.string   "name"
     t.string   "email"
-    t.string   "url"
     t.text     "body"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "url"
   end
 
   add_index "comments", ["entry_id"], :name => "index_comments_on_entry_id"
 
   create_table "entries", :force => true do |t|
-    t.string   "cached_slug"
     t.string   "title"
     t.text     "body"
     t.boolean  "draft"
     t.datetime "published_at"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "cached_slug"
   end
 
   create_table "settings", :force => true do |t|
@@ -59,12 +82,17 @@ ActiveRecord::Schema.define(:version => 20101229224031) do
     t.string   "mail_from"
     t.string   "site_name"
     t.string   "tagline"
-    t.string   "time_zone"
     t.string   "google_tracker_id"
     t.boolean  "blackbird_enabled"
-    t.integer  "entries_per_page"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "entries_per_page"
+    t.string   "time_zone"
+    t.string   "sidebar_heading"
+    t.string   "github_username"
+    t.string   "twitter_username"
+    t.boolean  "show_github_badge"
+    t.string   "facebook_url"
   end
 
   create_table "slugs", :force => true do |t|

data/test/dummy/features/support/blueprints.rb

@@ -13,7 +13,8 @@ Admin.blueprint do
 end
 
 Settings.blueprint do
-  # Attributes here
+  site_name { 'JABE' }
+  site_url { 'http://example.com' }
 end
 
 Entry.blueprint do
@@ -30,3 +31,5 @@ end
 Comment.blueprint do
   # Attributes here
 end
+
+Settings.make!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jabe
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Michael Moen a.k.a. UnderpantsGnome
@@ -16,13 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 -06:00
+date: 2011-01-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: devise
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +30,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: devise
   type: :runtime
-  name: friendly_id
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,10 +46,10 @@ dependencies:
         - 8
         version: 3.1.8
   requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: friendly_id
   type: :runtime
-  name: formtastic
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,10 +63,10 @@ dependencies:
         - beta
         version: 1.2.3.beta
   requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: formtastic
   type: :runtime
-  name: haml
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -82,10 +79,10 @@ dependencies:
         - 23
         version: 3.0.23
   requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: haml
   type: :runtime
-  name: haml-rails
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,10 +93,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: haml-rails
   type: :runtime
-  name: jquery-rails
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,10 +107,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: jquery-rails
   type: :runtime
-  name: RedCloth
+- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -124,10 +121,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: RedCloth
   type: :runtime
-  name: sass
+- !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,26 +139,27 @@ dependencies:
         - 206
         version: 3.1.0.alpha.206
   requirement: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: sass
   type: :runtime
-  name: will_paginate
+- !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1876988247
+        hash: 1923831917
         segments: 
         - 3
         - 0
-        - pre2
+        - pre
+        - 2
         version: 3.0.pre2
   requirement: *id009
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  name: rails
+  name: will_paginate
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,10 +172,10 @@ dependencies:
         - 3
         version: 3.0.3
   requirement: *id010
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: rails
   type: :development
-  name: autotest
+- !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -188,10 +186,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id011
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: autotest
   type: :development
-  name: autotest-fsevent
+- !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -202,10 +200,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id012
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: autotest-fsevent
   type: :development
-  name: autotest-growl
+- !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -216,10 +214,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id013
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: autotest-growl
   type: :development
-  name: capybara
+- !ruby/object:Gem::Dependency 
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -230,10 +228,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id014
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: capybara
   type: :development
-  name: cucumber
+- !ruby/object:Gem::Dependency 
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -244,10 +242,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id015
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: cucumber
   type: :development
-  name: cucumber-rails
+- !ruby/object:Gem::Dependency 
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -258,10 +256,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id016
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: cucumber-rails
   type: :development
-  name: database_cleaner
+- !ruby/object:Gem::Dependency 
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -274,10 +272,10 @@ dependencies:
         - 0
         version: 0.6.0
   requirement: *id017
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: database_cleaner
   type: :development
-  name: jeweler
+- !ruby/object:Gem::Dependency 
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -288,10 +286,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id018
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: jeweler
   type: :development
-  name: launchy
+- !ruby/object:Gem::Dependency 
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -302,27 +300,28 @@ dependencies:
         - 0
         version: "0"
   requirement: *id019
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: launchy
   type: :development
-  name: machinist
+- !ruby/object:Gem::Dependency 
   version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230038
+        hash: 62196455
         segments: 
         - 2
         - 0
         - 0
-        - beta2
+        - beta
+        - 2
         version: 2.0.0.beta2
   requirement: *id020
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: machinist
   type: :development
-  name: pickle
+- !ruby/object:Gem::Dependency 
   version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -333,10 +332,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id021
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: pickle
   type: :development
-  name: rcov
+- !ruby/object:Gem::Dependency 
   version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -347,10 +346,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id022
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: rcov
   type: :development
-  name: redgreen
+- !ruby/object:Gem::Dependency 
   version_requirements: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -361,10 +360,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id023
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: redgreen
   type: :development
-  name: rspec-rails
+- !ruby/object:Gem::Dependency 
   version_requirements: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -377,10 +376,10 @@ dependencies:
         - 1
         version: 2.0.1
   requirement: *id024
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: rspec-rails
   type: :development
-  name: ruby-debug
+- !ruby/object:Gem::Dependency 
   version_requirements: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -391,10 +390,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id025
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: ruby-debug
   type: :development
-  name: sqlite3-ruby
+- !ruby/object:Gem::Dependency 
   version_requirements: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -405,10 +404,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id026
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: mysql
   type: :development
-  name: wirble
+- !ruby/object:Gem::Dependency 
   version_requirements: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -419,6 +418,23 @@ dependencies:
         - 0
         version: "0"
   requirement: *id027
+  prerelease: false
+  name: sqlite3-ruby
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id028 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id028
+  prerelease: false
+  name: wirble
+  type: :development
 description: Blog engine for Rails 3+
 email: michael@pixels-and-bits.com
 executables: []
@@ -448,7 +464,6 @@ files:
 - app/models/settings.rb
 - app/stylesheets/_will_paginate.scss
 - app/stylesheets/boilerplate.scss
-- app/stylesheets/grid.scss
 - app/stylesheets/handheld.scss
 - app/stylesheets/jabe.scss
 - app/views/admin/entries/_form.html.haml
@@ -471,6 +486,7 @@ files:
 - config/routes.rb
 - lib/generators/jabe/migrations/migrations_generator.rb
 - lib/generators/jabe/stylesheets/stylesheets_generator.rb
+- lib/generators/jabe/templates/migrations/add_new_settings.rb
 - lib/generators/jabe/templates/migrations/create_comments.rb
 - lib/generators/jabe/templates/migrations/create_entries.rb
 - lib/generators/jabe/templates/migrations/create_settings.rb
@@ -500,7 +516,6 @@ files:
 - public/javascripts/rails.js
 - public/nginx.conf
 - public/robots.txt
-- spec/support/blueprints.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/config/application.rb
@@ -521,6 +536,7 @@ files:
 - test/dummy/db/migrate/20101229224029_devise_create_admins.rb
 - test/dummy/db/migrate/20101229224030_create_entries.rb
 - test/dummy/db/migrate/20101229224031_create_comments.rb
+- test/dummy/db/migrate/20110104004400_add_new_settings.rb
 - test/dummy/db/schema.rb
 - test/dummy/features/step_definitions/admin_steps.rb
 - test/dummy/features/step_definitions/entry_steps.rb
@@ -567,12 +583,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.0
 signing_key: 
 specification_version: 3
 summary: Just Another Blog Engine
 test_files: 
-- spec/support/blueprints.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/config/application.rb
@@ -593,6 +608,7 @@ test_files:
 - test/dummy/db/migrate/20101229224029_devise_create_admins.rb
 - test/dummy/db/migrate/20101229224030_create_entries.rb
 - test/dummy/db/migrate/20101229224031_create_comments.rb
+- test/dummy/db/migrate/20110104004400_add_new_settings.rb
 - test/dummy/db/schema.rb
 - test/dummy/features/step_definitions/admin_steps.rb
 - test/dummy/features/step_definitions/entry_steps.rb

data/app/stylesheets/grid.scss

@@ -1,336 +0,0 @@
-/* Containers
-----------------------------------------------------------------------------------------------------*/
-.container_12 {
-	margin-left: auto;
-	margin-right: auto;
-	width: 768px;
-	
-	
-}
-
-/* Grid >> Children (Alpha ~ First, Omega ~ Last)
-----------------------------------------------------------------------------------------------------*/
-
-.alpha {
-	margin-left: 0 !important;
-}
-
-.omega {
-	margin-right: 0 !important;
-}
-
-
-
-/* Grid >> Global
-----------------------------------------------------------------------------------------------------*/
- 
-.grid_1, 
-.grid_2, 
-.grid_3, 
-.grid_4, 
-.grid_5, 
-.grid_6, 
-.grid_7, 
-.grid_8, 
-.grid_9, 
-.grid_10, 
-.grid_11,
-.grid_12{
-	display:inline;
-	float: left;
-	position: relative;
-	margin-left: 10.0px;
-	margin-right: 10.0px;
-}
-
-
-/* Grid >> 2 Columns
-----------------------------------------------------------------------------------------------------*/
-
-.container_12 .grid_1{
-	width:44px;
-}
-
-.container_12 .grid_2{
-	width:108px;
-}
-
-.container_12 .grid_3{
-	width:172px;
-}
-
-.container_12 .grid_4{
-	width:236px;
-}
-
-.container_12 .grid_5{
-	width:300px;
-}
-
-.container_12 .grid_6{
-	width:364px;
-}
-
-.container_12 .grid_7{
-	width:428px;
-}
-
-.container_12 .grid_8{
-	width:492px;
-}
-
-.container_12 .grid_9{
-	width:556px;
-}
-
-.container_12 .grid_10{
-	width:620px;
-}
-
-.container_12 .grid_11{
-	width:684px;
-}
-
-.container_12 .grid_12{
-	width:748px;
-}
-
-
-
-
-
-/* Prefix Extra Space >> 2 Columns
-----------------------------------------------------------------------------------------------------*/
-
-    .container_12 .prefix_1 {
-	padding-left:64px;
-}
-
-    .container_12 .prefix_2 {
-	padding-left:128px;
-}
-
-    .container_12 .prefix_3 {
-	padding-left:192px;
-}
-
-    .container_12 .prefix_4 {
-	padding-left:256px;
-}
-
-    .container_12 .prefix_5 {
-	padding-left:320px;
-}
-
-    .container_12 .prefix_6 {
-	padding-left:384px;
-}
-
-    .container_12 .prefix_7 {
-	padding-left:448px;
-}
-
-    .container_12 .prefix_8 {
-	padding-left:512px;
-}
-
-    .container_12 .prefix_9 {
-	padding-left:576px;
-}
-
-    .container_12 .prefix_10 {
-	padding-left:640px;
-}
-
-    .container_12 .prefix_11 {
-	padding-left:704px;
-}
-
-
-
-/* Suffix Extra Space >> 2 Columns
-----------------------------------------------------------------------------------------------------*/
-
-    .container_12 .suffix_1 {
-	padding-right:64px;
-}
-
-    .container_12 .suffix_2 {
-	padding-right:128px;
-}
-
-    .container_12 .suffix_3 {
-	padding-right:192px;
-}
-
-    .container_12 .suffix_4 {
-	padding-right:256px;
-}
-
-    .container_12 .suffix_5 {
-	padding-right:320px;
-}
-
-    .container_12 .suffix_6 {
-	padding-right:384px;
-}
-
-    .container_12 .suffix_7 {
-	padding-right:448px;
-}
-
-    .container_12 .suffix_8 {
-	padding-right:512px;
-}
-
-    .container_12 .suffix_9 {
-	padding-right:576px;
-}
-
-    .container_12 .suffix_10 {
-	padding-right:640px;
-}
-
-    .container_12 .suffix_11 {
-	padding-right:704px;
-}
-
-
-
-/* Push Space >> 2 Columns
-----------------------------------------------------------------------------------------------------*/
-
-    .container_12 .push_1 {
-	left:64px;
-}
-
-    .container_12 .push_2 {
-	left:128px;
-}
-
-    .container_12 .push_3 {
-	left:192px;
-}
-
-    .container_12 .push_4 {
-	left:256px;
-}
-
-    .container_12 .push_5 {
-	left:320px;
-}
-
-    .container_12 .push_6 {
-	left:384px;
-}
-
-    .container_12 .push_7 {
-	left:448px;
-}
-
-    .container_12 .push_8 {
-	left:512px;
-}
-
-    .container_12 .push_9 {
-	left:576px;
-}
-
-    .container_12 .push_10 {
-	left:640px;
-}
-
-    .container_12 .push_11 {
-	left:704px;
-}
-
-
-
-
-
-/* Pull Space >> 2 Columns
-----------------------------------------------------------------------------------------------------*/
-
-    .container_12 .pull_1 {
-	right:64px;
-}
-
-    .container_12 .pull_2 {
-	right:128px;
-}
-
-    .container_12 .pull_3 {
-	right:192px;
-}
-
-    .container_12 .pull_4 {
-	right:256px;
-}
-
-    .container_12 .pull_5 {
-	right:320px;
-}
-
-    .container_12 .pull_6 {
-	right:384px;
-}
-
-    .container_12 .pull_7 {
-	right:448px;
-}
-
-    .container_12 .pull_8 {
-	right:512px;
-}
-
-    .container_12 .pull_9 {
-	right:576px;
-}
-
-    .container_12 .pull_10 {
-	right:640px;
-}
-
-    .container_12 .pull_11 {
-	right:704px;
-}
-
-
-
-
-/* Clear Floated Elements
-----------------------------------------------------------------------------------------------------*/
-
-
-.clear {
-	clear: both;
-	display: block;
-	overflow: hidden;
-	visibility: hidden;
-	width: 0;
-	height: 0;
-}
-
-
-.clearfix:after {
-	clear: both;
-	content: ' ';
-	display: block;
-	font-size: 0;
-	line-height: 0;
-	visibility: hidden;
-	width: 0;
-	height: 0;
-}
-
-.clearfix {
-	display: inline-block;
-}
-
-* html .clearfix {
-	height: 1%;
-}
-
-.clearfix {
-	display: block;
-}

data/spec/support/blueprints.rb

@@ -1,31 +0,0 @@
-require 'machinist/active_record'
-
-# takes care of
-# Validation failed: Email has already been taken (ActiveRecord::RecordInvalid)
-Machinist.configure do |config|
-  config.cache_objects = false
-end
-
-Admin.blueprint do
-  email { 'admin@example.com' }
-  password { 'password' }
-  password_confirmation { 'password' }
-end
-
-Settings.blueprint do
-  # Attributes here
-end
-
-Entry.blueprint do
-  title { Faker::Lorem.words.to_s }
-  body { Faker::Lorem.paragraph }
-  published_at { Time.now }
-end
-
-Entry.blueprint(:published) do
-  draft { false }
-end
-
-Comment.blueprint do
-  # Attributes here
-end