comfy_blog 1.1.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abd49b6d87b69d002abd82c8374e2ace7207b492
-  data.tar.gz: 787cc5bd928a9fa03e86a8af28f377386ebac53c
+  metadata.gz: 7395a14952fcacabf530dc7b573c72661a329114
+  data.tar.gz: 30faa016ab88ad1f66a553d3b1328b93cb58dcd4
 SHA512:
-  metadata.gz: 9f8aef5424035099fe91454b9418a8a8bff61af599d48501c413212330824db7572354eb845acfc069bca399fa5f23c235c87fcdfe9b9cde6e0289a2ece4159b
-  data.tar.gz: ca92bb012caadc2607d434f235b3b3aa4368abd21881fe527c3039b0fe64ebe2ab12ffebedb36eeb16ff6a16fb772d51dcaabfc3905924020b4f459909e4fe4b
+  metadata.gz: d3e34806a569da33f7f884925ed2a855714389ed274a5ec972a6e24c73120365409d49ac41b2cd568f21f3b0f1f63dc6e3d0330e5ac7b4c18ba9eead9293b697
+  data.tar.gz: 6ba09ab8175ccb2e036c120de7c29ac1b6a4091f5987920d790fda058aba2c65c276edffb393880b182298405987bd1bbd55e20914c897e0cd3bf3d8b8dcd042

data/Gemfile

@@ -2,6 +2,8 @@ source 'http://rubygems.org'
 
 gemspec
 
+gem 'comfortable_mexican_sofa', :github => 'comfy/comfortable-mexican-sofa'
+
 group :development do
   gem 'awesome_print'
   gem 'better_errors'

data/README.md

