jabe 0.5.9 → 0.6.0

data/app/controllers/jabe/entries_controller.rb

@@ -0,0 +1,30 @@
+module Jabe
+  class EntriesController < ApplicationController
+    include ApplicationHelper
+
+    helper_method :entry, :comment
+
+    def index
+      @entries = Entry.published.
+        page(params[:page]).
+        per( Jabe::SETTINGS.entries_per_page || 5)
+    end
+
+    def show
+      if entry.draft? && ! admin_signed_in?
+        render 'public/404.html', :layout => false, :status => 404
+      end
+    end
+
+    private
+
+      def entry
+        @entry ||= Entry.find(params[:id])
+      end
+
+      def comment
+        @comment ||= entry.comments.new
+      end
+
+  end
+end

data/app/controllers/jabe/feed_controller.rb

@@ -0,0 +1,8 @@
+module Jabe
+  class FeedController < ApplicationController
+    def index
+      @entries = Entry.published.page(params[:page]).
+        per( Jabe::SETTINGS.entries_per_page || 5)
+    end
+  end
+end

data/app/controllers/jabe/sessions_controller.rb

@@ -0,0 +1,4 @@
+module Jabe
+  class SessionsController < ::Devise::SessionsController
+  end
+end

data/app/helpers/jabe/application_helper.rb

@@ -0,0 +1,25 @@
+module Jabe
+  module ApplicationHelper
+    include PublicEntryUrl
+
+    def default_gravatar_url
+      "#{request.protocol}#{request.host_with_port}#{asset_path('jabe/gravatar.gif')}"
+    end
+
+    def page_title(title)
+      @page_title = title
+    end
+
+    def stylesheet(name)
+      content_for :stylesheets do
+        stylesheet_link_tag(name)
+      end
+    end
+
+    def javascript(name)
+      content_for :javascripts do
+        javascript_include_tag(name)
+      end
+    end
+  end
+end

data/app/mailers/jabe/comment_mailer.rb

@@ -0,0 +1,12 @@
+class CommentMailer < ActionMailer::Base
+  default :from =>  Jabe::SETTINGS.mail_from
+
+  def notification(comment, request)
+    @comment = comment
+    @request = request
+
+    mail(:to => Admin.all.map(&:email),
+      :subject => "Comment on: #{comment.entry.title}"
+    )
+  end
+end

data/app/models/jabe/admin.rb

@@ -0,0 +1,11 @@
+module Jabe
+  class Admin < ActiveRecord::Base
+    # Include default devise modules. Others available are:
+    # :token_authenticatable, :confirmable, :lockable and :timeoutable
+    devise :database_authenticatable, :recoverable, :rememberable, :trackable,
+      :validatable
+
+    # Setup accessible (or protected) attributes for your model
+    attr_accessible :email, :password, :password_confirmation, :remember_me
+  end
+end

data/app/models/jabe/comment.rb

@@ -0,0 +1,35 @@
+module Jabe
+  class Comment < ActiveRecord::Base
+    if defined?(Gravtastic)
+      include Gravtastic
+      is_gravtastic :size => 64
+    end
+
+    attr_accessor :nickname
+
+    belongs_to :entry
+    default_scope :order => 'created_at ASC'
+
+    before_validation :bot_check
+    validates_presence_of :name, :email, :body, :message => 'Required'
+
+    acts_as_textiled :body
+
+    def send_notification(request)
+      begin
+        CommentMailer.notification(self, request).deliver
+      rescue => e
+        logger.error "#{e}\n#{e.backtrace.join("\n")}"
+      end
+    end
+
+    private
+
+      def bot_check
+        unless self.nickname.blank?
+          errors.add(:nickname, 'You shouldn\'t have seen this...')
+          false
+        end
+      end
+  end
+end

data/app/models/jabe/entry.rb

@@ -0,0 +1,22 @@
+module Jabe
+  class Entry < ActiveRecord::Base
+    before_save :set_published_at
+
+    has_many :comments
+
+    extend FriendlyId
+    friendly_id :title, :use => :slugged
+
+    acts_as_textiled :body
+
+    default_scope :order => 'published_at DESC'
+    scope :drafts, :conditions => { :draft => true }
+    scope :published, :conditions => { :draft => false }
+
+    private
+
+      def set_published_at
+        self.published_at = Time.now unless draft? || self.published_at
+      end
+  end
+end

