comfy_blog 1.1.1 → 1.12.0

data/db/migrate/01_create_blog.rb

@@ -1,7 +1,7 @@
 class CreateBlog < ActiveRecord::Migration
   
   def self.up
-    create_table :blogs do |t|
+    create_table :comfy_blogs do |t|
       t.integer :site_id,     :null => false
       t.string  :label,       :null => false
       t.string  :identifier,  :null => false
@@ -9,10 +9,10 @@ class CreateBlog < ActiveRecord::Migration
       t.string  :path
       t.text    :description
     end
-    add_index :blogs, [:site_id, :path]
-    add_index :blogs, :identifier
+    add_index :comfy_blogs, [:site_id, :path]
+    add_index :comfy_blogs, :identifier
     
-    create_table :blog_posts do |t|
+    create_table :comfy_blog_posts do |t|
       t.integer   :blog_id,       :null => false
       t.string    :title,         :null => false
       t.string    :slug,          :null => false
@@ -25,12 +25,12 @@ class CreateBlog < ActiveRecord::Migration
       t.datetime  :published_at,  :null => false
       t.timestamps
     end
-    add_index :blog_posts, [:is_published, :year, :month, :slug],
+    add_index :comfy_blog_posts, [:is_published, :year, :month, :slug],
       :name => 'index_blog_posts_on_published_year_month_slug'
-    add_index :blog_posts, [:is_published, :created_at]
-    add_index :blog_posts, :created_at
+    add_index :comfy_blog_posts, [:is_published, :created_at]
+    add_index :comfy_blog_posts, :created_at
     
-    create_table :blog_comments do |t|
+    create_table :comfy_blog_comments do |t|
       t.integer :post_id,       :null => false
       t.string  :author,        :null => false
       t.string  :email,         :null => false
@@ -38,15 +38,15 @@ class CreateBlog < ActiveRecord::Migration
       t.boolean :is_published,  :null => false, :default => false
       t.timestamps
     end
-    add_index :blog_comments, [:post_id, :created_at]
-    add_index :blog_comments, [:post_id, :is_published, :created_at],
+    add_index :comfy_blog_comments, [:post_id, :created_at]
+    add_index :comfy_blog_comments, [:post_id, :is_published, :created_at],
       :name => 'index_blog_comments_on_post_published_created'
   end
   
   def self.down
-    drop_table :blogs
-    drop_table :blog_posts
-    drop_table :blog_comments
+    drop_table :comfy_blogs
+    drop_table :comfy_posts
+    drop_table :comfy_comments
   end
   
 end

data/lib/comfy_blog/configuration.rb

@@ -1,18 +1,22 @@
 module ComfyBlog
   class Configuration
-    
+
     # Number of posts per page. Default is 10
     attr_accessor :posts_per_page
-    
+
     # Comments can be automatically approved/published by changing this setting
     # Default is false.
     attr_accessor :auto_publish_comments
     
+    # A default author can be specified for posts
+    attr_accessor :default_author
+
     # Configuration defaults
     def initialize
       @posts_per_page         = 10
       @auto_publish_comments  = false
+      @default_author         = nil
     end
-    
+
   end
 end

data/lib/comfy_blog/engine.rb

@@ -16,9 +16,9 @@ module ComfyBlog
   
   class Engine < ::Rails::Engine
     initializer 'comfy_blog.configuration' do |app|
-      ComfortableMexicanSofa::ViewHooks.add(:navigation, '/admin/blog/partials/navigation')
+      ComfortableMexicanSofa::ViewHooks.add(:navigation, '/comfy/admin/blog/partials/navigation')
       config.to_prepare do
-        Cms::Site.send :include, ComfyBlog::CmsSiteExtensions
+        Comfy::Cms::Site.send :include, ComfyBlog::CmsSiteExtensions
       end
     end
   end

data/lib/comfy_blog/routes/blog.rb

@@ -4,15 +4,17 @@ class ActionDispatch::Routing::Mapper
     options[:path] ||= 'blog'
     path = ['(:cms_path)', options[:path], '(:blog_path)'].join('/')
     
