jabe 0.8.0 → 0.9.0

data/README.textile

@@ -1,5 +1,9 @@
 h1. Just Another Blog Engine
 
+h2. Status
+
+"!https://codeclimate.com/badge.png!":https://codeclimate.com/github/pixels-and-bits/jabe
+
 h3. What is this?
 
 JABE is a bare bones blogging engine that is installed as a gem. It will grow as its needs do.
@@ -13,6 +17,7 @@ Edit your Gemfile and add the required gems
 <pre><code>gem 'devise', '>= 2.0.0'
 gem 'friendly_id', '>= 4.0.0'
 gem 'kaminari', '>= 0.13.0'
+gem 'sanitize', '>= 2.0.0'
 </code></pre>
 
 From your rails root
@@ -62,4 +67,6 @@ Create a new migration to handle the database changes.
 h2. TODO
 
 * Migrate generators
-* Switch from boilerplate to Twitter Bootstrap?
+* Integrate Akismet
+* Add a comment moderation queue?
+

data/Rakefile

@@ -27,5 +27,9 @@ Bundler::GemHelper.install_tasks
 
 task :default do
   # NOTE: There has to be a better way to do this
-  exit system("bundle exec cucumber features")
+  Dir.chdir('test/dummy') do
+    FileUtils.rm(%w(db/dev.sqlite3)) rescue Errno::ENOENT
+    FileUtils.rm(%w(db/test.sqlite3)) rescue Errno::ENOENT
+    exit system("bundle exec rake db:migrate db:test:prepare && bundle exec cucumber features")
+  end
 end

data/app/assets/javascripts/jabe/application.js

