comfy_blog 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74cd97579b4570e8cac85c457007e8eb2db33031
-  data.tar.gz: f5bcdabd960071e1be2a3191ef51033b460483d7
+  metadata.gz: 09145ea32c2a6b0cfd5b35c66dfa9d59af182c04
+  data.tar.gz: 0efe6fd8ebed393e88d9f255448e54d7ca8fc9d3
 SHA512:
-  metadata.gz: 8b5db4dde5c35dc687d4e496ccf5febd576ffe14ea20aefd93ee51f0311f366db10b61c241e1deb858ac0cdabe23c0b66c79e0447dd941a4b2f600da10011a93
-  data.tar.gz: 5669fe544894ed906cad147e0ca8b3e031c01718691656d959cf453f6bdab91909e566df951e18f30e83e308b766f758962dd0a2867f8bc857c4e03268e8205c
+  metadata.gz: 93531bcfed2ee3d3c2cffce8a90503e487ae7e49aa7f0c9269f0f02f6791ca913faef0ec93e628adf2a6b8fe4d4d125b2d561ebe60434473885e52114c0c55b3
+  data.tar.gz: 5f16da3322937f76771c5b2a94b21348db82bbf7470fe2955f6e03b52967dd965b6023a62350cac483789667190637e0c64986d3d8bc661a3df0a72286c92d9f

data/.travis.yml

@@ -4,7 +4,7 @@ before_install:
 before_script:
   - rake db:migrate
 script:
-  - rake test:all
+  - rake ci
 rvm:
   - 1.9.3
   - 2.0.0

data/Rakefile

@@ -1,21 +1,31 @@
-require_relative 'config/application'
+require 'bundler'
+Bundler.setup
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:ci) do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end
 
+require_relative 'config/application'
 ComfyBlog::Application.load_tasks
 
 namespace :test do
-  
+
   Rake::TestTask.new(:lib) do |t|
     t.libs << 'test'
     t.pattern = 'test/lib/**/*_test.rb'
     t.verbose = true
   end
-  
+
   Rake::TestTask.new(:generators) do |t|
     t.libs << 'test'
     t.pattern = 'test/generators/**/*_test.rb'
     t.verbose = true
   end
-  
+
 end
 
 Rake::Task[:test].enhance do

data/app/controllers/comfy/blog/base_controller.rb

@@ -1,31 +1,33 @@
 class Comfy::Blog::BaseController < Comfy::Cms::BaseController
-  
+
+  include Comfy::Paginate
+
   layout :set_blog_layout
 
   before_action :load_blog
 
 protected
-  
+
   def load_cms_site
     super
     if @cms_site.path.blank? && params[:cms_path].present?
       raise ActionController::RoutingError.new('Site Not Found')
     end
   end
-  
+
   def load_blog
     @blog = if @cms_site.blogs.count <= 1
       @cms_site.blogs.first!
     else
       @cms_site.blogs.where(:path => params[:blog_path]).first!
     end
-    
+
   rescue ActiveRecord::RecordNotFound
     raise ActionController::RoutingError.new('Blog Not Found')
   end
-  
+
   def set_blog_layout
     @blog.app_layout
   end
-  
+
 end

data/app/controllers/comfy/blog/posts_controller.rb

@@ -1,17 +1,17 @@
 class Comfy::Blog::PostsController < Comfy::Blog::BaseController
-  
+
   skip_before_action :load_blog, :only => [:serve]
-  
+
   # due to fancy routing it's hard to say if we need show or index
   # action. let's figure it out here.
   def serve
     # if there are more than one blog, blog_path is expected
-    if @cms_site.blogs.count >= 2 
+    if @cms_site.blogs.count >= 2
       params[:blog_path] = params.delete(:slug) if params[:blog_path].blank?
     end
-    
+
     load_blog
-    
+
     if params[:slug].present?
       show && render(:show)
     else
@@ -30,14 +30,14 @@ class Comfy::Blog::PostsController < Comfy::Blog::BaseController
     limit = ComfyBlog.config.posts_per_page
     respond_to do |format|
       format.html do
-        @posts = scope.page(params[:page]).per(limit)
+        @posts = comfy_paginate(scope, limit)
       end
       format.rss do
         @posts = scope.limit(limit)
       end
     end
   end
-  
+
   def show
     @post = if params[:slug] && params[:year] && params[:month]
       @blog.posts.published.where(:year => params[:year], :month => params[:month], :slug => params[:slug]).first!

data/app/models/comfy/blog/post.rb

@@ -13,7 +13,7 @@ class Comfy::Blog::Post < ActiveRecord::Base
     :presence   => true
   validates :slug,
     :uniqueness => { :scope => [:blog_id, :year, :month] },
