jabe 0.5.9 → 0.6.0

data/{LICENSE.txt → MIT-LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Michael Moen
+Copyright 2012 YOURNAME
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.textile

@@ -2,51 +2,66 @@ h1. Just Another Blog Engine
 
 h3. What is this?
 
-Jabe is a bare bones blogging engine that is installed as a gem. It will grow as its needs do.
+JABE is a bare bones blogging engine that is installed as a gem. It will grow as its needs do.
 
-h2. Basic TODOs
-
-  * Comment notifications
+This version is for Rails 3.1+
 
 h2. Installing
 
 Edit your Gemfile and add the required gems
 
-<pre><code>gem 'devise'
-gem 'friendly_id', '3.1.8'
-gem 'formtastic', '>= 1.2.3.beta'
-gem 'gravtastic'
-gem 'haml', '>= 3.0.23'
-gem 'haml-rails'
-gem 'jabe'
-gem 'jquery-rails'
-gem 'RedCloth'
-gem 'sass', '>= 3.1.0.alpha.206'
-gem 'will_paginate', '>= 3.0.pre2'
+<pre><code>gem 'devise', '>= 2.0.0'
+gem 'friendly_id', '>= 4.0.0'
+gem 'haml-rails', '>= 0.3.4'
+gem 'kaminari', '>= 0.13.0'
+gem 'simple_form', '>= 1.5.2'
 </code></pre>
 
 From your rails root
 
 <pre><code>bundle install
-rails plugin install http://github.com/defunkt/acts_as_textiled.git
 rails g devise:install
-rails g jabe:migrations
+</code></pre>
+
+Follow Devise install directions.
+
+Edit your Gemfile and add JABE
+
+<pre><code>gem 'jabe'
+</code></pre>
+
+JABE is now mountable, so you can put it wherever you want. Edit routes.rb
+
+<pre><code>mount Jabe::Engine => "/jabe"
+</code></pre>
+
+From your rails root
+
+<pre><code>rake jabe:install:migrations
 rake db:migrate
-rm app/views/layouts/*
-rm public/index.html
-rails c
->> Admin.create!(:email => 'you@example.com', :password => 'password', :password_confirmation => 'password')
-rails s
-login
-edit settings
+
+rails runner "Jabe::Admin.create!(
+  :email => 'you@example.com',
+  :password => 'password',
+  :password_confirmation => 'password'
+)"
 </code></pre>
 
-h2. Deploying on Heroku
+h2. Upgrading from 0.5.*
+
+Create a new migration to handle the database changes.
+
+<pre><code>
+  def change
+    rename_table :settings, :jabe_settings
+    rename_table :admins, :jabe_admins
+    rename_table :entries, :jabe_entries
+    rename_table :comments, :jabe_comments
+    rename_column :jabe_entries, :cached_slug, :slug
+  end
+</code></pre>
 
-There are a couple changes you need to make to deploy on Heroku.
+h2. TODO
 
-  * In produciton.rb set <code>config.serve_static_assets = true</code>
-  * Add an initializer for Sass config/initializers/zz-sass.rb
-    <code>Sass::Plugin.options[:never_update] = true</code>
-  * Generate the stylesheets
-    <code>rails g jabe:stylesheets</code>
+* Migrate generators
+* Switch from boilerplate to Twitter Bootstrap?

data/Rakefile

@@ -1,57 +1,40 @@
-require 'rubygems'
-require 'bundler'
+#!/usr/bin/env rake
 begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "jabe"
-  gem.homepage = "http://github.com/pixels-and-bits/jabe"
-  gem.license = "MIT"
-  gem.summary = "Just Another Blog Engine"
-  gem.description = "Blog engine for Rails 3+"
-  gem.email = "michael@pixels-and-bits.com"
-  gem.authors = ['Michael Moen a.k.a. UnderpantsGnome', 'Neil Heinrich']
-  gem.files.exclude 'test/dummy'
-  gem.files.exclude 'spec'
-  gem.files.exclude 'features'
-  gem.test_files += Dir.glob('features/**/*')
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
 end
-Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Jabe'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
 
-task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "jabe #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
 end
+
+
+task :default => :test

data/{public/javascripts → app/assets/javascripts/jabe}/application.js

@@ -1,3 +1,18 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require_tree .
+//= require_tree ./libs
+
 $(function() {
   if($('#first-focus').length > 0) {
     $('#first-focus').focus();

data/app/assets/stylesheets/jabe/application.css

@@ -0,0 +1,3 @@
+/*
+ *= require_tree .
+*/

data/app/{stylesheets → assets/stylesheets/jabe}/jabe.scss

@@ -1,4 +1,3 @@
-@import "will_paginate";
 
 @mixin gradients {
   background-image: -webkit-gradient(
@@ -72,8 +71,8 @@ h1#site-tagline {
       }
     }
   }
-
 }
+
 .entry {
   margin: 0 0 30px 0;
   padding:0 0 30px 0;
@@ -101,6 +100,14 @@ h1#site-tagline {
       color:#eee;
     }
   }
+
+  .content {
+    p {
+      font-size:1.1em;
+      line-height:1.4em;
+      padding:.5em;
+    }
+  }
 }
 
 .last {
@@ -119,6 +126,11 @@ h1#site-tagline {
   .comment {
     clear:both;
 
+    .delete {
+      float:right;
+      padding-top:2px;
+    }
+
     .gravatar {
       margin:10px 10px 10px 0;
       float:left;
@@ -157,6 +169,15 @@ h1#site-tagline {
   }
 }
 
+code {
+  background-color: #222222;
+  color: #EEEEEE;
+  padding:2px 5px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+
 pre {
   color:#eee;
   background-color:#222;
@@ -165,6 +186,10 @@ pre {
   border-top:solid #777 2px;
   border-bottom:solid #777 2px;
   overflow-x:auto;
+
+  code {
+    padding:0 !important;
+  }
 }
 
 label {
@@ -180,7 +205,7 @@ label {
   color:red;
 }
 
-#comment_nickname_input {
+#comment_nickname, label[for=comment_nickname] {
   display:none;
 }
 
@@ -230,17 +255,18 @@ table.entries {
     font-size:1.1em;
     height:32px;
     line-height:32px;
-    padding:0 10px;
+    padding:0 10px 10px 0;
+
+    .when {
+      font-size:.8em;
+      line-height:1em;
+    }
   }
 
   td.icons {
     width:64px;
     white-space:nowrap;
   }
-
-  td.when {
-    text-align:right;
-  }
 }
 
 footer {
@@ -250,6 +276,19 @@ footer {
   clear:both;
 }
 
+.flash-notice, .flash-error {
+  color:green;
+  font-size:1.2em;
+  border:solid 3px green;
+  padding:15px;
+  margin-bottom:10px;
+}
+
+.flash-error {
+  color:red;
+  border-color:red;
+}
+
 form {
   label {
     padding-top:10px;

data/app/controllers/jabe/admin/base_controller.rb

@@ -0,0 +1,7 @@
+module Jabe
+  class Admin::BaseController < ApplicationController
+    layout 'jabe/application'
+    include PublicEntryUrl
+    before_filter :authenticate_admin!
+  end
+end

data/app/controllers/jabe/admin/entries_controller.rb

@@ -0,0 +1,49 @@
+module Jabe
+  class Admin::EntriesController < Admin::BaseController
+    helper_method :entry
+    before_filter :set_is_draft, :only => [:create, :update]
+
+    def index
+      @drafts  = Entry.drafts
+      @published = Entry.published.page(params[:page])
+    end
+
+    def create
+      if entry.save
+        redirect_to(admin_entries_path, :notice => message)
+      else
+        render :new
+      end
+    end
+
+    def update
+      if entry.update_attributes(params[:entry])
+        redirect_to(admin_entries_path, :notice => message)
+      else
+        render :edit
+      end
+    end
+
+    def destroy
+      entry.destroy
+      redirect_to admin_entries_path
+    end
+
+    private
+
+      def entry
+        @entry ||= params[:id].blank? ?
+          Entry.new(params[:entry]) :
+          Entry.find(params[:id])
+      end
+
+      def set_is_draft
+        params[:entry][:draft] = (params[:commit] =~ /draft/i).present?
+      end
+
+      def message
+        entry.draft ? "Entry was saved as a draft." : "Entry was published."
+      end
+
+  end
+end

data/app/controllers/jabe/admin/settings_controller.rb

@@ -0,0 +1,13 @@
+module Jabe
+  class Admin::SettingsController < Admin::BaseController
+
+    def update
+      if  Jabe::SETTINGS.update_attributes(params[:settings])
+         Jabe::SETTINGS.do_updates
+        redirect_to admin_root_path, :notice => 'Settings updated.'
+      else
+        render :edit
+      end
+    end
+  end
+end

data/app/controllers/jabe/application_controller.rb

@@ -0,0 +1,5 @@
+module Jabe
+  class ApplicationController < ActionController::Base
+    include PublicEntryUrl
+  end
+end

data/app/controllers/jabe/comments_controller.rb

@@ -0,0 +1,34 @@
+module Jabe
+  class CommentsController < Admin::BaseController
+    layout 'application'
+    skip_before_filter :authenticate_admin!, :only => [ :create, :new ]
+    helper_method :entry, :comment
+
+    def create
+      if comment.save
+        comment.send_notification(request)
+        redirect_to entry_path(entry), :notice => 'Your comment was submitted.'
+      else
+        flash[:error] = 'Unable to submit your comment.'
+        render 'entries/show'
+      end
+    end
+
+    def destroy
+      comment.destroy
+      redirect_to entry_path(entry), :notice => 'Comment was deleted.'
+    end
+
+    private
+
+      def entry
+        @entry ||= Entry.find(params[:entry_id])
+      end
+
+      def comment
+        @comment ||= params[:id].blank? ?
+          entry.comments.new(params[:comment]) :
+          Comment.find(params[:id])
+      end
+  end
+end