comfy_blog 1.12.3 → 2.0.0

data/app/controllers/comfy/admin/blog/base_controller.rb

@@ -1,12 +0,0 @@
-class Comfy::Admin::Blog::BaseController < Comfy::Admin::Cms::BaseController
-
-protected
-
-  def load_blog
-    @blog = @site.blogs.find(params[:blog_id] || params[:id])
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Blog not found'
-    redirect_to comfy_admin_blogs_path(@site)
-  end
-  
-end

data/app/controllers/comfy/admin/blog/blogs_controller.rb

@@ -1,51 +0,0 @@
-class Comfy::Admin::Blog::BlogsController < Comfy::Admin::Blog::BaseController
-
-  before_action :build_blog,  :only => [:new, :create]
-  before_action :load_blog,   :only => [:edit, :update, :destroy]
-
-  def index
-    @blogs = comfy_paginate(@site.blogs)
-  end
-
-  def new
-    render
-  end
-
-  def edit
-    render
-  end
-
-  def create
-    @blog.save!
-    flash[:success] = 'Blog created'
-    redirect_to :action => :edit, :id => @blog
-  rescue ActiveRecord::RecordInvalid
-    flash.now[:error] = 'Failed to create Blog'
-    render :action => :new
-  end
-
-  def update
-    @blog.update_attributes!(blog_params)
-    flash[:success] = 'Blog updated'
-    redirect_to :action => :edit, :id => @blog
-  rescue ActiveRecord::RecordInvalid
-    flash.now[:error] = 'Failed to update Blog'
-    render :action => :edit
-  end
-
-  def destroy
-    @blog.destroy
-    flash[:success] = 'Blog deleted'
-    redirect_to :action => :index
-  end
-
-protected
-
-  def build_blog
-    @blog = @site.blogs.new(blog_params)
-  end
-
-  def blog_params
-    params.fetch(:blog, {}).permit!
-  end
-end

data/app/controllers/comfy/admin/blog/comments_controller.rb

@@ -1,33 +0,0 @@
-class Comfy::Admin::Blog::CommentsController < Comfy::Admin::Blog::BaseController
-
-  before_action :load_blog
-  before_action :load_comment, :only => [:destroy, :toggle_publish]
-
-  def index
-    @comments = if @post = @blog.posts.where(:id => params[:post_id]).first
-      comfy_paginate(@post.comments)
-    else
-      comfy_paginate(@blog.comments)
-    end
-  end
-
-  def destroy
-    @comment.destroy
-    flash[:success] = 'Comment deleted'
-    redirect_to :action => :index
-  end
-
-  def toggle_publish
-    @comment.update_attribute(:is_published, !@comment.is_published?)
-  end
-
-protected
-
-  def load_comment
-    @comment = @blog.comments.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Comment not found'
-    redirect_to :action => :index
-  end
-
-end

data/app/controllers/comfy/blog/base_controller.rb

@@ -1,33 +0,0 @@
-class Comfy::Blog::BaseController < Comfy::Cms::BaseController
-
-  include Comfy::Paginate
-
-  layout :set_blog_layout
-
-  before_action :load_blog
-
-protected
-
-  def load_cms_site
-    super
-    if @cms_site.path.blank? && params[:cms_path].present?
-      raise ActionController::RoutingError.new('Site Not Found')
-    end
-  end
-
-  def load_blog
-    @blog = if @cms_site.blogs.count <= 1
-      @cms_site.blogs.first!
-    else
-      @cms_site.blogs.where(:path => params[:blog_path]).first!
-    end
-
-  rescue ActiveRecord::RecordNotFound
-    raise ActionController::RoutingError.new('Blog Not Found')
-  end
-
-  def set_blog_layout
-    @blog.app_layout
-  end
-
-end

data/app/controllers/comfy/blog/comments_controller.rb

