comfy_blog 1.12.3 → 2.0.0

data/lib/comfy_blog/configuration.rb

@@ -1,21 +1,21 @@
 module ComfyBlog
   class Configuration
 
+    # Application layout to be used to index blog posts.
+    # Default is 'comfy/blog/application'
+    attr_accessor :app_layout
+
     # 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
+    # Auto-setting parameter derived from the routes
+    attr_accessor :public_blog_path
 
     # Configuration defaults
     def initialize
-      @posts_per_page         = 10
-      @auto_publish_comments  = false
-      @default_author         = nil
+      @posts_per_page   = 10
+      @app_layout       = 'comfy/blog/application'
+      @public_blog_path = nil
     end
 
   end

data/lib/comfy_blog/engine.rb

@@ -4,16 +4,16 @@ require 'comfortable_mexican_sofa'
 require 'comfy_blog'
 
 module ComfyBlog
-  
+
   module CmsSiteExtensions
     extend ActiveSupport::Concern
-    included do 
-      has_many :blogs,
-        :class_name => 'Blog::Blog',
-        :dependent  => :destroy
+    included do
+      has_many :blog_posts,
+        class_name: 'Blog::Post',
+        dependent:  :destroy
     end
   end
-  
+
   class Engine < ::Rails::Engine
     initializer 'comfy_blog.configuration' do |app|
       ComfortableMexicanSofa::ViewHooks.add(:navigation, '/comfy/admin/blog/partials/navigation')
@@ -22,4 +22,4 @@ module ComfyBlog
       end
     end
   end
-end
+end

data/lib/comfy_blog/routes/blog.rb

@@ -1,20 +1,19 @@
 class ActionDispatch::Routing::Mapper
 
   def comfy_route_blog(options = {})
-    options[:path] ||= 'blog'
-    path = ['(:cms_path)', options[:path], '(:blog_path)'].join('/')
-    
-    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
+
+    ComfyBlog.configuration.public_blog_path = options[:path] || 'blog'
+    path = ['(:cms_path)', ComfyBlog.configuration.public_blog_path].join('/')
+
+    scope module: :comfy, as: :comfy do
+      namespace :blog, path: path do
+        with_options constraints: {year: /\d{4}/, month: /\d{1,2}/} do |o|
+          o.get ':year',              to: 'posts#index',  as: :posts_of_year
+          o.get ':year/:month',       to: 'posts#index',  as: :posts_of_month
+          o.get ':year/:month/:slug', to: 'posts#show',   as: :post
+          o.get '/',                  to: 'posts#index',  as: :posts
         end
-        post ':slug/comments' => 'comments#create', :as => :comments
-        get  ':slug'          => 'posts#serve',     :as => :post
-        get  '/'              => 'posts#serve',     :as => :posts
       end
     end
   end
-end
+end

data/lib/comfy_blog/routes/blog_admin.rb

@@ -1,20 +1,15 @@
 class ActionDispatch::Routing::Mapper
-  
+
   def comfy_route_blog_admin(options = {})
     options[:path] ||= 'admin'
     path = [options[:path], 'sites', ':site_id'].join('/')
-    
-    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
+
+    scope module: :comfy, as: :comfy do
+      scope module: :admin do
+        namespace :blog, as: :admin, path: path, except: [:show] do
+          resources :posts, as: :blog_posts, path: "blog-posts"
         end
       end
     end
   end
-end
+end

data/lib/comfy_blog/version.rb

@@ -1,3 +1,3 @@
 module ComfyBlog
-  VERSION = "1.12.3"
+  VERSION = "2.0.0"
 end

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

@@ -3,47 +3,49 @@ require 'rails/generators/active_record'
 module Comfy
   module Generators
     class BlogGenerator < Rails::Generators::Base
-      
+
       include Rails::Generators::Migration
       include Thor::Actions
-      
+
       source_root File.expand_path('../../../../..', __FILE__)
-      
+
       def self.next_migration_number(dirname)
         ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
-      
+
       def generate_migration
         destination   = File.expand_path('db/migrate/01_create_blog.rb', self.destination_root)
         migration_dir = File.dirname(destination)
         destination   = self.class.migration_exists?(migration_dir, 'create_blog')
