comfy_blog 1.12.1 → 1.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b862ad156ddb05c62e864fb6adbb8d991d71c64b
-  data.tar.gz: 227421e1fedf737a240a9504a676a1202bfe55a6
+  metadata.gz: 74cd97579b4570e8cac85c457007e8eb2db33031
+  data.tar.gz: f5bcdabd960071e1be2a3191ef51033b460483d7
 SHA512:
-  metadata.gz: e8bf112ca2e72f2be2842a4cbd3de9431706c1664196431384f3980c44dd224b954e57e375bb17d38d128f58c14bcc39ded89a707b956ff0d6b555f89fd00b5c
-  data.tar.gz: 8460c134957308def2287355661a6efcf9bdb6c96d5004c262cba0aa2702ecf23f52d17c8ad01f5f03ae59fb8ff11b01cf7a0efa0546d0603a30ba752465fe00
+  metadata.gz: 8b5db4dde5c35dc687d4e496ccf5febd576ffe14ea20aefd93ee51f0311f366db10b61c241e1deb858ac0cdabe23c0b66c79e0447dd941a4b2f600da10011a93
+  data.tar.gz: 5669fe544894ed906cad147e0ca8b3e031c01718691656d959cf453f6bdab91909e566df951e18f30e83e308b766f758962dd0a2867f8bc857c4e03268e8205c

data/.travis.yml

@@ -1,11 +1,26 @@
 language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
+before_install:
+  - gem install bundler
 before_script:
-  - 'rake db:migrate'
+  - rake db:migrate
 script:
   - rake test:all
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.5
+  - 2.2.0
+gemfile:
+  - test/gemfiles/Gemfile.rails.4.0
+  - test/gemfiles/Gemfile.rails.4.1
+  - test/gemfiles/Gemfile.rails.4.2
 branches:
   only:
-    - master
+    - master
+matrix:
+  fast_finish: true
+  include:
+    - rvm: 2.2.0
+      gemfile: test/gemfiles/Gemfile.rails.master
+  allow_failures:
+    - gemfile: test/gemfiles/Gemfile.rails.master

data/Gemfile

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

data/README.md