@@ -1,7 +1,7 @@
 # ComfyBlog 
 [![Gem Version](https://badge.fury.io/rb/comfy_blog.png)](http://rubygems.org/gems/comfy_blog) [![Build Status](https://secure.travis-ci.org/comfy/comfy-blog.png)](http://travis-ci.org/comfy/comfy-blog) [![Dependency Status](https://gemnasium.com/comfy/comfy-blog.png)](https://gemnasium.com/comfy/comfy-blog) [![Code Climate](https://codeclimate.com/github/comfy/comfy-blog.png)](https://codeclimate.com/github/comfy/comfy-blog) [![Coverage Status](https://coveralls.io/repos/comfy/comfy-blog/badge.png?branch=master)](https://coveralls.io/r/comfy/comfy-blog)
 
-ComfyBlog is an simple blog management engine for [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) (for version >= 1.11).
+ComfyBlog is an simple blog management engine for [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa)
 
 ## Features
 
@@ -13,7 +13,7 @@ ComfyBlog is an simple blog management engine for [ComfortableMexicanSofa](https
 Add gem definition to your Gemfile:
 
 ```ruby
-gem 'comfy_blog', '~> 1.1.0'
+gem 'comfy_blog', '~> 1.12.0'
 ```
 
 Then from the Rails project's root run:
@@ -33,4 +33,4 @@ You should also find view templates in `/app/views/blog` folder. Feel free to ad
 
 ---
 
-Copyright 2009-2013 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)
+Copyright 2009-2014 Oleg Khabarov

data/app/controllers/{admin → comfy/admin}/blog/base_controller.rb

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

data/app/controllers/{admin → comfy/admin}/blog/blogs_controller.rb

@@ -1,4 +1,4 @@
-class Admin::Blog::BlogsController < Admin::Blog::BaseController
+class Comfy::Admin::Blog::BlogsController < Comfy::Admin::Blog::BaseController
   
   before_action :build_blog,  :only => [:new, :create]
   before_action :load_blog,   :only => [:edit, :update, :destroy]

data/app/controllers/{admin → comfy/admin}/blog/comments_controller.rb

@@ -1,4 +1,4 @@
-class Admin::Blog::CommentsController < Admin::Blog::BaseController
+class Comfy::Admin::Blog::CommentsController < Comfy::Admin::Blog::BaseController
   
   before_action :load_blog
   before_action :load_comment, :only => [:destroy, :toggle_publish]

data/app/controllers/{admin → comfy/admin}/blog/posts_controller.rb

@@ -1,4 +1,4 @@
-class Admin::Blog::PostsController < Admin::Blog::BaseController
+class Comfy::Admin::Blog::PostsController < Comfy::Admin::Blog::BaseController
   
   before_action :load_blog
   before_action :build_post, :only => [:new, :create]
@@ -9,6 +9,7 @@ class Admin::Blog::PostsController < Admin::Blog::BaseController
   end
 
   def new
+    @post.author = ComfyBlog.config.default_author
     render
   end
 

data/app/controllers/{blog → comfy/blog}/base_controller.rb

@@ -1,4 +1,4 @@
-class Blog::BaseController < Cms::BaseController
+class Comfy::Blog::BaseController < Comfy::Cms::BaseController
   
   layout :set_blog_layout
 

data/app/controllers/{blog → comfy/blog}/comments_controller.rb

@@ -1,4 +1,4 @@
-class Blog::CommentsController < Blog::BaseController
+class Comfy::Blog::CommentsController < Comfy::Blog::BaseController
   
   before_action :load_post,
                 :build_comment
@@ -7,11 +7,11 @@ class Blog::CommentsController < Blog::BaseController
     @comment.save!
     
     flash[:success] = 'Comment created'
-    redirect_to blog_post_path(@cms_site.path, @blog.path, @post.slug)
+    redirect_to comfy_blog_post_path(@cms_site.path, @blog.path, @post.slug)
     
   rescue ActiveRecord::RecordInvalid
     flash[:error] = 'Failed to create Comment'
-    render 'blog/posts/show'
+    render 'comfy/blog/posts/show'
   end
 
 protected
@@ -20,7 +20,7 @@ protected
     @post = @blog.posts.published.where(:slug => params[:slug]).first!
   rescue ActiveRecord::RecordNotFound
     flash[:error] = 'Blog Post not found'
-    redirect_to blog_posts_path(@cms_site.path, @blog.path)
+    redirect_to comfy_blog_posts_path(@cms_site.path, @blog.path)
   end
   
   def build_comment

data/app/controllers/{blog → comfy/blog}/posts_controller.rb

@@ -1,4 +1,4 @@
-class Blog::PostsController < Blog::BaseController
+class Comfy::Blog::PostsController < Comfy::Blog::BaseController
   
   skip_before_action :load_blog, :only => [:serve]
   

data/app/models/{blog → comfy/blog}/blog.rb

@@ -1,7 +1,9 @@
-class Blog::Blog < ActiveRecord::Base
+class Comfy::Blog::Blog < ActiveRecord::Base
+  
+  self.table_name = 'comfy_blogs'
   
   # -- Relationhips ---------------------------------------------------------
-  belongs_to :site, :class_name => 'Cms::Site'
+  belongs_to :site, :class_name => 'Comfy::Cms::Site'
   
   has_many :posts,
     :dependent  => :destroy

data/app/models/{blog → comfy/blog}/comment.rb

@@ -1,6 +1,6 @@
-class Blog::Comment < ActiveRecord::Base
+class Comfy::Blog::Comment < ActiveRecord::Base
   
-  self.table_name = 'blog_comments'
+  self.table_name = 'comfy_blog_comments'
   
   # -- Relationships --------------------------------------------------------
   belongs_to :post

data/app/models/{blog → comfy/blog}/post.rb

@@ -1,6 +1,6 @@
-class Blog::Post < ActiveRecord::Base
+class Comfy::Blog::Post < ActiveRecord::Base
   
-  self.table_name = 'blog_posts'
+  self.table_name = 'comfy_blog_posts'
   
   # -- Relationships --------------------------------------------------------
   belongs_to :blog

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

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

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

@@ -0,0 +1,26 @@
+.page-header
+  = link_to 'New Blog', new_comfy_admin_blog_path(@site), :class => 'btn btn-default pull-right'
+  %h2 Blogs
+  
+= 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
+          = link_to pluralize(blog.posts.count, 'Post'), comfy_admin_blog_posts_path(@site, blog), :class => 'btn btn-small btn-inverse'
+          = link_to pluralize(blog.comments.count, 'Comment'), comfy_admin_blog_comments_path(@site, blog), :class => 'btn btn-small btn-inverse'
+      %td
+        .btn-group
+          = link_to 'Edit', edit_comfy_admin_blog_path(@site, blog), :class => 'btn btn-small'
+          = link_to 'Delete', comfy_admin_blog_path(@site, blog), :method => :delete, :data => {:confirm => 'Are you sure?'}, :class => 'btn btn-small btn-danger'
+          
+= paginate @blogs

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

@@ -0,0 +1,17 @@
+%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-small #{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/{admin → comfy/admin}/blog/comments/index.html.haml

@@ -3,7 +3,7 @@
   
 = paginate @comments
 
-%table.table.table-hover.table-bordered
+%table.table.table-hover
   %tr
     %th Post
     %th.main Comment

data/app/views/comfy/admin/blog/partials/_navigation.html.haml

@@ -0,0 +1,6 @@
+- if @site.present? && @site.persisted?
+  %li= active_link_to 'Blogs', comfy_admin_blogs_path(@site)
+  - if @blog.present? && @blog.persisted?
+    %ul
+      %li= active_link_to 'Posts', comfy_admin_blog_posts_path(@site, @blog)
+      %li= active_link_to 'Comments', comfy_admin_blog_comments_path(@site, @blog)

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

@@ -1,5 +1,5 @@
 - content_for :right_column do
-  = render :partial => 'admin/cms/files/index'
+  = render :partial => 'comfy/admin/cms/files/index'
 
 = form.text_field :title, :data => {:slugify => @post.new_record?}
 = form.text_field :slug, :data => {:slug => true}
@@ -7,7 +7,8 @@
 = form.text_area :content, :data => {'cms-rich-text' => true}
 = form.text_area :excerpt, :class => 'short'
 = form.text_field :published_at, :value => @post.published_at.try(:to_s, :db), :data => {'cms-datetime' => true}
-= form.check_box :is_published
+= form.form_group :is_published do
+  = form.check_box :is_published
 
-.form-actions
+= form.form_group :class => 'form-actions' do
   = form.submit :class => 'btn btn-primary'

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

@@ -0,0 +1,32 @@
+.page-header
+  = link_to 'New Blog Post', new_comfy_admin_blog_post_path(@site, @blog), :class => 'btn btn-default pull-right'
+  %h2 Blog Posts
+  
+= paginate @posts
+  
+%table.table.table-hover
+  %tr
+    %th.main Title
+    %th Author
+    %th Published
+    %th Comments
+    %th
+    
+  - @posts.each do |post|
+    %tr
+      %td.main
+        = link_to post.title, edit_comfy_admin_blog_post_path(@site, @blog, post)
+        .item-meta
+          = post.excerpt
+      %td
+        = post.author
+      %td
+        = post.published_at.try(:to_s, :db)
+      %td
+        = link_to pluralize(post.comments.count, 'Comment'), comfy_admin_blog_comments_path(@site, @blog, :post_id => post.id), :class => 'btn btn-sm btn-info'
+      %td
+        .btn-group.btn-group-sm
+          = link_to 'Edit', edit_comfy_admin_blog_post_path(@site, @blog, post), :class => 'btn btn-default'
+          = link_to 'Delete', comfy_admin_blog_post_path(@site, @blog, post), :method => :delete, :data => {:confirm => 'Are you sure?'}, :class => 'btn btn-danger'
+          
+= paginate @posts

data/app/views/{blog → comfy/blog}/comments/_form.html.haml

@@ -1,4 +1,4 @@
-= formatted_form_for @comment, :as => :comment, :url => blog_comments_path(@cms_site.path, @blog.path, @post.slug) do |form|
+= 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

data/app/views/{blog → comfy/blog}/posts/index.html.haml

@@ -2,7 +2,7 @@
 
 - @posts.each do |post|
   
-  %h1= link_to post.title, blog_post_path(@cms_site.path, @blog.path, post.slug)
+  %h1= link_to post.title, comfy_blog_post_path(@cms_site.path, @blog.path, post.slug)
   .author
     = post.author
   .date

data/app/views/{blog → comfy/blog}/posts/index.rss.builder

@@ -3,10 +3,10 @@ xml.rss :version => '2.0' do
   xml.channel do
     xml.title @blog.label
     xml.description @blog.description
-    xml.link blog_posts_url(@cms_site.path, @blog.path)
+    xml.link comfy_blog_posts_url(@cms_site.path, @blog.path)
     
     @posts.each do |post|
-      url = blog_post_url(@cms_site.path, @blog.path, post.slug)
+      url = comfy_blog_post_url(@cms_site.path, @blog.path, post.slug)
       
       xml.item do
         xml.title post.title

data/app/views/{blog → comfy/blog}/posts/show.html.haml

@@ -15,4 +15,4 @@
       .author= comment.author
       .content= comment.content
   
-  = render :partial => 'blog/comments/form'
+  = render :partial => 'comfy/blog/comments/form'

data/comfy_blog.gemspec

@@ -6,7 +6,7 @@ require 'comfy_blog/version'
 Gem::Specification.new do |s|
   s.name        = 'comfy_blog'
   s.version     = ComfyBlog::VERSION
-  s.authors     = ["Oleg Khabarov", "The Working Group Inc"]
+  s.authors     = ["Oleg Khabarov"]
   s.email       = ["oleg@khabarov.ca"]
   s.homepage    = "http://github.com/comfy/comfy-blog"
   s.summary     = "Simple Blog Engine for ComfortableMexicanSofa"
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
 
-  s.add_dependency 'comfortable_mexican_sofa', '>= 1.11.0'
+  s.add_dependency 'comfortable_mexican_sofa', '~> 1.12.0'
 end

data/config/application.rb

@@ -24,5 +24,7 @@ module ComfyBlog
     
     # Making sure we don't load our dev routes as part of the engine
     config.paths['config/routes.rb'] << 'config/blog_routes.rb'
+    
+    config.i18n.enforce_available_locales = true
   end
 end

data/config/initializers/comfy_blog.rb

@@ -1,10 +1,13 @@
 ComfyBlog.configure do |config|
-  
+
   # Number of posts per page. Default is 10
   #   config.posts_per_page = 10
-  
+
   # Comments can be automatically approved/published by changing this setting
   # Default is false.
   #   config.auto_publish_comments = false
-  
+
+  # A default author can be specified for posts
+  #   config.default_author = 'Author Name'
+
 end

data/db/migrate/00_create_cms.rb

@@ -10,7 +10,7 @@ class CreateCms < ActiveRecord::Migration
       end
     
     # -- Sites --------------------------------------------------------------
-    create_table :cms_sites do |t|
+    create_table :comfy_cms_sites do |t|
       t.string :label,        :null => false
       t.string :identifier,   :null => false
       t.string :hostname,     :null => false
@@ -18,11 +18,11 @@ class CreateCms < ActiveRecord::Migration
       t.string :locale,       :null => false, :default => 'en'
       t.boolean :is_mirrored, :null => false, :default => false
     end
-    add_index :cms_sites, :hostname
-    add_index :cms_sites, :is_mirrored
+    add_index :comfy_cms_sites, :hostname
+    add_index :comfy_cms_sites, :is_mirrored
     
     # -- Layouts ------------------------------------------------------------
-    create_table :cms_layouts do |t|
+    create_table :comfy_cms_layouts do |t|
       t.integer :site_id,     :null => false
       t.integer :parent_id
       t.string  :app_layout
@@ -35,11 +35,11 @@ class CreateCms < ActiveRecord::Migration
       t.boolean :is_shared,   :null => false, :default => false
       t.timestamps
     end
-    add_index :cms_layouts, [:parent_id, :position]
-    add_index :cms_layouts, [:site_id, :identifier], :unique => true
+    add_index :comfy_cms_layouts, [:parent_id, :position]
+    add_index :comfy_cms_layouts, [:site_id, :identifier], :unique => true
     
     # -- Pages --------------------------------------------------------------
-    create_table :cms_pages do |t|
+    create_table :comfy_cms_pages do |t|
       t.integer :site_id,         :null => false
       t.integer :layout_id
       t.integer :parent_id
@@ -47,27 +47,28 @@ class CreateCms < ActiveRecord::Migration
       t.string  :label,           :null => false
       t.string  :slug
       t.string  :full_path,       :null => false
-      t.text    :content,         text_limit
+      t.text    :content_cache,   text_limit
       t.integer :position,        :null => false, :default => 0
       t.integer :children_count,  :null => false, :default => 0
       t.boolean :is_published,    :null => false, :default => true
       t.boolean :is_shared,       :null => false, :default => false
       t.timestamps
     end
-    add_index :cms_pages, [:site_id, :full_path]
-    add_index :cms_pages, [:parent_id, :position]
+    add_index :comfy_cms_pages, [:site_id, :full_path]
+    add_index :comfy_cms_pages, [:parent_id, :position]
     
     # -- Page Blocks --------------------------------------------------------
-    create_table :cms_blocks do |t|
-      t.integer   :page_id,     :null => false
-      t.string    :identifier,  :null => false
-      t.text      :content,     text_limit
+    create_table :comfy_cms_blocks do |t|
+      t.string     :identifier,  :null => false
+      t.text       :content,     text_limit
+      t.references :blockable, :polymorphic => true
       t.timestamps
     end
-    add_index :cms_blocks, [:page_id, :identifier]
+    add_index :comfy_cms_blocks, [:identifier]
+    add_index :comfy_cms_blocks, [:blockable_id, :blockable_type]
     
     # -- Snippets -----------------------------------------------------------
-    create_table :cms_snippets do |t|
+    create_table :comfy_cms_snippets do |t|
       t.integer :site_id,     :null => false
       t.string  :label,       :null => false
       t.string  :identifier,  :null => false
@@ -76,11 +77,11 @@ class CreateCms < ActiveRecord::Migration
       t.boolean :is_shared,   :null => false, :default => false
       t.timestamps
     end
-    add_index :cms_snippets, [:site_id, :identifier], :unique => true
-    add_index :cms_snippets, [:site_id, :position]
+    add_index :comfy_cms_snippets, [:site_id, :identifier], :unique => true
+    add_index :comfy_cms_snippets, [:site_id, :position]
     
     # -- Files --------------------------------------------------------------
-    create_table :cms_files do |t|
+    create_table :comfy_cms_files do |t|
       t.integer :site_id,           :null => false
       t.integer :block_id
       t.string  :label,             :null => false
@@ -91,47 +92,48 @@ class CreateCms < ActiveRecord::Migration
       t.integer :position,          :null => false, :default => 0
       t.timestamps
     end
-    add_index :cms_files, [:site_id, :label]
-    add_index :cms_files, [:site_id, :file_file_name]
-    add_index :cms_files, [:site_id, :position]
-    add_index :cms_files, [:site_id, :block_id]
+    add_index :comfy_cms_files, [:site_id, :label]
+    add_index :comfy_cms_files, [:site_id, :file_file_name]
+    add_index :comfy_cms_files, [:site_id, :position]
+    add_index :comfy_cms_files, [:site_id, :block_id]
     
     # -- Revisions -----------------------------------------------------------
-    create_table :cms_revisions, :force => true do |t|
+    create_table :comfy_cms_revisions, :force => true do |t|
       t.string    :record_type, :null => false
       t.integer   :record_id,   :null => false
       t.text      :data,        text_limit
       t.datetime  :created_at
     end
-    add_index :cms_revisions, [:record_type, :record_id, :created_at],
+    add_index :comfy_cms_revisions, [:record_type, :record_id, :created_at],
       :name => 'index_cms_revisions_on_rtype_and_rid_and_created_at'
     
     # -- Categories ---------------------------------------------------------
-    create_table :cms_categories, :force => true do |t|
+    create_table :comfy_cms_categories, :force => true do |t|
       t.integer :site_id,          :null => false
       t.string  :label,            :null => false
       t.string  :categorized_type, :null => false
     end
-    add_index :cms_categories, [:site_id, :categorized_type, :label], :unique => true
+    add_index :comfy_cms_categories, [:site_id, :categorized_type, :label], :unique => true,
+      :name => 'index_cms_categories_on_site_id_and_cat_type_and_label'
     
-    create_table :cms_categorizations, :force => true do |t|
+    create_table :comfy_cms_categorizations, :force => true do |t|
       t.integer :category_id,       :null => false
       t.string  :categorized_type,  :null => false
       t.integer :categorized_id,    :null => false
     end
-    add_index :cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
+    add_index :comfy_cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
       :name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
   end
   
   def self.down
-    drop_table :cms_sites
-    drop_table :cms_layouts
-    drop_table :cms_pages
-    drop_table :cms_snippets
-    drop_table :cms_blocks
-    drop_table :cms_files
-    drop_table :cms_revisions
-    drop_table :cms_categories
-    drop_table :cms_categorizations
+    drop_table :comfy_cms_sites
+    drop_table :comfy_cms_layouts
+    drop_table :comfy_cms_pages
+    drop_table :comfy_cms_snippets
+    drop_table :comfy_cms_blocks
+    drop_table :comfy_cms_files
+    drop_table :comfy_cms_revisions
+    drop_table :comfy_cms_categories
+    drop_table :comfy_cms_categorizations
   end
-end
+end