-        
+
         if destination
           puts "\e[0m\e[31mFound existing create_blog migration. Remove it if you want to regenerate.\e[0m"
         else
           migration_template 'db/migrate/01_create_blog.rb', 'db/migrate/create_blog.rb'
         end
       end
-      
+
       def generate_initialization
         copy_file 'config/initializers/comfy_blog.rb',
           'config/initializers/comfy_blog.rb'
       end
-      
+
       def generate_routing
-        route_string  = "  comfy_route :blog_admin, :path => '/admin'\n"
-        route_string << "  comfy_route :blog, :path => '/blog'\n"
-        route route_string[2..-1]
+        route_string = <<-RUBY.strip_heredoc
+          comfy_route :blog_admin, path: "/admin"
+          comfy_route :blog, path: "/blog"
+        RUBY
+        route route_string
       end
-      
+
       def generate_views
         directory 'app/views/comfy/blog', 'app/views/comfy/blog'
       end
-      
+
       def show_readme
         readme 'lib/generators/comfy/blog/README'
       end
-      
+
     end
   end
-end
+end

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

@@ -1,108 +1,132 @@
 require_relative '../../../../test_helper'
 
-class Comfy::Admin::Blog::PostsControllerTest < ActionController::TestCase
-  
-  def setup
-    @site = comfy_cms_sites(:default)
-    @blog = comfy_blog_blogs(:default)
-    @post = comfy_blog_posts(:default)
+class Comfy::Admin::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
+
+  setup do
+    @site   = comfy_cms_sites(:default)
+    @layout = comfy_cms_layouts(:default)
+    @post   = comfy_blog_posts(:default)
   end
-  
+
   def test_get_index
-    get :index, :site_id => @site, :blog_id => @blog
+    r :get, comfy_admin_blog_posts_path(@site)
     assert_response :success
     assert assigns(:posts)
     assert_template :index
   end
-  
-  def test_get_new
-    get :new, :site_id => @site, :blog_id => @blog
+
+  def test_get_index_with_no_posts
+    Comfy::Blog::Post.delete_all
+    r :get, comfy_admin_blog_posts_path(@site)
+    assert_response :redirect
+    assert_redirected_to action: :new
+  end
+
+  def test_get_index_with_category
+    category = @site.categories.create!(
+      label:            'Test Category',
+      categorized_type: 'Comfy::Blog::Post'
+    )
+    category.categorizations.create!(categorized: @post)
+
+    r :get, comfy_admin_blog_posts_path(@site), params: {categories: category.label}
     assert_response :success
-    assert assigns(:post)
-    assert_template :new
-    assert_select "form[action='/admin/sites/#{@site.id}/blogs/#{@blog.id}/posts']"
+    assert assigns(:posts)
+    assert_equal 1, assigns(:posts).count
+    assert assigns(:posts).first.categories.member? category
   end
-  
-  def test_get_new_with_default_author
-    ComfyBlog.config.default_author = 'Default Author'
-    get :new, :site_id => @site, :blog_id => @blog
+
+  def test_get_index_with_category_invalid
+    r :get, comfy_admin_blog_posts_path(@site), params: {categories: 'invalid'}
+    assert_response :success
+    assert assigns(:posts)
+    assert_equal 0, assigns(:posts).count
+  end
+
+  def test_get_new
+    r :get, new_comfy_admin_blog_post_path(@site)
     assert_response :success
     assert assigns(:post)
-    assert_equal 'Default Author', assigns(:post).author
+    assert_template :new
+    assert_select "form[action='/admin/sites/#{@site.id}/blog-posts']"
   end
-  
+
   def test_creation
-    assert_difference 'Comfy::Blog::Post.count' do
-      post :create, :site_id => @site, :blog_id => @blog, :post => {
-        :title        => 'Test Post',
-        :slug         => 'test-post',
-        :content      => 'Test Content',
-        :excerpt      => 'Test Excerpt',
-        :published_at => 2.days.ago.to_s(:db),
-        :is_published => '1'
-      }
+    post_count = -> {Comfy::Blog::Post.count}
+    frag_count = -> {Comfy::Cms::Fragment.count}
+    assert_difference [post_count, frag_count] do
+      r :post, comfy_admin_blog_posts_path(@site), params: {post: {
+        title:        'Test Post',
+        slug:         'test-post',
+        published_at: 2.days.ago.to_s(:db),
+        is_published: '1',
+        layout_id:    @layout,
+        fragments_attributes: [
+          { identifier: 'content',
+            content:    'test text' }
+        ]
+      }}
       assert_response :redirect