data/app/models/jabe/settings.rb

@@ -0,0 +1,14 @@
+module Jabe
+  class Settings < ActiveRecord::Base
+    def do_updates
+      Time.zone = self.time_zone
+      ActionMailer::Base.default_url_options[:host] = self.host_name
+    end
+  end
+
+  # begin
+     SETTINGS = Settings.first || Settings.create
+     SETTINGS.do_updates
+  # rescue ActiveRecord::StatementInvalid
+  # end
+end

data/app/views/{admin → jabe/admin}/entries/_form.html.haml

@@ -1,4 +1,4 @@
-= semantic_form_for [:admin, entry] do |form|
+= simple_form_for [:admin, entry] do |form|
   = form.input :title
   = form.input :body
   = form.input :published_at if entry.published_at

data/app/views/{admin → jabe/admin}/entries/index.html.haml

@@ -9,12 +9,12 @@
     - @drafts.each do |entry|
       %tr
         %td
-          = link_to image_tag('delete_page.png'),
+          = link_to image_tag('jabe/delete_page.png'),
             admin_entry_path(entry),
             :confirm => 'Are you sure?',
             :method => :delete,
             :title => 'Delete'
-          = link_to image_tag('full_page.png'),
+          = link_to image_tag('jabe/full_page.png'),
             entry_path(entry),
             :title => 'Preview'
         %td
@@ -29,15 +29,17 @@
     - @published.each do |entry|
       %tr
         %td.icons
-          = link_to image_tag('delete_page.png'),
+          = link_to image_tag('jabe/delete_page.png'),
             admin_entry_path(entry),
             :confirm => 'Are you sure?',
             :method => :delete,
             :title => 'Delete'
-          = link_to image_tag('full_page.png'),
-            public_entry_path(entry),
+          = link_to image_tag('jabe/full_page.png'),
+            public_entry_url(entry),
             :title => 'Preview'
         %td
           = link_to entry.title, edit_admin_entry_path(entry)
-        %td.when
-          = entry.published_at.to_s(:long)
+          .when
+            = entry.published_at.to_s(:long)
+
+= paginate @published

data/app/views/{admin → jabe/admin}/settings/edit.html.haml

@@ -1,5 +1,5 @@
 %h2 Site Settings
-= semantic_form_for SETTINGS, :url => admin_settings_path do |form|
+= simple_form_for Jabe::SETTINGS, :url => admin_settings_path do |form|
   = 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
@@ -10,4 +10,5 @@
   = form.input :show_github_badge
   = form.input :twitter_username
   = form.input :facebook_url
+  = form.input :google_tracker_id
   = form.submit 'Save'

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

@@ -0,0 +1,19 @@
+<p>
+  From: <%= @comment.name %>
+</p>
+<p>
+  Email: <%= @comment.email %>
+</p>
+<p>
+  URL: <%= @comment.url %>
+</p>
+<p>
+  <%= @comment.body.html_safe %>
+</p>
+<hr>
+<p>
+  Remote IP: <%= @request.remote_ip %>
+</p>
+<p>
+  User agent: <%= @request.user_agent %>
+</p>

data/app/views/jabe/confirmations/new.html.erb

@@ -0,0 +1,15 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="inputs">
+    <%= f.input :email, :required => true %>
+  </div>
+
+  <div class="actions">
+    <%= f.button :submit, "Resend confirmation instructions" %>
+  </div>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

data/app/views/{entries → jabe/entries}/index.html.haml

@@ -2,12 +2,13 @@
   - @entries.each do |entry|
     .entry{ :class => entry == @entries.last ? 'last' : '' }
       .title
-        = link_to entry.title, public_entry_path(entry)
+        %h1
+          = link_to entry.title, public_entry_url(entry)
       .date
         = entry.published_at.to_s(:long)
       .content
         ~ entry.body.html_safe
       .meta
-        = link_to "Comments: #{entry.comments.count}", public_entry_path(entry) + '#comments'
+        = link_to "Comments: #{entry.comments.count}", public_entry_url(entry) + '#comments'
   #pagination.apple_pagination