-    namespace :blog, :path => path, :constraints => {:blog_path => /\w[a-z0-9_-]*/} do
-      with_options :constraints => {:year => /\d{4}/, :month => /\d{1,2}/} do |o|
-        o.get ':year'               => 'posts#index', :as => :posts_of_year
-        o.get ':year/:month'        => 'posts#index', :as => :posts_of_month
-        o.get ':year/:month/:slug'  => 'posts#show',  :as => :posts_dated
+    scope :module => :comfy, :as => :comfy do
+      namespace :blog, :path => path, :constraints => {:blog_path => /\w[a-z0-9_-]*/} do
+        with_options :constraints => {:year => /\d{4}/, :month => /\d{1,2}/} do |o|
+          o.get ':year'               => 'posts#index', :as => :posts_of_year
+          o.get ':year/:month'        => 'posts#index', :as => :posts_of_month
+          o.get ':year/:month/:slug'  => 'posts#show',  :as => :posts_dated
+        end
+        post ':slug/comments' => 'comments#create', :as => :comments
+        get  ':slug'          => 'posts#serve',     :as => :post
+        get  '/'              => 'posts#serve',     :as => :posts
       end
-      post ':slug/comments' => 'comments#create', :as => :comments
-      get  ':slug'          => 'posts#serve',     :as => :post
-      get  '/'              => 'posts#serve',     :as => :posts
     end
   end
 end

data/lib/comfy_blog/routes/blog_admin.rb

@@ -4,12 +4,14 @@ class ActionDispatch::Routing::Mapper
     options[:path] ||= 'admin'
     path = [options[:path], 'sites', ':site_id'].join('/')
     
-    scope :module => :admin do
-      namespace :blog, :as => :admin, :path => path, :except => [:show] do
-        resources :blogs do
-          resources :posts
-          resources :comments, :only => [:index, :destroy] do
-            patch :toggle_publish, :on => :member
+    scope :module => :comfy, :as => :comfy do
+      scope :module => :admin do
+        namespace :blog, :as => :admin, :path => path, :except => [:show] do
+          resources :blogs do
+            resources :posts
+            resources :comments, :only => [:index, :destroy] do
+              patch :toggle_publish, :on => :member
+            end
           end
         end
       end

data/lib/comfy_blog/version.rb

@@ -1,3 +1,3 @@
 module ComfyBlog
-  VERSION = "1.1.1"
+  VERSION = "1.12.0"
 end

data/lib/generators/comfy/blog/blog_generator.rb

@@ -37,7 +37,7 @@ module Comfy
       end
       
       def generate_views
-        directory 'app/views/blog', 'app/views/blog'
+        directory 'app/views/comfy/blog', 'app/views/comfy/blog'
       end
       
       def show_readme

data/test/controllers/{admin → comfy/admin}/blog/blogs_controller_test.rb

@@ -1,10 +1,10 @@
-require_relative '../../../test_helper'
+require_relative '../../../../test_helper'
 
-class Admin::Blog::BlogsControllerTest < ActionController::TestCase
+class Comfy::Admin::Blog::BlogsControllerTest < ActionController::TestCase
   
   def setup
-    @site = cms_sites(:default)
-    @blog = blog_blogs(:default)
+    @site = comfy_cms_sites(:default)
+    @blog = comfy_blog_blogs(:default)
   end
   
   def test_get_index
@@ -38,14 +38,14 @@ class Admin::Blog::BlogsControllerTest < ActionController::TestCase
   end
   
   def test_creation
-    assert_difference 'Blog::Blog.count' do
+    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 = Blog::Blog.last
+      blog = Comfy::Blog::Blog.last
       assert_response :redirect
       assert_redirected_to :action => :edit, :id => blog
       assert_equal 'Blog created', flash[:success]
@@ -53,7 +53,7 @@ class Admin::Blog::BlogsControllerTest < ActionController::TestCase
   end
   
   def test_creation_failure
-    assert_no_difference 'Blog::Blog.count' do
+    assert_no_difference 'Comfy::Blog::Blog.count' do
       post :create, :site_id => @site, :blog => { }
       assert_response :success
       assert_template :new
@@ -84,7 +84,7 @@ class Admin::Blog::BlogsControllerTest < ActionController::TestCase
   end
   
   def test_destroy
-    assert_difference 'Blog::Blog.count', -1 do
+    assert_difference 'Comfy::Blog::Blog.count', -1 do
       delete :destroy, :site_id => @site, :id => @blog
       assert_response :redirect
       assert_redirected_to :action => :index

data/test/controllers/{admin → comfy/admin}/blog/comments_controller_test.rb

@@ -1,12 +1,12 @@
-require_relative '../../../test_helper'
+require_relative '../../../../test_helper'
 
-class Admin::Blog::CommentsControllerTest < ActionController::TestCase
+class Comfy::Admin::Blog::CommentsControllerTest < ActionController::TestCase
   
   def setup