-      assert_redirected_to :action => :edit, :id => assigns(:post)
+      assert_redirected_to action: :edit, id: assigns(:post)
       assert_equal 'Blog Post created', flash[:success]
     end
   end
-  
+
   def test_creation_failure
-    assert_no_difference 'Comfy::Blog::Post.count' do
-      post :create, :site_id => @site, :blog_id => @blog, :post => { }
+    assert_no_difference ->{Comfy::Blog::Post.count} do
+      r :post, comfy_admin_blog_posts_path(@site), params: {post: {}}
       assert_response :success
       assert_template :new
       assert assigns(:post)
-      assert_equal 'Failed to create Blog Post', flash[:error]
+      assert_equal 'Failed to create Blog Post', flash[:danger]
     end
   end
-  
+
   def test_get_edit
-    get :edit, :site_id => @site, :blog_id => @blog, :id => @post
+    r :get, edit_comfy_admin_blog_post_path(@site, @post)
     assert_response :success
     assert_template :edit
     assert assigns(:post)
-    assert_select "form[action='/admin/sites/#{@site.id}/blogs/#{@blog.id}/posts/#{@post.id}']"
+    assert_select "form[action='/admin/sites/#{@site.id}/blog-posts/#{@post.id}']"
   end
-  
+
   def test_get_edit_failure
-    get :edit, :site_id => @site, :blog_id => @blog, :id => 'invalid'
+    r :get, edit_comfy_admin_blog_post_path(@site, 'invalid')
     assert_response :redirect
-    assert_redirected_to :action => :index
-    assert_equal 'Blog Post not found', flash[:error]
+    assert_redirected_to action: :index
+    assert_equal 'Blog Post not found', flash[:danger]
   end
-  
+
   def test_update
-    put :update, :site_id => @site, :blog_id => @blog, :id => @post, :post => {
-      :title => 'Updated Post'
-    }
+    r :put, comfy_admin_blog_post_path(@site, @post), params: {post: {
+      title: 'Updated Post'
+    }}
     assert_response :redirect
-    assert_redirected_to :action => :edit, :id => assigns(:post)
+    assert_redirected_to action: :edit, id: assigns(:post)
     assert_equal 'Blog Post updated', flash[:success]
-    
+
     @post.reload
     assert_equal 'Updated Post', @post.title
   end
-  
+
   def test_update_failure
-    put :update, :site_id => @site, :blog_id => @blog, :id => @post, :post => {
-      :title => ''
-    }
+    r :put, comfy_admin_blog_post_path(@site, @post), params: {post: {
+      title: ''
+    }}
     assert_response :success
     assert_template :edit
-    assert_equal 'Failed to update Blog Post', flash[:error]
-    
+    assert_equal 'Failed to update Blog Post', flash[:danger]
+
     @post.reload
     assert_not_equal '', @post.title
   end
-  
+
   def test_destroy
-    assert_difference 'Comfy::Blog::Post.count', -1 do
-      delete :destroy, :site_id => @site, :blog_id => @blog, :id => @post
+    assert_difference -> {Comfy::Blog::Post.count}, -1 do
+      r :delete, comfy_admin_blog_post_path(@site, @post)
       assert_response :redirect
-      assert_redirected_to :action => :index
+      assert_redirected_to action: :index
       assert_equal 'Blog Post removed', flash[:success]
     end
   end
-  
-end
+end

data/test/controllers/comfy/blog/posts_controller_test.rb

@@ -1,80 +1,94 @@
 require_relative '../../../test_helper'
 
-class Comfy::Blog::PostsControllerTest < ActionController::TestCase
-  
+class Comfy::Blog::PostsControllerTest < ActionDispatch::IntegrationTest
+
   def setup