@@ -1,33 +0,0 @@
-class Comfy::Blog::CommentsController < Comfy::Blog::BaseController
-  
-  before_action :load_post,
-                :build_comment
-  
-  def create
-    @comment.save!
-    
-    flash[:success] = 'Comment created'
-    redirect_to comfy_blog_post_path(@cms_site.path, @blog.path, @post.slug)
-    
-  rescue ActiveRecord::RecordInvalid
-    flash[:error] = 'Failed to create Comment'
-    render 'comfy/blog/posts/show'
-  end
-
-protected
-
-  def load_post
-    @post = @blog.posts.published.where(:slug => params[:slug]).first!
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Blog Post not found'
-    redirect_to comfy_blog_posts_path(@cms_site.path, @blog.path)
-  end
-  
-  def build_comment
-    @comment = @post.comments.new(comment_params)
-  end
-
-  def comment_params
-    params.fetch(:comment, {}).permit(:author, :email, :content)
-  end
-end

data/app/models/comfy/blog/blog.rb

@@ -1,31 +0,0 @@
-class Comfy::Blog::Blog < ActiveRecord::Base
-  
-  self.table_name = 'comfy_blogs'
-  
-  # -- Relationhips ---------------------------------------------------------
-  belongs_to :site, :class_name => 'Comfy::Cms::Site'
-  
-  has_many :posts,
-    :dependent  => :destroy
-  has_many :comments,
-    :through    => :posts
-    
-  # -- Validations ----------------------------------------------------------
-  validates :site_id, :label, :identifier,
-    :presence   => true
-  validates :identifier,
-    :format     => { :with => /\A\w[a-z0-9_-]*\z/i }
-  validates :path,
-    :uniqueness => { :scope => :site_id },
-    :format     => { :with => /\A\w[a-z0-9_-]*\z/i },
-    :presence   => true,
-    :if         => 'restricted_path?'
-  
-protected
-
-  def restricted_path?
-    (self.class.count > 1 && self.persisted?) ||
-    (self.class.count >= 1 && self.new_record?)
-  end
-
-end

data/app/models/comfy/blog/comment.rb

