comfy_blog 1.12.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09145ea32c2a6b0cfd5b35c66dfa9d59af182c04
-  data.tar.gz: 0efe6fd8ebed393e88d9f255448e54d7ca8fc9d3
+  metadata.gz: beb0f6be4a487c3fb6f088c89205e007ceeebc5f
+  data.tar.gz: 4297e36e4134fa38c49027dfe00fd71612455f84
 SHA512:
-  metadata.gz: 93531bcfed2ee3d3c2cffce8a90503e487ae7e49aa7f0c9269f0f02f6791ca913faef0ec93e628adf2a6b8fe4d4d125b2d561ebe60434473885e52114c0c55b3
-  data.tar.gz: 5f16da3322937f76771c5b2a94b21348db82bbf7470fe2955f6e03b52967dd965b6023a62350cac483789667190637e0c64986d3d8bc661a3df0a72286c92d9f
+  metadata.gz: 2cd0bccff29a6d2352149e5c33b149dbafd91b404d037b234abdbe2647a01b591386ea04bf851c15bebe8f4b3d79bd5860ab98e6fac6c7f9afba58ca473e9002
+  data.tar.gz: a579e9f83d27e048ef9a4fff230b73f9219352323dc6840abfde1abde8b938d58c0dc0596dc2bc1d665e3ab75c9372088ed032c5e56c1481f12ac37cc73f162b

data/.travis.yml

@@ -4,23 +4,13 @@ before_install:
 before_script:
   - rake db:migrate
 script:
-  - rake ci
+  - rake test
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.5
-  - 2.2.0
+  - 2.2.7
+  - 2.3.5
+  - 2.4.2
 gemfile:
-  - test/gemfiles/Gemfile.rails.4.0
-  - test/gemfiles/Gemfile.rails.4.1
-  - test/gemfiles/Gemfile.rails.4.2
+  - test/gemfiles/Gemfile.rails.5.2
 branches:
   only:
     - 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

@@ -5,13 +5,14 @@ gemspec
 gem 'kaminari'
 
 group :development do
-  gem 'awesome_print'
-  gem 'better_errors'
-  gem 'binding_of_caller'
-  gem 'quiet_assets'
+  gem 'web-console'
+  gem 'listen'
+  gem "rubocop", "~> 0.51.0", require: false
 end
 
 group :test do
+  gem 'rails-controller-testing'
   gem 'sqlite3'
-  gem 'coveralls', :require => false
-end
+  gem 'mocha',      require: false
+  gem 'coveralls',  require: false
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Oleg Khabarov
+Copyright 2013-2017 Oleg Khabarov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,19 +1,24 @@
 # 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)
+ComfyBlog is a simple blog management engine for [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa)
 