-    :format     => { :with => /\A\w[a-z0-9_-]*\z/i }
+    :format => { :with => /\A%*\w[a-z0-9_\-\%]*\z/i }
   
   # -- Scopes ---------------------------------------------------------------
   default_scope -> {

data/comfy_blog.gemspec

@@ -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.12.0'
+  s.add_dependency 'comfortable_mexican_sofa', '>= 1.12.7'
 end

data/config/environments/test.rb

@@ -33,4 +33,6 @@ defined?(ComfyBlog::Application) && ComfyBlog::Application.configure do
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  config.active_support.test_order = :random
 end

data/db/migrate/01_create_blog.rb

@@ -1,5 +1,5 @@
 class CreateBlog < ActiveRecord::Migration
-  
+
   def self.up
     create_table :comfy_blogs do |t|
       t.integer :site_id,     :null => false
@@ -11,7 +11,7 @@ class CreateBlog < ActiveRecord::Migration
     end
     add_index :comfy_blogs, [:site_id, :path]
     add_index :comfy_blogs, :identifier
-    
+
     create_table :comfy_blog_posts do |t|
       t.integer   :blog_id,       :null => false
       t.string    :title,         :null => false
@@ -29,7 +29,7 @@ class CreateBlog < ActiveRecord::Migration
       :name => 'index_blog_posts_on_published_year_month_slug'
     add_index :comfy_blog_posts, [:is_published, :created_at]
     add_index :comfy_blog_posts, :created_at
-    
+
     create_table :comfy_blog_comments do |t|
       t.integer :post_id,       :null => false
       t.string  :author,        :null => false
@@ -42,11 +42,11 @@ class CreateBlog < ActiveRecord::Migration
     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 :comfy_blogs
-    drop_table :comfy_posts
-    drop_table :comfy_comments
+    drop_table :comfy_blog_posts
+    drop_table :comfy_blog_comments
   end
-  
-end
+
+end

data/lib/comfy_blog/version.rb

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

data/test/gemfiles/Gemfile.rails.4.0

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails',                    '~> 4.0.0'
-gem 'comfortable_mexican_sofa', '~> 1.12.3'
+gem 'comfortable_mexican_sofa'
 gem 'kaminari',                 '>= 0.16.1'
 
 group :test do

data/test/gemfiles/Gemfile.rails.4.1

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails',                    '~> 4.1.0'
-gem 'comfortable_mexican_sofa', '~> 1.12.3'
+gem 'comfortable_mexican_sofa'
 gem 'kaminari',                 '>= 0.16.1'
 
 group :test do

data/test/gemfiles/Gemfile.rails.4.2

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails',                    '~> 4.2.0'
-gem 'comfortable_mexican_sofa', '~> 1.12.3'
+gem 'comfortable_mexican_sofa'
 gem 'kaminari',                 '>= 0.16.1'
 
 group :test do

data/test/gemfiles/Gemfile.rails.master

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails',                    :github => 'rails/rails'
-gem 'comfortable_mexican_sofa', '~> 1.12.3'
+gem 'comfortable_mexican_sofa'
 gem 'kaminari',                 '>= 0.16.1'
 
 group :test do

data/test/models/posts_test.rb

@@ -1,19 +1,19 @@
 require_relative '../test_helper'
 
 class BlogPostsTest < ActiveSupport::TestCase
-  
+
   def test_fixtures_validity
     Comfy::Blog::Post.all.each do |post|
       assert post.valid?, post.errors.full_messages.to_s
     end
   end
-  
+
   def test_validations
     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 = comfy_blog_posts(:default)
     old_post.update_attributes!(:published_at => Time.now)
@@ -27,7 +27,16 @@ class BlogPostsTest < ActiveSupport::TestCase
     old_post.update_attributes!(:published_at => 1.year.ago)
     assert post.valid?
   end
-  
+
+  def test_validation_of_slug_format
+    post = comfy_blog_blogs(:default).posts.new(
+      :title    => 'Test Title',
+      :slug     => 'test%slug',
+      :content  => 'Test Content'
+    )
+    assert post.valid?
+  end
+
   def test_creation
     assert_difference 'Comfy::Blog::Post.count' do
       post = comfy_blog_blogs(:default).posts.create!(
@@ -39,13 +48,13 @@ class BlogPostsTest < ActiveSupport::TestCase
       assert_equal Time.now.month, post.month
     end
   end
-  
+
   def test_set_slug
     post = Comfy::Blog::Post.new(:title => 'Test Title')
     post.send(:set_slug)
     assert_equal 'test-title', post.slug
   end
-  
+
   def test_set_date
     post = Comfy::Blog::Post.new
     post.send(:set_published_at)
@@ -53,13 +62,13 @@ class BlogPostsTest < ActiveSupport::TestCase
     assert_equal post.published_at.year, post.year
     assert_equal post.published_at.month, post.month
   end
-  
+
   def test_set_published_at
     post = Comfy::Blog::Post.new
     post.send(:set_published_at)
     assert post.published_at.present?
   end
-  
+
   def test_destroy
     assert_difference ['Comfy::Blog::Post.count', 'Comfy::Blog::Comment.count'], -1 do
       comfy_blog_posts(:default).destroy
@@ -84,5 +93,5 @@ class BlogPostsTest < ActiveSupport::TestCase
     assert_equal 1, Comfy::Blog::Post.for_month(1).count
     assert_equal 0, Comfy::Blog::Post.for_month(2).count
   end
-  
+
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: comfy_blog
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-25 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.12.0
+        version: 1.12.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.12.7
 description: Simple Blog Engine for ComfortableMexicanSofa
 email:
 - oleg@khabarov.ca