-    = will_paginate @entries
+    = paginate @entries

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

@@ -0,0 +1,49 @@
+- page_title entry.title
+
+#entries
+  .entry.last
+    .title
+      %h1
+        = entry.title
+    .date
+      = entry.published_at.try(:to_s, :long)
+    .content
+      ~ entry.body.html_safe
+
+    %a{ :name => 'comments' }
+    #comments
+      %h2 Comments
+      - if entry.comments.any?
+        - entry.comments.each do |comment|
+          .comment
+            - if admin_signed_in?
+              .delete
+                = link_to image_tag('jabe/delete.png'),
+                  entry_comment_path(entry, comment),
+                  :confirm => 'Are you sure?',
+                  :method => :delete
+            - if comment.respond_to?(:gravatar_url)
+              .gravatar
+                = image_tag comment.gravatar_url(:default => default_gravatar_url)
+            .author
+              = comment.name
+              %span.when
+                = comment.created_at.to_s(:long)
+            .body
+              = comment.body.html_safe
+      - else
+        .comment
+          .author
+            None yet...
+
+      %a{ :name => 'add-comment' }
+      #new_comment
+        %h2 Add a comment
+        = simple_form_for [entry, comment] do |form|
+          = form.input :name
+          = form.input :nickname
+          = form.input :email, :label => 'Email (not shown to the public)'
+          = form.input :url, :label => 'Website'
+          = form.input :body, :label => 'Comment',
+            :hint => "Textile enabled (#{link_to 'Reference', 'http://redcloth.org/try-redcloth/', :target => '_blank'})".html_safe
+          = form.submit 'Add comment'

data/app/views/{feed → jabe/feed}/index.xml.builder

@@ -1,15 +1,15 @@
 atom_feed do |feed|
-  feed.title(SETTINGS.site_name)
+  feed.title( Jabe::SETTINGS.site_name)
 
   feed.updated @entries.first.try(:published_at)
 
   @entries.each do |post|
-    feed.entry(post, :url => public_entry_url(post)) do |entry|
+    feed.entry(post, :url => 'http:' + public_entry_url(post)) do |entry|
       entry.title h post.title
       entry.content post.body, :type => 'html'
 
       entry.author do |author|
-        author.name(SETTINGS.site_name)
+        author.name( Jabe::SETTINGS.site_name)
       end
     end
   end

data/app/views/jabe/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p>Welcome <%= @resource.email %>!</p>
+
+<p>You can confirm your account through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>

data/app/views/jabe/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>

data/app/views/jabe/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>

data/app/views/jabe/passwords/edit.html.erb

@@ -0,0 +1,19 @@
+<h2>Change your password</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= f.error_notification %>
+
+  <%= f.input :reset_password_token, :as => :hidden %>
+  <%= f.full_error :reset_password_token %>
+
+  <div class="inputs">
+    <%= f.input :password, :label => "New password", :required => true %>
+    <%= f.input :password_confirmation, :label => "Confirm your new password", :required => true %>
+  </div>
+
+  <div class="actions">
+    <%= f.button :submit, "Change my password" %>
+  </div>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

data/app/views/jabe/passwords/new.html.erb

@@ -0,0 +1,15 @@
+<h2>Forgot your password?</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="inputs">
+    <%= f.input :email, :required => true %>
+  </div>
+
+  <div class="actions">
+    <%= f.button :submit, "Send me reset password instructions" %>
+  </div>
+<% end %>
+
+<%= render :partial => "devise/shared/links" %>

data/app/views/jabe/registrations/edit.html.erb

@@ -0,0 +1,22 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="inputs">
+    <%= f.input :email, :required => true, :autofocus => true %>
+    <%= f.input :password, :hint => "leave it blank if you don't want to change it", :required => false %>
+    <%= f.input :password_confirmation, :required => false %>
+    <%= f.input :current_password, :hint => "we need your current password to confirm your changes", :required => true %>
+  </div>
+
+  <div class="actions">
+    <%= f.button :submit, "Update" %>
+  </div>
+<% end %>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+
+<%= link_to "Back", :back %>