-## Features
+[![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/maintainability/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)
 
-* Ability to set up multiple blogs per site
-* User defined layout per blog
+## Dependencies
+
+Make sure that you have [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) installed first.
 
 ## Installation
 
 Add gem definition to your Gemfile:
 
 ```ruby
-gem 'comfy_blog', '~> 1.12.0'
+gem 'comfy_blog', '~> 2.0.0'
 ```
 
 Then from the Rails project's root run:
@@ -25,12 +30,12 @@ Then from the Rails project's root run:
 Take a look inside your `config/routes.rb` file and you should see following lines there:
 
 ```ruby
-comfy_route :blog_admin, :path => 'admin'
-comfy_route :blog, :path => 'blog'
+comfy_route :blog_admin, path: 'admin'
+comfy_route :blog, path: 'blog'
 ```
 
 You should also find view templates in `/app/views/blog` folder. Feel free to adjust them as you see fit.
 
 ---
 
-Copyright 2009-2014 Oleg Khabarov
+Copyright 2009-2017 Oleg Khabarov

data/Rakefile

@@ -1,34 +1,3 @@
-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
-  Rake::Task['test:lib'].invoke
-  Rake::Task['test:generators'].invoke
-end
+Rails.application.load_tasks

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

@@ -1,26 +1,29 @@
-class Comfy::Admin::Blog::PostsController < Comfy::Admin::Blog::BaseController
+class Comfy::Admin::Blog::PostsController < Comfy::Admin::Cms::BaseController
 
-  before_action :load_blog
-  before_action :build_post, :only => [:new, :create]
-  before_action :load_post,  :only => [:edit, :update, :destroy]
+  before_action :build_post, only: [:new, :create]
+  before_action :load_post,  only: [:edit, :update, :destroy]
+  before_action :authorize
 
   def index
-    @posts = comfy_paginate(@blog.posts.order(:published_at))
+    return redirect_to action: :new if @site.blog_posts.count == 0
+
+    posts_scope = @site.blog_posts.
+      includes(:categories).for_category(params[:categories]).order(published_at: :desc)
+    @posts = comfy_paginate(posts_scope)
   end
 
   def new
-    @post.author = ComfyBlog.config.default_author
     render
   end
 
   def create
     @post.save!
-    flash[:success] = 'Blog Post created'
-    redirect_to :action => :edit, :id => @post
+    flash[:success] = t('.created')
+    redirect_to action: :edit, id: @post
 
   rescue ActiveRecord::RecordInvalid
-    flash.now[:error] = 'Failed to create Blog Post'
-    render :action => :new
+    flash.now[:danger] = t('.create_failure')
+    render action: :new
   end
 
   def edit
@@ -29,36 +32,37 @@ class Comfy::Admin::Blog::PostsController < Comfy::Admin::Blog::BaseController
 
   def update
     @post.update_attributes!(post_params)
-    flash[:success] = 'Blog Post updated'
-    redirect_to :action => :edit, :id => @post
+    flash[:success] = t('.updated')
+    redirect_to action: :edit, id: @post
 
   rescue ActiveRecord::RecordInvalid
-    flash.now[:error] = 'Failed to update Blog Post'
-    render :action => :edit
+    flash.now[:danger] = t('.update_failure')
+    render action: :edit
   end
 
   def destroy
     @post.destroy
-    flash[:success] = 'Blog Post removed'
-    redirect_to :action => :index
+    flash[:success] = t('.deleted')
+    redirect_to action: :index
   end
 
 protected
 
   def load_post
-    @post = @blog.posts.find(params[:id])
+    @post = @site.blog_posts.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Blog Post not found'
-    redirect_to :action => :index
+    flash[:danger] = t('.not_found')
+    redirect_to action: :index
   end
 
   def build_post
-    @post = @blog.posts.new(post_params)
+    layout = (@site.blog_posts.order(:created_at).last.try(:layout) || @site.layouts.order(:created_at).first)
+    @post = @site.blog_posts.new(post_params)
     @post.published_at ||= Time.zone.now
+    @post.layout ||= layout
   end
 
   def post_params
     params.fetch(:post, {}).permit!
   end
-
-end
+end

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

@@ -1,53 +1,46 @@
-class Comfy::Blog::PostsController < Comfy::Blog::BaseController
+class Comfy::Blog::PostsController < Comfy::Cms::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
-      params[:blog_path] = params.delete(:slug) if params[:blog_path].blank?
-    end
-
-    load_blog
-
-    if params[:slug].present?
-      show && render(:show)
-    else
-      index && render(:index)
-    end
-  end
+  include Comfy::Paginate
 
   def index
     scope = if params[:year]
-      scope = @blog.posts.published.for_year(params[:year])
+      scope = @cms_site.blog_posts.published.for_year(params[:year])
       params[:month] ? scope.for_month(params[:month]) : scope
     else
-      @blog.posts.published
+      @cms_site.blog_posts.published
     end
 
-    limit = ComfyBlog.config.posts_per_page
-    respond_to do |format|
-      format.html do
-        @posts = comfy_paginate(scope, limit)
-      end
-      format.rss do
-        @posts = scope.limit(limit)
-      end
-    end
+    scope = scope.for_category(params[:category]) if params[:category]
+
+    @blog_posts = comfy_paginate(scope, per_page: ComfyBlog.config.posts_per_page)
+    render layout: ComfyBlog.config.app_layout
   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!
-    else
-      @blog.posts.published.where(:slug => params[:slug]).first!
-    end
-    @comment = @post.comments.new
+    load_post
+
+    render  inline: @cms_post.content_cache,
+            layout: app_layout,
+            content_type: "text/html"
 
   rescue ActiveRecord::RecordNotFound
-    render :cms_page => '/404', :status => 404
+    render cms_page: '/404', status: 404
   end
 
-end
+private
+
+  def load_post
+    post_scope = @cms_site.blog_posts.published.where(slug: params[:slug])
+    @cms_post = if params[:year] && params[:month]
+      post_scope = post_scope.where(year: params[:year], month: params[:month]).first!
+    else
+      post_scope.first!
+    end
+    @cms_layout = @cms_post.layout
+  end
+
+  def app_layout
+    return false unless @cms_layout
+    @cms_layout.app_layout.present? ? @cms_layout.app_layout : false
+  end
+end

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

@@ -1,52 +1,50 @@
 class Comfy::Blog::Post < ActiveRecord::Base
-  
+
   self.table_name = 'comfy_blog_posts'
-  
-  # -- Relationships --------------------------------------------------------
-  belongs_to :blog
-  
-  has_many :comments,
-    :dependent => :destroy
-  
-  # -- Validations ----------------------------------------------------------
-  validates :blog_id, :title, :slug, :year, :month, :content,
-    :presence   => true
+
+  include Comfy::Cms::WithFragments
+  include Comfy::Cms::WithCategories
+
+  # -- Relationships -----------------------------------------------------------
+  belongs_to :site,
+    class_name: 'Comfy::Cms::Site'
+
+  # -- Validations -------------------------------------------------------------
+  validates :title, :slug, :year, :month,
+    presence: true
   validates :slug,
-    :uniqueness => { :scope => [:blog_id, :year, :month] },
-    :format => { :with => /\A%*\w[a-z0-9_\-\%]*\z/i }
-  
-  # -- Scopes ---------------------------------------------------------------
-  default_scope -> {
-    order('published_at DESC')
-  }
-  scope :published, -> {
-    where(:is_published => true)
-  }
-  scope :for_year, -> year {
-    where(:year => year)
-  }
-  scope :for_month, -> month {
-    where(:month => month)
-  }
-  
-  # -- Callbacks ------------------------------------------------------------
+    uniqueness: {scope: [:site_id, :year, :month]},
+    format:     {with: /\A%*\w[a-z0-9_\-\%]*\z/i }
+
+  # -- Scopes ------------------------------------------------------------------
+  scope :published, -> {where(is_published: true)}
+  scope :for_year,  -> year {where(year: year)}
+  scope :for_month, -> month {where(month: month)}
+
+  # -- Callbacks ---------------------------------------------------------------
   before_validation :set_slug,
                     :set_published_at,
                     :set_date
-  
+
+  # -- Instance Mathods --------------------------------------------------------
+  def url(relative: false)
+    public_blog_path = ComfyBlog.config.public_blog_path
+    post_path = ['/', public_blog_path, self.year, self.month, self.slug].join('/').squeeze('/')
+    [self.site.url(relative: relative), post_path].join
+  end
+
 protected
-  
+
   def set_slug
-    self.slug ||= self.title.to_s.downcase.slugify
+    self.slug ||= self.title.to_s.parameterize
   end
-  
+
   def set_date
     self.year   = self.published_at.year
     self.month  = self.published_at.month
   end
-  
+
   def set_published_at
     self.published_at ||= Time.zone.now
   end
-  
-end
+end

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

@@ -1,6 +1,4 @@
-- if @site.present? && @site.persisted?
-  %li= active_link_to 'Blogs', comfy_admin_blogs_path(@site)
-  - if @blog.present? && @blog.persisted?
-    %ul
-      %li= active_link_to 'Posts', comfy_admin_blog_posts_path(@site, @blog)
-      %li= active_link_to 'Comments', comfy_admin_blog_comments_path(@site, @blog)
+- if @site && @site.persisted?
+  %li.nav-item
+    = active_link_to comfy_admin_blog_posts_path(@site), class: "nav-link" do
+      = t('comfy.admin.cms.base.posts')

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

@@ -1,11 +1,23 @@
-= form.text_field :title, :data => {:slugify => @post.new_record?}
-= form.text_field :slug, :data => {:slug => true}
-= form.text_field :author
-= form.text_area :content, :data => {'cms-rich-text' => true}
-= form.text_area :excerpt, :class => 'short'
-= form.text_field :published_at, :value => @post.published_at.try(:to_s, :db), :data => {'cms-datetime' => true}
-= form.form_group :is_published do
-  = form.check_box :is_published
-
-= form.form_group :class => 'form-actions' do
-  = form.submit :class => 'btn btn-primary'
+= comfy_admin_partial "comfy/admin/blog/partials/post_form_before", form: form
+
+= form.text_field :title, data: {slugify: @post.new_record?}
+= form.text_field :slug, data: {slug: true}
+
+- if (options = ::Comfy::Cms::Layout.options_for_select(@site)).present?
+  = form.select :layout_id, options, {}, {data: {url: form_fragments_comfy_admin_cms_site_page_path(@site, @post.id.to_i)}, id: "fragments-toggle"}
+
+= render "comfy/admin/cms/pages/form_fragments", form: form, record: @post
+
+= render 'comfy/admin/cms/categories/form', form: form
+
+= form.text_field :published_at, value: @post.published_at.try(:to_s, :db), data: {'cms-datetime' => true}
+
+.row
+  .col-sm-10.ml-auto
+    = form.check_box :is_published
+
+= comfy_admin_partial "comfy/admin/blog/partials/post_form_after", form: form
+
+= form.form_actions do
+  = form.submit t(@post.new_record?? '.create' : '.update'), class: "btn btn-primary"
+  = link_to t('.cancel'), comfy_admin_blog_posts_path(@site, @blog), class: 'btn btn-link'