hitchens 0.0.1 → 0.0.2

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

@@ -0,0 +1,20 @@
+module Hitchens
+  module Admin
+    class BaseController < ApplicationController
+      before_filter :authenticate_hitchens_admin
+      skip_authorization_check :only => [:index]
+
+      def index
+      end
+
+      private
+
+      def authenticate_hitchens_admin
+        unless current_hitchens_user && current_hitchens_user.blog_admin?
+          flash.alert = t("hitchens.errors.access_denied")
+          redirect_to main_app.__send__(Hitchens.sign_in_url_helper)
+        end
+      end
+    end
+  end
+end

data/app/controllers/hitchens/admin/posts_controller.rb

@@ -0,0 +1,45 @@
+module Hitchens
+  module Admin
+    class PostsController < BaseController
+      load_and_authorize_resource :class => 'Hitchens::Post'
+
+      def index
+        @posts = @posts.page(params[:page]).per_page(Hitchens.posts_per_page)
+        @posts = PostDecorator.decorate @posts
+      end
+
+      def show
+        @post = PostDecorator.decorate @post
+      end
+
+      def create
+        if @post.save
+          flash[:notice] = t 'hitchens.notices.post_created'
+          redirect_to admin_posts_path
+        else
+          render 'new'
+        end
+      end
+      def update
+        if @post.update_attributes params[:post]
+          flash[:notice] = t 'hitchens.notices.post_updated'
+          redirect_to admin_posts_path
+        else
+          flash[:error] = t 'hitchens.errors.post_not_updated'
+          render 'edit'
+        end
+      end
+
+      def new
+      end
+      def edit
+      end
+      def destroy
+        @post.destroy
+        flash[:notice] = t('hitchens.notices.post_deleted')
+        redirect_to admin_posts_path
+      end
+    end
+  end
+end
+

data/app/controllers/hitchens/application_controller.rb

@@ -1,16 +1,15 @@
 module Hitchens
   class ApplicationController < ActionController::Base
     check_authorization
-    load_and_authorize_resource
     layout Hitchens.use_parent_layout ? 'application' : 'hitchens/application'
 
     def current_ability
       # we need to tell CanCan to use our Hitchens::Ability class
-      @current_ability ||= Ability.new(get_current_user)
+      @current_ability ||= Ability.new(current_hitchens_user)
     end
 
   private
-    def get_current_user
+    def current_hitchens_user
       __send__ Hitchens.current_user_helper_name
     end
   end

data/app/controllers/hitchens/posts_controller.rb

@@ -1,5 +1,7 @@
 module Hitchens
   class PostsController < ApplicationController
+    load_and_authorize_resource
+
     def index
       @posts = @posts.page(params[:page]).per_page(Hitchens.posts_per_page)
       @posts = PostDecorator.decorate @posts
@@ -8,25 +10,5 @@ module Hitchens
     def show
       @post = PostDecorator.decorate @post
     end
-
-    def create
-      if @post.save
-        redirect_to posts_path
-      else
-        render 'new'
-      end
-    end
-    def update
-      if @post.update_attributes params[:post]
-        redirect_to posts_path
-      else
-        render 'edit'
-      end
-    end
-
-    def new
-    end
-    def edit
-    end
   end
 end

data/app/decorators/hitchens/application_decorator.rb

@@ -1,7 +1,7 @@
 module Hitchens
   class ApplicationDecorator < Draper::Base
     def markdown(text)
-      syntax_highlighter(markdown_parser.render(text)).html_safe
+      markdown_parser.render(text).html_safe
     end
 
 private
@@ -10,16 +10,5 @@ private
         :autolink => true, :space_after_headers => true,
         :fenced_code_blocks => true)
     end
-
-    def syntax_highlighter(html)
-      doc = Nokogiri::HTML(html)
-      doc.search("code").each do |pre|
-        code_ray = CodeRay.scan(pre.text.rstrip, pre[:class]).div
-        # first line of code wasn't indented as much as others
-        # need to add a line break after the pre tag
-        pre.replace code_ray.sub('<pre>', "<pre>\n")
-      end
-      doc.to_s
-    end
   end
 end

data/app/decorators/hitchens/post_decorator.rb

@@ -3,7 +3,8 @@ module Hitchens
     decorates 'Hitchens::Post'
 
     def body_to_html
-      markdown(body)
+      html = markdown(body)
+      syntax_highlight(html).html_safe
     end
 
     def pubdate_tag
@@ -18,5 +19,16 @@ module Hitchens
     def pubdate_display
       publication_date.getlocal.strftime("%A, %B %e, %Y at %l:%M %p")
     end