@@ -1,5 +1,5 @@
-# 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
+[![Gem Version](https://img.shields.io/gem/v/comfy_blog.svg?style=flat)](http://rubygems.org/gems/comfy_blog) [![Gem Downloads](https://img.shields.io/gem/dt/comfy_blog.svg?style=flat)](http://rubygems.org/gems/comfy_blog) [![Build Status](https://img.shields.io/travis/comfy/comfy-blog.svg?style=flat)](https://travis-ci.org/comfy/comfy-blog) [![Dependency Status](https://img.shields.io/gemnasium/comfy/comfy-blog.svg?style=flat)](https://gemnasium.com/comfy/comfy-blog) [![Code Climate](https://img.shields.io/codeclimate/github/comfy/comfy-blog.svg?style=flat)](https://codeclimate.com/github/comfy/comfy-blog) [![Coverage Status](https://img.shields.io/coveralls/comfy/comfy-blog.svg?style=flat)](https://coveralls.io/r/comfy/comfy-blog?branch=master)
 
 ComfyBlog is an simple blog management engine for [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa)
 
@@ -17,11 +17,11 @@ gem 'comfy_blog', '~> 1.12.0'
 ```
 
 Then from the Rails project's root run:
-    
+
     bundle install
     rails generate comfy:blog
     rake db:migrate
-    
+
 Take a look inside your `config/routes.rb` file and you should see following lines there:
 
 ```ruby

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

@@ -1,16 +1,16 @@
 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 = @site.blogs.page(params[:page])
+    @blogs = comfy_paginate(@site.blogs)
   end
-  
+
   def new
     render
   end
-  
+
   def edit
     render
   end
@@ -40,11 +40,11 @@ class Comfy::Admin::Blog::BlogsController < Comfy::Admin::Blog::BaseController
   end
 
 protected
-  
+
   def build_blog
     @blog = @site.blogs.new(blog_params)
   end
-  
+
   def blog_params
     params.fetch(:blog, {}).permit!
   end

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

@@ -1,13 +1,13 @@
 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
-      @post.comments.page(params[:page])
+      comfy_paginate(@post.comments)
     else
-      @blog.comments.page(params[:page])
+      comfy_paginate(@blog.comments)
     end
   end
 
@@ -16,18 +16,18 @@ class Comfy::Admin::Blog::CommentsController < Comfy::Admin::Blog::BaseControlle
     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/admin/blog/posts_controller.rb

@@ -1,11 +1,11 @@
 class Comfy::Admin::Blog::PostsController < Comfy::Admin::Blog::BaseController
-  
+
   before_action :load_blog
   before_action :build_post, :only => [:new, :create]
   before_action :load_post,  :only => [:edit, :update, :destroy]
 
   def index
-    @posts = @blog.posts.order(:published_at).page(params[:page])
+    @posts = comfy_paginate(@blog.posts.order(:published_at))
   end
 
   def new
@@ -56,7 +56,7 @@ protected
     @post = @blog.posts.new(post_params)
     @post.published_at ||= Time.zone.now
   end
-  
+
   def post_params
     params.fetch(:post, {}).permit!
   end

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

@@ -1,9 +1,9 @@
 .page-header
   = link_to 'New Blog', new_comfy_admin_blog_path(@site), :class => 'btn btn-default pull-right'
   %h2 Blogs
-  
-= paginate @blogs
-  
+
+= comfy_paginate @blogs
+
 %table.table.table-hover.table-bordered
   - @blogs.each do |blog|
     %tr
@@ -22,5 +22,5 @@
         .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'
-          
-= paginate @blogs
+
+= comfy_paginate @blogs

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

@@ -1,7 +1,7 @@
 .page-header
   %h2 Blog Comments
-  
-= paginate @comments
+
+= comfy_paginate @comments
 
 %table.table.table-hover
   %tr
@@ -10,8 +10,8 @@
     %th Posted
     %th Status
     %th
-    
+
   - @comments.each do |comment|
     = render :partial => 'comment', :object => comment
-    
-= paginate @comments
+
+= comfy_paginate @comments

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

@@ -1,9 +1,9 @@
 .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
-  
+
+= comfy_paginate @posts
+
 %table.table.table-hover
   %tr
     %th.main Title
@@ -11,7 +11,7 @@
     %th Published
     %th Comments
     %th
-    
+
   - @posts.each do |post|
     %tr
       %td.main
@@ -28,5 +28,5 @@
         .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
+
+= comfy_paginate @posts

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

@@ -1,7 +1,7 @@
 %h1 Blog Posts
 
 - @posts.each do |post|
-  
+
   %h1= link_to post.title, comfy_blog_post_path(@cms_site.path, @blog.path, post.slug)
   .author
     = post.author
@@ -9,5 +9,5 @@
     = post.published_at.to_s(:db)
   .content
     = post.content.html_safe
-  
-= paginate @posts
+
+= comfy_paginate @posts

data/lib/comfy_blog/version.rb

@@ -1,3 +1,3 @@
 module ComfyBlog
-  VERSION = "1.12.1"
+  VERSION = "1.12.2"
 end

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

@@ -1,42 +1,42 @@
 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]"
+    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}]"
+    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 => {
@@ -51,7 +51,7 @@ class Comfy::Admin::Blog::BlogsControllerTest < ActionController::TestCase
       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 => { }
@@ -60,7 +60,7 @@ class Comfy::Admin::Blog::BlogsControllerTest < ActionController::TestCase
       assert_equal 'Failed to create Blog', flash[:error]
     end
   end
-  
+
   def test_update
     put :update, :site_id => @site, :id => @blog, blog: {
       :label => 'Updated'
@@ -71,7 +71,7 @@ class Comfy::Admin::Blog::BlogsControllerTest < ActionController::TestCase
     @blog.reload
     assert_equal 'Updated', @blog.label
   end
-  
+
   def test_update_failure
     put :update, :site_id => @site, :id => @blog, :blog => {
       :label => ''
@@ -82,7 +82,7 @@ class Comfy::Admin::Blog::BlogsControllerTest < ActionController::TestCase
     @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

data/test/gemfiles/Gemfile.rails.4.0

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gem 'rails',                    '~> 4.0.0'
+gem 'comfortable_mexican_sofa', '~> 1.12.3'
+gem 'kaminari',                 '>= 0.16.1'
+
+group :test do
+  gem 'sqlite3'
+  gem 'coveralls',  :require => false
+end

data/test/gemfiles/Gemfile.rails.4.1

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gem 'rails',                    '~> 4.1.0'
+gem 'comfortable_mexican_sofa', '~> 1.12.3'
+gem 'kaminari',                 '>= 0.16.1'
+
+group :test do
+  gem 'sqlite3'
+  gem 'coveralls',  :require => false
+end

data/test/gemfiles/Gemfile.rails.4.2

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gem 'rails',                    '~> 4.2.0'
+gem 'comfortable_mexican_sofa', '~> 1.12.3'
+gem 'kaminari',                 '>= 0.16.1'
+
+group :test do
+  gem 'sqlite3'
+  gem 'coveralls',  :require => false
+end

data/test/gemfiles/Gemfile.rails.master

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gem 'rails',                    :github => 'rails/rails'
+gem 'comfortable_mexican_sofa', '~> 1.12.3'
+gem 'kaminari',                 '>= 0.16.1'
+
+group :test do
+  gem 'sqlite3'
+  gem 'coveralls',  :require => false
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfy_blog
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.2
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: comfortable_mexican_sofa
@@ -97,6 +97,10 @@ files:
 - test/fixtures/comfy/blog/posts.yml
 - test/fixtures/comfy/cms/sites.yml
 - test/fixtures/generators/blog/routes.rb
+- test/gemfiles/Gemfile.rails.4.0
+- test/gemfiles/Gemfile.rails.4.1
+- test/gemfiles/Gemfile.rails.4.2
+- test/gemfiles/Gemfile.rails.master
 - test/generators/blog_generator_test.rb
 - test/lib/configuration_test.rb
 - test/models/blog_test.rb
@@ -123,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple Blog Engine for ComfortableMexicanSofa