@@ -9,6 +9,19 @@ $(function() {
   }
 
   $('.dropdown-toggle').dropdown()
+
+  $('.comment_delete').click(function() {
+    var elem = $(this)
+    if (confirm(elem.data('confirm'))) {
+      $.ajax({
+        url: elem.attr('href'),
+        type: 'DELETE'
+      }).success(function() {
+        elem.closest('.comment').fadeOut()
+      })
+    }
+    return false
+  })
 });
 
 var JABE = function() {

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

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

data/app/controllers/jabe/comments_controller.rb

@@ -1,13 +1,17 @@
 module Jabe
   class CommentsController < Admin::BaseController
+    include PublicEntryUrl
+
     layout 'application'
     skip_before_filter :authenticate_admin!, :only => [ :create, :new ]
     helper_method :entry, :comment
 
     def create
+      comment.request = request
+      comment.permalink = public_entry_url(entry)
+
       if comment.save
-        comment.send_notification(request)
-        redirect_to entry_path(entry), :notice => 'Your comment was submitted.'
+        redirect_to public_entry_url(entry), :notice => 'Your comment was submitted.'
       else
         flash[:error] = 'Unable to submit your comment.'
         render 'entries/show'
@@ -16,7 +20,12 @@ module Jabe
 
     def destroy
       comment.destroy
-      redirect_to entry_path(entry), :notice => 'Comment was deleted.'
+
+      if request.xhr?
+        render :nothing => true
+      else
+        redirect_to entry_path(entry), :notice => 'Comment was deleted.'
+      end
     end
 
     private

data/app/mailers/jabe/comment_mailer.rb

@@ -1,13 +1,13 @@
 module Jabe
   class CommentMailer < ActionMailer::Base
-    def notification(comment, request)
-      @comment = comment
-      @request = request
+    include PublicEntryUrl
 
-      from Jabe::SETTINGS.mail_from || 'edit-me-in-settings@example.com'
+    def notification(comment)
+      @comment = comment
 
       mail(:to => Admin.all.map(&:email),
-        :subject => "Comment on: #{comment.entry.title}"
+        :subject => "Comment on: #{comment.entry.title}",
+        :from => Jabe::SETTINGS.mail_from || 'edit-me-in-settings@example.com'
       )
     end
   end

data/app/models/jabe/comment.rb

@@ -1,23 +1,29 @@
 module Jabe
   class Comment < ActiveRecord::Base
+    include Rakismet::Model
+    include PublicEntryUrl
+
     if defined?(Gravtastic)
       include Gravtastic
-      is_gravtastic :size => 64
+      gravtastic :author_email, :size => 64
     end
 
-    attr_accessor :nickname
+    attr_accessor :nickname, :request
 
     belongs_to :entry
-    default_scope :order => 'created_at ASC'
+    default_scope :conditions => { :spam => false }, :order => 'created_at ASC'
+    scope :spam, :conditions => { :spam => true }
+
+    before_validation :bot_check, :check_akismet, :sanitize
+    validates_presence_of :author, :author_email, :content, :message => 'Required'
 
-    before_validation :bot_check
-    validates_presence_of :name, :email, :body, :message => 'Required'
+    after_create :send_notification
 
-    acts_as_textiled :body
+    acts_as_textiled :content
 
-    def send_notification(request)
+    def send_notification
       begin
-        CommentMailer.notification(self, request).deliver
+        CommentMailer.notification(self).deliver
       rescue => e
         logger.error "#{e}\n#{e.backtrace.join("\n")}"
       end
@@ -28,8 +34,23 @@ module Jabe
       def bot_check
         unless self.nickname.blank?
           errors.add(:nickname, 'You shouldn\'t have seen this...')
-          false
+          return false
         end
       end
+
+      def check_akismet
+        self.user_ip = request.remote_ip
+        self.user_agent = request.env['HTTP_USER_AGENT']
+        self.referrer = request.env['HTTP_REFERER']
+        self.spam = spam?
+        true
+      end
+
+      def sanitize
+        self.author_email = Sanitize.clean(author_email)
+        self.author_url = Sanitize.clean(author_url)
+        self.content = Sanitize.clean(content)
+        true
+      end
   end
-end
+end

data/app/models/jabe/settings.rb

@@ -3,12 +3,14 @@ module Jabe
     def do_updates
       Time.zone = self.time_zone
       ActionMailer::Base.default_url_options[:host] = self.host_name
+      Rakismet.key = self.akismet_key rescue nil
+      Rakismet.url = self.akismet_url rescue nil
     end
   end
 
-  # begin
+  begin
      SETTINGS = Settings.first || Settings.create
      SETTINGS.do_updates
-  # rescue ActiveRecord::StatementInvalid
-  # end
+  rescue ActiveRecord::StatementInvalid
+  end
 end

data/app/views/jabe/admin/settings/edit.html.erb

@@ -43,6 +43,14 @@
   <%= form.label :google_tracker_id %>
   <%= form.text_field :google_tracker_id, :input_html => { :class => "span7" } %>
 
+  <%= form.label :akismet_key, 'Akismet Key (leave blank to skip Akismet)' %>
+  <%= form.text_field :akismet_key, :input_html => { :class => "span7" } %>
+
+  <% Jabe::SETTINGS.akismet_url ||= root_url %>
+
+  <%= form.label :akismet_url, 'Akismet URL' %>
+  <%= form.text_field :akismet_url, :input_html => { :class => "span7" } %>
+
   <br><br>
 
   <%= form.submit 'Save', :class => 'btn btn-success' %>

data/app/views/jabe/comment_mailer/notification.html.erb

@@ -1,19 +1,25 @@
 <p>
-  From: <%= @comment.name %>
+  On: <%= public_entry_url(@comment.entry) %>
 </p>
 <p>
-  Email: <%= @comment.email %>
+  SPAM: <%= @comment.spam? %>
 </p>
 <p>
-  URL: <%= @comment.url %>
+  From: <%= @comment.author %>
 </p>
 <p>
-  <%= @comment.body.html_safe %>
+  Email: <%= @comment.author_email %>
+</p>
+<p>
+  URL: <%= @comment.author_url %>
+</p>
+<p>
+  <%= @comment.content.html_safe %>
 </p>
 <hr>
 <p>
-  Remote IP: <%= @request.remote_ip %>
+  Remote IP: <%= @comment.user_ip %>
 </p>
 <p>
-  User agent: <%= @request.user_agent %>
+  User agent: <%= @comment.user_agent %>
 </p>

data/app/views/jabe/entries/show.html.erb

@@ -24,7 +24,12 @@
             <div class="comment">
               <% if admin_signed_in? %>
                 <div class="delete">
-                  <%= link_to image_tag('jabe/delete.png'), entry_comment_path(entry, comment), :confirm => 'Are you sure?', :method => :delete %>
+                  <%= link_to image_tag('jabe/delete.png'),
+                    entry_comment_path(entry, comment),
+                    :confirm => 'Are you sure?',
+                    :method => :delete,
+                    :class => 'comment_delete'
+                  %>
                 </div>
               <% end %>
 
@@ -35,13 +40,13 @@
               <% end %>
 
               <div class="author">
-                <%= comment.name %>
+                <%= comment.author %>
                 <span class="when">
                   <%= comment.created_at.to_s(:long) %>
                 </span>
               </div>
               <div class="body">
-                <%= comment.body.html_safe %>
+                <%= comment.content.html_safe %>
               </div>
             </div>
           <% end %>
@@ -60,20 +65,20 @@
     <div id="new_comment">
       <h4>Add a comment</h4>
       <%= form_for [entry, comment] do |form| %>
-        <%= form.label :name %>
-        <%= form.text_field :name %>
+        <%= form.label :author, 'Name' %>
+        <%= form.text_field :author %>
 
         <%= form.label :nickname %>
         <%= form.text_field :nickname %>
 
-        <%= form.label :email %>
-        <%= form.text_field :email, :label => 'Email (not shown to the public)' %>
+        <%= form.label :author_email, 'Email (not shown to the public)' %>
+        <%= form.text_field :author_email %>
 
-        <%= form.label :url, 'Website' %>
-        <%= form.text_field :url %>
+        <%= form.label :author_url, 'Website' %>
+        <%= form.text_field :author_url %>
 
-        <%= form.label :body, "Comment - Textile enabled (#{link_to 'Reference', 'http://redcloth.org/try-redcloth/', :target => '_blank'})".html_safe %>
-        <%= form.text_area :body %>
+        <%= form.label :content, "Comment - Textile enabled (#{link_to 'Reference', 'http://redcloth.org/try-redcloth/', :target => '_blank'})".html_safe %>
+        <%= form.text_area :content %>
 
         <br>
 

data/app/views/layouts/jabe/_flash_messages.html.erb

@@ -2,9 +2,7 @@
   <% if flash[message_type] %>
     <div class="<%= "alert alert-#{message_type} fade in" %>">
       <%= link_to '&times;'.html_safe, '#', :class => 'close' %>
-      <p>
-        <%= flash[message_type] %>
-      </p>
+      <%= flash[message_type] %>
     </div>
   <% end %>
 <% end %>

data/app/views/layouts/jabe/application.html.erb

@@ -54,7 +54,7 @@
 
                 <% unless Jabe::SETTINGS.twitter_username.blank? %>
                   <li>
-                    <%= link_to 'Twitter',  "https://twitter.com/#!/#{Jabe::SETTINGS.twitter_username}" %>
+                    <%= link_to 'Twitter',  "https://twitter.com/#{Jabe::SETTINGS.twitter_username}" %>
                   </li>
                 <% end %>
 

data/db/migrate/20101230010436_devise_create_admins.rb

@@ -1,23 +1,21 @@
 class DeviseCreateAdmins < ActiveRecord::Migration
   def self.up
     create_table(:jabe_admins) do |t|
-      t.database_authenticatable :null => false
-      t.recoverable
-      t.rememberable
-      t.trackable
-
-      # t.confirmable
-      # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
-      # t.token_authenticatable
-
-
+      t.string :email,              :null => false, :default => ""
+      t.string :encrypted_password, :null => false, :default => ""
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+      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.timestamps
     end
 
     add_index :jabe_admins, :email,                :unique => true
     add_index :jabe_admins, :reset_password_token, :unique => true
-    # add_index :jabe_admins, :confirmation_token,   :unique => true
-    # add_index :jabe_admins, :unlock_token,         :unique => true
   end
 
   def self.down

data/db/migrate/20121017015058_akismetify_comments.rb

@@ -0,0 +1,32 @@
+class AkismetifyComments < ActiveRecord::Migration
+  def up
+    rename_column :jabe_comments, :name, :author
+    rename_column :jabe_comments, :email, :author_email
+    rename_column :jabe_comments, :url, :author_url
+    rename_column :jabe_comments, :body, :content
+    add_column :jabe_comments, :permalink, :string
+    add_column :jabe_comments, :user_ip, :string
+    add_column :jabe_comments, :user_agent, :string
+    add_column :jabe_comments, :referrer, :string
+    add_column :jabe_comments, :spam, :boolean
+
+    add_column :jabe_settings, :akismet_key, :string
+    add_column :jabe_settings, :akismet_url, :string
+  end
+
+  def down
+    remove_column :jabe_settings, :akismet_key
+    remove_column :jabe_settings, :akismet_url
+
+    remove_column :jabe_comments, :permalink
+    remove_column :jabe_comments, :user_ip
+    remove_column :jabe_comments, :user_agent
+    remove_column :jabe_comments, :referrer
+    remove_column :jabe_comments, :spam
+
+    rename_column :jabe_comments, :author, :name
+    rename_column :jabe_comments, :author_email, :email
+    rename_column :jabe_comments, :author_url, :url
+    rename_column :jabe_comments, :content, :body
+  end
+end

data/lib/jabe.rb

@@ -8,7 +8,7 @@ module Jabe
     end
 
     def public_entry_url(entry)
-      "//#{SETTINGS.host_name}#{root_path}#{entry.published_at.in_time_zone.to_s(:url_part)}/#{entry.to_param}"
+      "http://#{SETTINGS.host_name}#{root_path}#{entry.published_at.in_time_zone.to_s(:url_part)}/#{entry.to_param}"
     end
   end
 

data/lib/jabe/version.rb

@@ -1,3 +1,3 @@
 module Jabe
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jabe
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.2.9
+- !ruby/object:Gem::Dependency
+  name: sanitize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rakismet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +222,7 @@ files:
 - db/migrate/20101230010436_devise_create_admins.rb
 - db/migrate/20101230010437_create_entries.rb
 - db/migrate/20101230010438_create_comments.rb
+- db/migrate/20121017015058_akismetify_comments.rb
 - lib/acts_as_textiled/base.rb
 - lib/jabe/engine.rb
 - lib/jabe/version.rb
@@ -213,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -520388874793192525
+      hash: -2851312894657140189
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -520388874793192525
+      hash: -2851312894657140189
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23