+    def syntax_highlight(html)
+      doc = Nokogiri::HTML.fragment(html)
+      # remove all pre tags.
+      # coderay will nest pre tags within the code tags.
+      doc.css("pre").each { |pre| pre.replace pre.inner_html }
+      doc.css("code").each do |code|
+        code_ray = CodeRay.scan(code.text.rstrip, code[:class]).div
+        code.replace code_ray
+      end
+      doc.to_s
+    end
   end
 end

data/app/views/hitchens/admin/base/index.html.haml

@@ -0,0 +1,3 @@
+.sign_out_link= link_to 'sign out', main_app.__send__(Hitchens.sign_out_url_helper), method: 'delete'
+= link_to 'new post', new_admin_post_path if can? :create, @post
+= link_to 'manage posts', admin_posts_path

data/app/views/hitchens/{posts → admin/posts}/_form.html.haml

@@ -1,4 +1,4 @@
-= simple_form_for post do |f|
+= simple_form_for [:admin, post] do |f|
   = f.input :title
   = f.input :body
   = f.input :published, as: :boolean

data/app/views/hitchens/admin/posts/_post.html.haml

@@ -0,0 +1,7 @@
+= content_tag_for :div, post do
+  %h2.title= post.title
+  %p.dateline= post.pubdate_tag
+  -# %p.body= find_and_preserve post.body_to_html
+  = link_to 'Edit', edit_admin_post_path(post) if can? :update, post
+  = link_to 'Delete', admin_post_path(post), :method => :delete if can? :delete, post
+

data/app/views/hitchens/admin/posts/index.html.haml

@@ -0,0 +1,7 @@
+= link_to 'new post', new_admin_post_path if can? :create, @post
+= render partial: 'post', collection: @posts
+= will_paginate @posts,
+    previous_label: 'newer posts',
+    next_label: 'older posts',
+    page_links: false
+

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

@@ -1,5 +1,5 @@
 = content_tag_for :div, post do
-  %h2.title= post.title
+  %h2.title
+    = link_to post.title, post
   %p.dateline= post.pubdate_tag
-  %p.body= post.body_to_html
-  = link_to 'Edit', edit_post_path(post) if can? :update, post
+  %p.body= find_and_preserve post.body_to_html

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

@@ -1,4 +1,3 @@
-= link_to 'new post', new_post_path if can? :create, @post
 = render partial: 'post', collection: @posts
 = will_paginate @posts,
     previous_label: 'newer posts',

data/config/routes.rb

@@ -1,4 +1,9 @@
 Hitchens::Engine.routes.draw do
   resources :posts
   root :to => 'posts#index'
+
+  namespace :admin do
+    root :to => "base#index"
+    resources :posts
+  end
 end

data/lib/hitchens/version.rb

@@ -1,3 +1,3 @@
 module Hitchens
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/hitchens.rb

@@ -17,7 +17,9 @@ module Hitchens
                   :use_parent_layout,
                   :user_class_name,
                   :current_user_helper_name,
-                  :blog_admin_user_method
+                  :blog_admin_user_method,
+                  :sign_in_url_helper,
+                  :sign_out_url_helper
 
   #TODO: set these up in the Hitchens initializer file
   self.blog_name = "Ian's test blog"
@@ -27,6 +29,8 @@ module Hitchens
   self.user_class_name = 'User'
   self.current_user_helper_name = 'current_user'
   self.blog_admin_user_method = 'blog_admin?'
+  self.sign_in_url_helper = 'new_user_session_path'
+  self.sign_out_url_helper = 'destroy_user_session_path'
 
   def self.user_class
     user_class_name.constantize

data/test/dummy/app/models/user.rb

@@ -6,4 +6,9 @@ class User < ActiveRecord::Base
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me
+
+  # let's assume they're an admin if they have a real account
+  def blog_admin?
+    email.present?
+  end
 end

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

@@ -7,6 +7,12 @@
   <%= csrf_meta_tags %>
 </head>
 <body>
+  <% if flash[:notice] %>
+    <p class="notice"><%= flash[:notice] %></p>
+  <% end %>
+  <% if flash[:error] %>
+    <p class="error"><%= flash[:error] %></p>
+  <% end %>
   <p>
     <% if current_user %>
       <%= link_to 'sign out', main_app.destroy_user_session_path, method: 'delete' %>

data/test/dummy/config/locales/en.yml

@@ -2,4 +2,12 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  hello: "Hello world"
+  hitchens:
+    errors:
+      access_denied: Access denied.
+      post_not_updated: Post could not be updated.
+    notices:
+      post_deleted: Post successfully deleted.
+      post_created: Post successfully created.
+      post_updated: Post successfully updated.
+