comfy_blog 1.1.1 → 1.12.0

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

@@ -1,22 +1,22 @@
-require_relative '../../test_helper'
+require_relative '../test_helper'
 
 class BlogCommentsTest < ActiveSupport::TestCase
   
   def test_fixtures_validity
-    Blog::Comment.all.each do |comment|
+    Comfy::Blog::Comment.all.each do |comment|
       assert comment.valid?, comment.errors.full_messages.to_s
     end
   end
   
   def test_validations
-    comment = Blog::Comment.new
+    comment = Comfy::Blog::Comment.new
     assert comment.invalid?
     assert_errors_on comment, [:post_id, :content, :author, :email]
   end
   
   def test_creation
-    assert_difference 'Blog::Comment.count' do
-      comment = blog_posts(:default).comments.create(
+    assert_difference 'Comfy::Blog::Comment.count' do
+      comment = comfy_blog_posts(:default).comments.create(
         :content  => 'Test Content',
         :author   => 'Tester',
         :email    => 'test@test.test'
@@ -28,7 +28,7 @@ class BlogCommentsTest < ActiveSupport::TestCase
   def test_creation_with_auto_publishing
     ComfyBlog.config.auto_publish_comments = true
     
-    comment = blog_posts(:default).comments.create(
+    comment = comfy_blog_posts(:default).comments.create(
       :content  => 'Test Content',
       :author   => 'Tester',
       :email    => 'test@test.test'
@@ -37,9 +37,9 @@ class BlogCommentsTest < ActiveSupport::TestCase
   end
   
   def test_scope_published
-    assert_equal 1, Blog::Comment.published.count
-    blog_comments(:default).update_attribute(:is_published, false)
-    assert_equal 0, Blog::Comment.published.count
+    assert_equal 1, Comfy::Blog::Comment.published.count
+    comfy_blog_comments(:default).update_attribute(:is_published, false)
+    assert_equal 0, Comfy::Blog::Comment.published.count
   end
   
 end

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

@@ -1,23 +1,23 @@
-require_relative '../../test_helper'
+require_relative '../test_helper'
 
 class BlogPostsTest < ActiveSupport::TestCase
   
   def test_fixtures_validity
-    Blog::Post.all.each do |post|
+    Comfy::Blog::Post.all.each do |post|
       assert post.valid?, post.errors.full_messages.to_s
     end
   end
   
   def test_validations
-    post = Blog::Post.new
+    post = Comfy::Blog::Post.new
     assert post.invalid?
     assert_errors_on post, :blog_id, :title, :slug, :content
   end
   
   def test_validation_of_slug_uniqueness
-    old_post = blog_posts(:default)
+    old_post = comfy_blog_posts(:default)
     old_post.update_attributes!(:published_at => Time.now)
-    post = blog_blogs(:default).posts.new(
+    post = comfy_blog_blogs(:default).posts.new(
       :title    => old_post.title,
       :content  => 'Test Content'
     )
@@ -29,8 +29,8 @@ class BlogPostsTest < ActiveSupport::TestCase
   end
   
   def test_creation
-    assert_difference 'Blog::Post.count' do
-      post = blog_blogs(:default).posts.create!(
+    assert_difference 'Comfy::Blog::Post.count' do
+      post = comfy_blog_blogs(:default).posts.create!(
         :title    => 'Test Post',
         :content  => 'Test Content'
       )
@@ -41,13 +41,13 @@ class BlogPostsTest < ActiveSupport::TestCase
   end
   
   def test_set_slug
-    post = Blog::Post.new(:title => 'Test Title')
+    post = Comfy::Blog::Post.new(:title => 'Test Title')
     post.send(:set_slug)
     assert_equal 'test-title', post.slug
   end
   
   def test_set_date
-    post = Blog::Post.new
+    post = Comfy::Blog::Post.new
     post.send(:set_published_at)
     post.send(:set_date)
     assert_equal post.published_at.year, post.year
@@ -55,34 +55,34 @@ class BlogPostsTest < ActiveSupport::TestCase
   end
   
   def test_set_published_at
-    post = Blog::Post.new
+    post = Comfy::Blog::Post.new
     post.send(:set_published_at)
     assert post.published_at.present?
   end
   
   def test_destroy
-    assert_difference ['Blog::Post.count', 'Blog::Comment.count'], -1 do
-      blog_posts(:default).destroy
+    assert_difference ['Comfy::Blog::Post.count', 'Comfy::Blog::Comment.count'], -1 do
+      comfy_blog_posts(:default).destroy
     end
   end
 
   def test_scope_published
-    post = blog_posts(:default)
+    post = comfy_blog_posts(:default)
     assert post.is_published?
-    assert_equal 1, Blog::Post.published.count
+    assert_equal 1, Comfy::Blog::Post.published.count
 
     post.update_attribute(:is_published, false)
-    assert_equal 0, Blog::Post.published.count
+    assert_equal 0, Comfy::Blog::Post.published.count
   end
 
   def test_scope_for_year
-    assert_equal 1, Blog::Post.for_year(2012).count
-    assert_equal 0, Blog::Post.for_year(2013).count
+    assert_equal 1, Comfy::Blog::Post.for_year(2012).count
+    assert_equal 0, Comfy::Blog::Post.for_year(2013).count
   end
 
   def test_scope_for_month
-    assert_equal 1, Blog::Post.for_month(1).count
-    assert_equal 0, Blog::Post.for_month(2).count
+    assert_equal 1, Comfy::Blog::Post.for_month(1).count
+    assert_equal 0, Comfy::Blog::Post.for_month(2).count
   end
   
 end

data/test/test_helper.rb

@@ -20,8 +20,9 @@ class ActiveSupport::TestCase
   
   def reset_config
     ComfyBlog.configure do |config|
-      config.posts_per_page = 10
-      config.auto_publish_comments = false
+      config.posts_per_page         = 10
+      config.auto_publish_comments  = false
+      config.default_author         = nil
     end
   end
   

metadata

@@ -1,30 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: comfy_blog
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Oleg Khabarov
-- The Working Group Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: comfortable_mexican_sofa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.0
 description: Simple Blog Engine for ComfortableMexicanSofa
 email:
 - oleg@khabarov.ca
@@ -38,33 +37,33 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/admin/blog/base_controller.rb
-- app/controllers/admin/blog/blogs_controller.rb
-- app/controllers/admin/blog/comments_controller.rb
-- app/controllers/admin/blog/posts_controller.rb
-- app/controllers/blog/base_controller.rb
-- app/controllers/blog/comments_controller.rb
-- app/controllers/blog/posts_controller.rb
-- app/models/blog/blog.rb
-- app/models/blog/comment.rb
-- app/models/blog/post.rb
-- app/views/admin/blog/blogs/_form.html.haml
-- app/views/admin/blog/blogs/edit.html.haml
-- app/views/admin/blog/blogs/index.html.haml
-- app/views/admin/blog/blogs/new.html.haml
-- app/views/admin/blog/comments/_comment.html.haml
-- app/views/admin/blog/comments/index.html.haml
-- app/views/admin/blog/comments/toggle_publish.js.erb
-- app/views/admin/blog/partials/_navigation.html.haml
-- app/views/admin/blog/posts/_form.html.haml
-- app/views/admin/blog/posts/edit.html.haml
-- app/views/admin/blog/posts/index.html.haml
-- app/views/admin/blog/posts/new.html.haml
-- app/views/blog/comments/_form.html.haml
-- app/views/blog/posts/index.html.haml
-- app/views/blog/posts/index.rss.builder
-- app/views/blog/posts/show.html.haml
-- app/views/layouts/blog/application.html.haml
+- app/controllers/comfy/admin/blog/base_controller.rb
+- app/controllers/comfy/admin/blog/blogs_controller.rb
+- app/controllers/comfy/admin/blog/comments_controller.rb
+- app/controllers/comfy/admin/blog/posts_controller.rb
+- app/controllers/comfy/blog/base_controller.rb
+- app/controllers/comfy/blog/comments_controller.rb
+- app/controllers/comfy/blog/posts_controller.rb
+- app/models/comfy/blog/blog.rb
+- app/models/comfy/blog/comment.rb
+- app/models/comfy/blog/post.rb
+- app/views/comfy/admin/blog/blogs/_form.html.haml
+- app/views/comfy/admin/blog/blogs/edit.html.haml
+- app/views/comfy/admin/blog/blogs/index.html.haml
+- app/views/comfy/admin/blog/blogs/new.html.haml
+- app/views/comfy/admin/blog/comments/_comment.html.haml
+- app/views/comfy/admin/blog/comments/index.html.haml
+- app/views/comfy/admin/blog/comments/toggle_publish.js.erb
+- app/views/comfy/admin/blog/partials/_navigation.html.haml
+- app/views/comfy/admin/blog/posts/_form.html.haml
+- app/views/comfy/admin/blog/posts/edit.html.haml
+- app/views/comfy/admin/blog/posts/index.html.haml
+- app/views/comfy/admin/blog/posts/new.html.haml
+- app/views/comfy/blog/comments/_form.html.haml
+- app/views/comfy/blog/posts/index.html.haml
+- app/views/comfy/blog/posts/index.rss.builder
+- app/views/comfy/blog/posts/show.html.haml
+- app/views/layouts/comfy/blog/application.html.haml
 - comfy_blog.gemspec
 - config.ru
 - config/application.rb
@@ -88,21 +87,21 @@ files:
 - lib/generators/comfy/blog/README
 - lib/generators/comfy/blog/blog_generator.rb
 - script/rails
-- test/controllers/admin/blog/blogs_controller_test.rb
-- test/controllers/admin/blog/comments_controller_test.rb
-- test/controllers/admin/blog/posts_controller_test.rb
-- test/controllers/blog/comments_controller_test.rb
-- test/controllers/blog/posts_controller_test.rb
-- test/fixtures/blog/blogs.yml
-- test/fixtures/blog/comments.yml
-- test/fixtures/blog/posts.yml
-- test/fixtures/cms/sites.yml
+- test/controllers/comfy/admin/blog/blogs_controller_test.rb
+- test/controllers/comfy/admin/blog/comments_controller_test.rb
+- test/controllers/comfy/admin/blog/posts_controller_test.rb
+- test/controllers/comfy/blog/comments_controller_test.rb
+- test/controllers/comfy/blog/posts_controller_test.rb
+- test/fixtures/comfy/blog/blogs.yml
+- test/fixtures/comfy/blog/comments.yml
+- test/fixtures/comfy/blog/posts.yml
+- test/fixtures/comfy/cms/sites.yml
 - test/fixtures/generators/blog/routes.rb
 - test/generators/blog_generator_test.rb
 - test/lib/configuration_test.rb
-- test/models/blog/blog_test.rb
-- test/models/blog/comments_test.rb
-- test/models/blog/posts_test.rb
+- test/models/blog_test.rb
+- test/models/comments_test.rb
+- test/models/posts_test.rb
 - test/test_helper.rb
 homepage: http://github.com/comfy/comfy-blog
 licenses:

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

@@ -1,26 +0,0 @@
-.page-header
-  = link_to 'New Blog', new_admin_blog_path(@site), :class => 'btn pull-right'
-  %h2 Blogs
-  
-= paginate @blogs
-  
-%table.table.table-hover.table-bordered
-  - @blogs.each do |blog|
-    %tr
-      %td.main
-        = link_to blog.label, edit_admin_blog_path(@site, blog)
-        .item-meta
-          = blog.identifier
-          %br
-          - blog_path = 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'), admin_blog_posts_path(@site, blog), :class => 'btn btn-small btn-inverse'
-          = link_to pluralize(blog.comments.count, 'Comment'), admin_blog_comments_path(@site, blog), :class => 'btn btn-small btn-inverse'
-      %td
-        .btn-group
-          = link_to 'Edit', edit_admin_blog_path(@site, blog), :class => 'btn btn-small'
-          = link_to 'Delete', admin_blog_path(@site, blog), :method => :delete, :data => {:confirm => 'Are you sure?'}, :class => 'btn btn-small btn-danger'
-          
-= paginate @blogs

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

@@ -1,17 +0,0 @@
-%tr{:id => dom_id(comment)}
-  %td
-    = link_to comment.post.title.truncate(25), 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_admin_blog_comment_path(@site, @blog, comment), :method => :patch, :remote => true, :class => "btn btn-small #{css_class}"
-  %td
-    .btn-group
-      = link_to 'Delete', admin_blog_comment_path(@site, @blog, comment), :method => :delete, :data => {:confirm => 'Are you sure?'}, :class => 'btn btn-small btn-danger'

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

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

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

@@ -1,32 +0,0 @@
-.page-header
-  = link_to 'New Blog Post', new_admin_blog_post_path(@site, @blog), :class => 'btn pull-right'
-  %h2 Blog Posts
-  
-= paginate @posts
-  
-%table.table.table-hover.table-bordered
-  %tr
-    %th.main Title
-    %th Author
-    %th Published
-    %th Comments
-    %th
-    
-  - @posts.each do |post|
-    %tr
-      %td.main
-        = link_to post.title, edit_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'), admin_blog_comments_path(@site, @blog, :post_id => post.id), :class => 'btn btn-small btn-inverse'
-      %td
-        .btn-group
-          = link_to 'Edit', edit_admin_blog_post_path(@site, @blog, post), :class => 'btn btn-small'
-          = link_to 'Delete', admin_blog_post_path(@site, @blog, post), :method => :delete, :data => {:confirm => 'Are you sure?'}, :class => 'btn btn-small btn-danger'
-          
-= paginate @posts