-    @site     = cms_sites(:default)
-    @blog     = blog_blogs(:default)
-    @post     = blog_posts(:default)
-    @comment  = blog_comments(:default)
+    @site     = comfy_cms_sites(:default)
+    @blog     = comfy_blog_blogs(:default)
+    @post     = comfy_blog_posts(:default)
+    @comment  = comfy_blog_comments(:default)
   end
   
   def test_get_index
@@ -39,7 +39,7 @@ class Admin::Blog::CommentsControllerTest < ActionController::TestCase
   end
   
   def test_destroy
-    assert_difference 'Blog::Comment.count', -1 do
+    assert_difference 'Comfy::Blog::Comment.count', -1 do
       delete :destroy, :site_id => @site, :blog_id => @blog, :id => @comment
       assert_response :redirect
       assert_redirected_to :action => :index

data/test/controllers/{admin → comfy/admin}/blog/posts_controller_test.rb

@@ -1,11 +1,11 @@
-require_relative '../../../test_helper'
+require_relative '../../../../test_helper'
 
-class Admin::Blog::PostsControllerTest < ActionController::TestCase
+class Comfy::Admin::Blog::PostsControllerTest < ActionController::TestCase
   
   def setup
-    @site = cms_sites(:default)
-    @blog = blog_blogs(:default)
-    @post = blog_posts(:default)
+    @site = comfy_cms_sites(:default)
+    @blog = comfy_blog_blogs(:default)
+    @post = comfy_blog_posts(:default)
   end
   
   def test_get_index
@@ -23,8 +23,16 @@ class Admin::Blog::PostsControllerTest < ActionController::TestCase
     assert_select "form[action='/admin/sites/#{@site.id}/blogs/#{@blog.id}/posts']"
   end
   
+  def test_get_new_with_default_author
+    ComfyBlog.config.default_author = 'Default Author'
+    get :new, :site_id => @site, :blog_id => @blog
+    assert_response :success
+    assert assigns(:post)
+    assert_equal 'Default Author', assigns(:post).author
+  end
+  
   def test_creation