-    @blog = comfy_blog_blogs(:default)
+    @site = comfy_cms_sites(:default)
     @post = comfy_blog_posts(:default)
   end
-  
+
   def test_get_index
-    get :serve
+    get comfy_blog_posts_path
     assert_response :success
     assert_template :index
-    assert assigns(:posts)
-    assert_equal 1, assigns(:posts).size
+    assert assigns(:blog_posts)
+    assert_equal 1, assigns(:blog_posts).size
   end
-  
+
   def test_get_index_as_rss
-    get :serve, :format => :rss
+    get comfy_blog_posts_path, params: {format: :rss}
     assert_response :success
     assert_template :index
-    assert assigns(:posts)
-    assert_equal 1, assigns(:posts).size
+    assert assigns(:blog_posts)
+    assert_equal 1, assigns(:blog_posts).size
   end
-  
+
   def test_get_index_with_unpublished
     comfy_blog_posts(:default).update_column(:is_published, false)
-    get :serve
+    get comfy_blog_posts_path
     assert_response :success
-    assert_equal 0, assigns(:posts).size
+    assert_equal 0, assigns(:blog_posts).size
   end
-  
+
   def test_get_index_for_year_archive
-    get :index, :year => 2012
+    get comfy_blog_posts_of_year_path(@site.path, 2012)
     assert_response :success
-    assert_equal 1, assigns(:posts).size
-    
-    get :index, :year => 1999
+    assert_equal 1, assigns(:blog_posts).size
+
+    get comfy_blog_posts_of_year_path(@site.path, 1999)
     assert_response :success
-    assert_equal 0, assigns(:posts).size
+    assert_equal 0, assigns(:blog_posts).size
   end
-  
+
   def test_get_index_for_month_archive
-    get :index, :year => 2012, :month => 1
+    get comfy_blog_posts_of_month_path(@site.path, 2012, 1)
     assert_response :success
-    assert_equal 1, assigns(:posts).size
-    
-    get :index, :year => 2012, :month => 12
+    assert_equal 1, assigns(:blog_posts).size
+
+    get comfy_blog_posts_of_month_path(@site.path, 2012, 12)
     assert_response :success
-    assert_equal 0, assigns(:posts).size
+    assert_equal 0, assigns(:blog_posts).size
   end
-  
+
+  def test_get_index_with_category
+    category = @site.categories.create!(
+      label:            'Test Category',
+      categorized_type: 'Comfy::Blog::Post'
+    )
+    category.categorizations.create!(categorized: @post)
+
+    get comfy_blog_posts_path, params: {category: category.label}
+
+    assert_response :success
+    assert assigns(:blog_posts)
+    assert_equal 1, assigns(:blog_posts).count
+    assert assigns(:blog_posts).first.categories.member? category
+  end
+
+  def test_get_index_with_category_invalid
+    get comfy_blog_posts_path, params: {category: 'invalid'}
+    assert_response :success
+    assert assigns(:blog_posts)
+    assert_equal 0, assigns(:blog_posts).count
+  end
+
   def test_get_show
-    get :serve, :slug => @post.slug
+    @post.update_column(:content_cache, "blog post content")
+    get comfy_blog_post_path(@site.path, @post.year, @post.month, @post.slug)
     assert_response :success
-    assert_template :show
-    assert assigns(:post)
+    assert_equal "blog post content", response.body
   end
-  
+
   def test_get_show_unpublished
     @post.update_attribute(:is_published, false)
     assert_exception_raised ComfortableMexicanSofa::MissingPage do
-      get :serve, :slug => @post.slug
+      get comfy_blog_post_path(@site.path, @post.year, @post.month, @post.slug)
     end
   end
-  
-  def test_get_show_with_date
-    get :show, :year => @post.year, :month => @post.month, :slug => @post.slug
-    assert_response :success
-    assert_template :show
-    assert assigns(:post)
-  end
-  
+
   def test_get_show_with_date_invalid
     assert_exception_raised ComfortableMexicanSofa::MissingPage do
-      get :show, :year => '1999', :month => '99', :slug => 'invalid'
+      get comfy_blog_post_path(@site.path, 1234, 99, @post.slug)
     end
   end
-  
 end