@@ -1,29 +0,0 @@
-class Comfy::Blog::Comment < ActiveRecord::Base
-  
-  self.table_name = 'comfy_blog_comments'
-  
-  # -- Relationships --------------------------------------------------------
-  belongs_to :post
-  
-  # -- Callbacks ------------------------------------------------------------
-  before_create :set_is_published
-    
-  # -- Validations ----------------------------------------------------------
-  validates :post_id, :content, :author, :email, 
-    :presence => true
-  validates :email,
-    :format => { :with => /\A([\w.%-+]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i }
-    
-  # -- Scopes ---------------------------------------------------------------
-  scope :published, -> {
-    where(:is_published => true)
-  }
-  
-protected
-  
-  def set_is_published
-    self.is_published = ComfyBlog.config.auto_publish_comments
-    return
-  end
-  
-end

data/app/views/comfy/admin/blog/blogs/_form.html.haml

@@ -1,11 +0,0 @@
-= form.text_field :label, :data => {:slugify => @blog.new_record?}
-= form.text_field :identifier, :data => {:slug => true}
-= form.text_field :path
-
-- if (options = Comfy::Cms::Layout.app_layouts_for_select).present?
-  = form.select :app_layout, options
-
-= form.text_area :description, :class => 'short'
-
-= form.form_group :class => 'form-actions' do
-  = form.submit :class => 'btn btn-primary'

data/app/views/comfy/admin/blog/blogs/edit.html.haml

@@ -1,5 +0,0 @@
-.page-header
-  %h2 Edit Blog
-
-= comfy_form_for @blog, :as => :blog, :url => {:action => :update} do |form|
-  = render form

data/app/views/comfy/admin/blog/blogs/index.html.haml

@@ -1,26 +0,0 @@
-.page-header
-  = link_to 'New Blog', new_comfy_admin_blog_path(@site), :class => 'btn btn-default pull-right'
-  %h2 Blogs
-
-= comfy_paginate @blogs
-
-%table.table.table-hover.table-bordered
-  - @blogs.each do |blog|
-    %tr
-      %td.main
-        = link_to blog.label, edit_comfy_admin_blog_path(@site, blog)
-        .item-meta
-          = blog.identifier
-          %br
-          - blog_path = comfy_blog_posts_url(@site.path, blog.path)
-          = link_to blog_path, blog_path, :target => '_blank'
-      %td
-        .btn-group.btn-group-sm
-          = link_to pluralize(blog.posts.count, 'Post'), comfy_admin_blog_posts_path(@site, blog), :class => 'btn btn-info'
-          = link_to pluralize(blog.comments.count, 'Comment'), comfy_admin_blog_comments_path(@site, blog), :class => 'btn btn-info'
-      %td
-        .btn-group.btn-group-sm
-          = link_to 'Edit', edit_comfy_admin_blog_path(@site, blog), :class => 'btn btn-default'
-          = link_to 'Delete', comfy_admin_blog_path(@site, blog), :method => :delete, :data => {:confirm => 'Are you sure?'}, :class => 'btn btn-danger'
-
-= comfy_paginate @blogs

data/app/views/comfy/admin/blog/blogs/new.html.haml

@@ -1,5 +0,0 @@
-.page-header
-  %h2 New Blog
-
-= comfy_form_for @blog, :as => :blog, :url => {:action => :create} do |form|
-  = render form

data/app/views/comfy/admin/blog/comments/_comment.html.haml

@@ -1,17 +0,0 @@
-%tr{:id => dom_id(comment)}
-  %td
-    = link_to comment.post.title.truncate(25), comfy_admin_blog_comments_path(@site, @blog, :post_id => comment.post)
-  %td.main
-    = comment.author
-    .item-meta
-      = mail_to comment.email
-      %br
-      = comment.content
-  %td
-    = comment.created_at.to_s(:db)
-  %td
-    - label, css_class = comment.is_published?? ['Unpublish', 'btn-danger'] : ['Publish', 'btn-info']
-    = link_to label, toggle_publish_comfy_admin_blog_comment_path(@site, @blog, comment), :method => :patch, :remote => true, :class => "btn btn-sm #{css_class}"
-  %td
-    .btn-group.btn-group-sm
-      = link_to 'Delete', comfy_admin_blog_comment_path(@site, @blog, comment), :method => :delete, :data => {:confirm => 'Are you sure?'}, :class => 'btn btn-danger'

data/app/views/comfy/admin/blog/comments/index.html.haml

@@ -1,17 +0,0 @@
-.page-header
-  %h2 Blog Comments
-
-= comfy_paginate @comments
-
-%table.table.table-hover
-  %tr
-    %th Post
-    %th.main Comment
-    %th Posted
-    %th Status
-    %th
-
-  - @comments.each do |comment|
-    = render :partial => 'comment', :object => comment
-
-= comfy_paginate @comments

data/app/views/comfy/admin/blog/comments/toggle_publish.js.erb

@@ -1 +0,0 @@
-$('tr#<%= dom_id(@comment) %>').replaceWith('<%= escape_javascript(render(:partial => "comment", :object => @comment)) %>')

data/app/views/comfy/blog/comments/_form.html.haml

@@ -1,10 +0,0 @@
-= comfy_form_for @comment, :as => :comment, :url => comfy_blog_comments_path(@cms_site.path, @blog.path, @post.slug) do |form|
-  
-  -# don't need this when installed into your app
-  = form.hidden_field :authenticity_token, :value => form_authenticity_token
-  
-  = form.text_field :author
-  = form.text_field :email
-  = form.text_area :content
-  
-  = form.submit 'Submit'

data/app/views/comfy/blog/posts/show.html.haml

@@ -1,18 +0,0 @@
-%h1 Blog Post
-
-%h1= @post.title
-
-.author
-  = @post.author
-.date
-  = @post.published_at.to_s(:db)
-.content
-  = @post.content.html_safe
-
-.comments
-  - @post.comments.published.each do |comment|
-    .comment
-      .author= comment.author
-      .content= comment.content
-  
-  = render :partial => 'comfy/blog/comments/form'

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

@@ -1,7 +0,0 @@
-!!!
-%html
-  %head
-    %title Comfy Blog
-  %body
-    = yield
-    

data/config/initializers/secret_token.rb

@@ -1,15 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-# You can use `rake secret` to generate a secure secret key.
-
-# Make sure your secret_key_base is kept private
-# if you're sharing your code publicly.
-
-if defined?(ComfyBlog::Application)
-  ComfyBlog::Application.config.secret_key_base = 'supersecrettoken'
-end

data/test/controllers/comfy/admin/blog/blogs_controller_test.rb

@@ -1,94 +0,0 @@
-require_relative '../../../../test_helper'
-
-class Comfy::Admin::Blog::BlogsControllerTest < ActionController::TestCase
-
-  def setup
-    @site = comfy_cms_sites(:default)
-    @blog = comfy_blog_blogs(:default)
-  end
-
-  def test_get_index
-    get :index, :site_id => @site
-    assert_response :success
-    assert assigns(:blogs)
-    assert_template :index
-  end
-
-  def test_get_new
-    get :new, :site_id => @site
-    assert_response :success
-    assert assigns(:blog)
-    assert_template :new
-    assert_select "form[action='/admin/sites/#{@site.id}/blogs']"
-  end
-
-  def test_get_edit
-    get :edit, :site_id => @site, :id => @blog
-    assert_response :success
-    assert assigns(:blog)
-    assert_template :edit
-    assert_select "form[action='/admin/sites/#{@site.id}/blogs/#{@blog.id}']"
-  end
-
-  def test_get_edit_failure
-    get :edit, :site_id => @site, :id => 'invalid'
-    assert_response :redirect
-    assert_redirected_to :action => :index
-    assert_equal 'Blog not found', flash[:error]
-  end
-
-  def test_creation
-    assert_difference 'Comfy::Blog::Blog.count' do
-      post :create, :site_id => @site, :blog => {
-        :label        => 'Test Blog',
-        :identifier   => 'test-blog',
-        :path         => 'test-blog',
-        :description  => 'Test Description'
-      }
-      blog = Comfy::Blog::Blog.last
-      assert_response :redirect
-      assert_redirected_to :action => :edit, :id => blog
-      assert_equal 'Blog created', flash[:success]
-    end
-  end
-
-  def test_creation_failure
-    assert_no_difference 'Comfy::Blog::Blog.count' do
-      post :create, :site_id => @site, :blog => { }
-      assert_response :success
-      assert_template :new
-      assert_equal 'Failed to create Blog', flash[:error]
-    end
-  end
-
-  def test_update
-    put :update, :site_id => @site, :id => @blog, blog: {
-      :label => 'Updated'
-    }
-    assert_response :redirect
-    assert_redirected_to :action => :edit, :id => @blog
-    assert_equal 'Blog updated', flash[:success]
-    @blog.reload
-    assert_equal 'Updated', @blog.label
-  end
-
-  def test_update_failure
-    put :update, :site_id => @site, :id => @blog, :blog => {
-      :label => ''
-    }
-    assert_response :success
-    assert_template :edit
-    assert_equal 'Failed to update Blog', flash[:error]
-    @blog.reload
-    refute_equal '', @blog.label
-  end
-
-  def test_destroy
-    assert_difference 'Comfy::Blog::Blog.count', -1 do
-      delete :destroy, :site_id => @site, :id => @blog
-      assert_response :redirect
-      assert_redirected_to :action => :index
-      assert_equal 'Blog deleted', flash[:success]
-    end
-  end
-end