-    assert_difference 'Blog::Post.count' do
+    assert_difference 'Comfy::Blog::Post.count' do
       post :create, :site_id => @site, :blog_id => @blog, :post => {
         :title        => 'Test Post',
         :slug         => 'test-post',
@@ -40,7 +48,7 @@ class Admin::Blog::PostsControllerTest < ActionController::TestCase
   end
   
   def test_creation_failure
-    assert_no_difference 'Blog::Post.count' do
+    assert_no_difference 'Comfy::Blog::Post.count' do
       post :create, :site_id => @site, :blog_id => @blog, :post => { }
       assert_response :success
       assert_template :new
@@ -89,7 +97,7 @@ class Admin::Blog::PostsControllerTest < ActionController::TestCase
   end
   
   def test_destroy
-    assert_difference 'Blog::Post.count', -1 do
+    assert_difference 'Comfy::Blog::Post.count', -1 do
       delete :destroy, :site_id => @site, :blog_id => @blog, :id => @post
       assert_response :redirect
       assert_redirected_to :action => :index

data/test/controllers/{blog → comfy/blog}/comments_controller_test.rb

@@ -1,31 +1,31 @@
-require_relative '../../test_helper'
+require_relative '../../../test_helper'
 
-class Blog::CommentsControllerTest < ActionController::TestCase
+class Comfy::Blog::CommentsControllerTest < ActionController::TestCase
   
   def setup
-    @blog = blog_blogs(:default)
-    @post = blog_posts(:default)
+    @blog = comfy_blog_blogs(:default)
+    @post = comfy_blog_posts(:default)
   end
 
   def test_creation
-    assert_difference 'Blog::Comment.count' do
+    assert_difference 'Comfy::Blog::Comment.count' do
       post :create, :slug => @post.slug, :comment => {
         :author   => 'Test',
         :email    => 'test@test.test',
         :content  => 'Test Content'
       }
       assert_response :redirect
-      assert_redirected_to blog_post_path
+      assert_redirected_to comfy_blog_post_path
       assert_equal 'Comment created', flash[:success]
       
-      comment = Blog::Comment.last
+      comment = Comfy::Blog::Comment.last
       assert_equal 'Test', comment.author
       assert_equal @post, comment.post
     end
   end
   
   def test_creation_failure
-    assert_no_difference 'Blog::Comment.count' do
+    assert_no_difference 'Comfy::Blog::Comment.count' do
       post :create, :slug => @post.slug, :comment => { }
       assert_response :success
       assert_template :show

data/test/controllers/{blog → comfy/blog}/posts_controller_test.rb

@@ -1,10 +1,10 @@
-require_relative '../../test_helper'
+require_relative '../../../test_helper'
 
-class Blog::PostsControllerTest < ActionController::TestCase
+class Comfy::Blog::PostsControllerTest < ActionController::TestCase
   
   def setup
-    @blog = blog_blogs(:default)
-    @post = blog_posts(:default)
+    @blog = comfy_blog_blogs(:default)
+    @post = comfy_blog_posts(:default)
   end
   
   def test_get_index
@@ -24,7 +24,7 @@ class Blog::PostsControllerTest < ActionController::TestCase
   end
   
   def test_get_index_with_unpublished
-    blog_posts(:default).update_column(:is_published, false)
+    comfy_blog_posts(:default).update_column(:is_published, false)
     get :serve
     assert_response :success
     assert_equal 0, assigns(:posts).size

data/test/fixtures/{blog → comfy/blog}/blogs.yml

@@ -3,5 +3,5 @@ default:
   label: Default Blog
   identifier: default-blog
   path:
-  app_layout: blog/application
+  app_layout: comfy/blog/application
   description: Default Description

data/test/generators/blog_generator_test.rb

@@ -13,7 +13,7 @@ class CmsGeneratorTest < Rails::Generators::TestCase
     
     assert_file 'config/routes.rb', read_file('blog/routes.rb')
     
-    assert_directory 'app/views/blog'
+    assert_directory 'app/views/comfy/blog'
   end
   
 end

data/test/lib/configuration_test.rb

@@ -1,16 +1,17 @@
 require_relative '../test_helper'
 
 class ConfigurationTest < ActiveSupport::TestCase
-  
+
   def test_configuration
     assert config = ComfyBlog.configuration
     assert_equal 10,    config.posts_per_page
     assert_equal false, config.auto_publish_comments
+    assert_equal nil,   config.default_author
   end
-  
+
   def test_initialization_overrides
     ComfyBlog.config.posts_per_page = 5
     assert_equal 5, ComfyBlog.config.posts_per_page
   end
-  
+
 end

data/test/models/{blog/blog_test.rb → blog_test.rb}

@@ -1,28 +1,28 @@
-require_relative '../../test_helper'
+require_relative '../test_helper'
 
 class BlogTest < ActiveSupport::TestCase
   
   def test_site_association
-    assert_equal [blog_blogs(:default)], cms_sites(:default).blogs
+    assert_equal [comfy_blog_blogs(:default)], comfy_cms_sites(:default).blogs
   end
 
   def test_fixtures_validity
-    Blog::Blog.all.each do |blog|
+    Comfy::Blog::Blog.all.each do |blog|
       assert blog.valid?, blog.errors.inspect
     end
   end
   
   def test_validation
-    blog = Blog::Blog.new
+    blog = Comfy::Blog::Blog.new
     assert blog.invalid?
     assert_errors_on blog, :site_id, :label, :identifier, :path
   end
   
   def test_validation_path_presence
-    blog_a = blog_blogs(:default)
+    blog_a = comfy_blog_blogs(:default)
     refute blog_a.path.present?
     
-    blog_b = cms_sites(:default).blogs.new(
+    blog_b = comfy_cms_sites(:default).blogs.new(
       :label      => 'Test Blog A',
       :identifier => 'test-blog-a'
     )
@@ -42,8 +42,8 @@ class BlogTest < ActiveSupport::TestCase
   end
   
   def test_creation
-    assert_difference 'Blog::Blog.count' do
-      cms_sites(:default).blogs.create(
+    assert_difference 'Comfy::Blog::Blog.count' do
+      comfy_cms_sites(:default).blogs.create(
         :label      => 'Test Blog',
         :identifier => 'test-blog',
         :path       => 'test-blog'
@@ -52,8 +52,8 @@ class BlogTest < ActiveSupport::TestCase
   end
   
   def test_destroy
-    assert_difference ['Blog::Blog.count', 'Blog::Post.count'], -1 do
-      blog_blogs(:default).destroy
+    assert_difference ['Comfy::Blog::Blog.count', 'Comfy::Blog::Post.count'], -1 do
+      comfy_blog_blogs(:default).destroy
     end
   end
 end