comfy_blog 0.1.8 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 1aeff81384f3fb903b4190874469788c842ec0c5
+  data.tar.gz: 9e7902e544405cc03be7201f28eee0df4958b2fe
+!binary "U0hBNTEy":
+  metadata.gz: c02614684124b20d5b3015b4014e985269878e9c7fb0b5a85000565fe1d826694d02cd9a9b39ef3b04509e9e10901964bd191414d5c5f256bea09663a0abff0d
+  data.tar.gz: f8666a836b87ee8a5cc3a54a798d63a57060ac6536e7815b7c24305e23baa0402f5234377b1c9e33595cfa75c91ed79c99669231f3a693a130c560000d271371

data/.gitignore

@@ -0,0 +1,16 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/**/*
+.DS_Store
+db/schema.rb
+db/development_structure.sql
+pkg
+rdoc
+/tmp
+public/*
+Gemfile.lock
+.rvmrc
+.ruby-version
+/.sass-cache
+coverage/

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0
+before_script:
+  - 'rake db:migrate'
+script:
+  - rake test:all
+branches:
+  only:
+    - master

data/Gemfile

@@ -1,13 +1,15 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '>=3.1.0'
-gem 'rails_autolink', '>=1.0.4'
-gem 'jquery-rails',   '>=1.0.0'
+gemspec
 
-# gem 'will_paginate',  '>=3.0.2'
-# gem 'kaminari',       '>=0.0.0'
+group :development do
+  gem 'awesome_print'
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  gem 'quiet_assets'
+end
 
 group :test do
   gem 'sqlite3'
-  gem 'jeweler'
+  gem 'coveralls', :require => false
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Oleg Khabarov, The Working Group
+Copyright 2013 Oleg Khabarov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,70 +1,36 @@
-# ComfyBlog [![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)
+# 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 is an simple blog management engine for Rails 3.1 apps. It also integrates with [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) CMS Engine
+ComfyBlog is an simple blog management engine for [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) (for version >= 1.10).
+
+## Features
+
+* Ability to set up multiple blogs per site
+* User defined layout per blog
 
 ## Installation
 
 Add gem definition to your Gemfile:
-    
-    gem 'comfy_blog'
-    
+
+```ruby
+gem 'comfy_blog', '~> 1.0.0'
+```
+
 Then from the Rails project's root run:
     
     bundle install
-    rails g comfy:blog
+    rails generate comfy:blog
     rake db:migrate
     
-Now you should be able to go to `/admin/blog/posts` and add new blog posts.
-
-## Configuration
-
-First thing you want to do is change title and description of the blog.
-For that you need to adjust `comfy_blog` initializer.
-
-    config.title        = 'ComfyBlog'
-    config.description  = 'A Simple Blog'
-
-You'll notice that you can access blog's admin area without any type of authentication.
-This is because ComfyBlog doesn't deal with users, it only knows how to save and show 
-blog posts. You probably want to put blog's admin controllers behind your controller
-that handles authentication. 
-    
-    config.admin_controller = 'YourAdminBaseController'
-    
-If you want blog's controller paths to match your admin path, like `cms-admin`. Change
-the following configuration.
-    
-    config.admin_route_prefix = 'cms-admin'
-    
-By default blog posts are served from the root. If you want to section off blog content
-to a `/blog` path. Adjust this configuration:
-    
-    config.public_route_prefix = 'blog'
-    
-Provided views to display blog posts are pretty basic and you'll probably want to change
-them right away. You can change the layout from the default `application` to something else.
-    
-    config.public_layout = 'blog'
-    
-Since ComfyBlog is an engine, it allows you to completely overwrite views. It's enough to
-create `app/views/blog/posts/index.html.erb` (could be HAML or whatever you want) and structure
-it in any way you want. There's also `show.html.erb` and `_post.html.erb` available.
-    
-Pagination is done using either [WillPaginate](https://github.com/mislav/will_paginate) or [Kaminari](https://github.com/amatsuda/kaminari). Add either in your Gemfile.
-You can control number of posts per page by adjusting this config:
-    
-    config.posts_per_page = 10
-    
-Posted comments will be sitting in the queue waiting to be published. You can auto publish them
-by setting this to `true`:
-
-    config.auto_publish_comments = true
-    
-You can use Disqus to manage comments by setting the following config:
+Take a look inside your `config/routes.rb` file and you should see following lines there:
 
-    config.disqus_shortname = 'forum_shortname'
+```ruby
+ComfyBlog::Routing.admin   :path => 'admin'
+ComfyBlog::Routing.content :path => 'blog'
+```
 
+You should also find view templates in `/app/views/blog` folder. Feel free to adjust them as you see fit.
 
-ComfyBlog is released under the [MIT license](https://github.com/comfy/comfy-blog/raw/master/LICENSE) 
+---
 
-Copyright 2012 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)
+Copyright 2009-2013 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)

data/Rakefile

@@ -1,21 +1,24 @@
-require File.expand_path('../config/application', __FILE__)
-require 'rubygems'
-require 'rake'
+require_relative 'config/application'
 
 ComfyBlog::Application.load_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name        = 'comfy_blog'
-    gem.homepage    = 'http://github.com/comfy/comfy-blog'
-    gem.license     = 'MIT'
-    gem.summary     = 'ComfyBlog is a blog engine for Rails 3.1 apps (and ComfortableMexicanSofa)'
-    gem.description = ''
-    gem.email       = 'oleg@twg.ca'
-    gem.authors     = ['Oleg Khabarov', 'The Working Group Inc.']
+namespace :test do
+  
+  Rake::TestTask.new(:lib) do |t|
+    t.libs << 'test'
+    t.pattern = 'test/lib/**/*_test.rb'
+    t.verbose = true
   end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  
+  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

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

@@ -1,3 +1,12 @@
-class Admin::Blog::BaseController < ComfyBlog.config.admin_controller.to_s.constantize
-  # ...
+class Admin::Blog::BaseController < Admin::Cms::BaseController
+
+protected
+
+  def load_blog
+    @blog = @site.blogs.find(params[:blog_id] || params[:id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = 'Blog not found'
+    redirect_to admin_blogs_path(@site)
+  end
+  
 end

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

@@ -0,0 +1,51 @@
+class Admin::Blog::BlogsController < 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])
+  end
+  
+  def new
+    render
+  end
+  
+  def edit
+    render
+  end
+
+  def create
+    @blog.save!
+    flash[:success] = 'Blog created'
+    redirect_to :action => :edit, :id => @blog
+  rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to create Blog'
+    render :action => :new
+  end
+
+  def update
+    @blog.update_attributes!(blog_params)
+    flash[:success] = 'Blog updated'
+    redirect_to :action => :edit, :id => @blog
+  rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = 'Failed to update Blog'
+    render :action => :edit
+  end
+
+  def destroy
+    @blog.destroy
+    flash[:success] = 'Blog deleted'
+    redirect_to :action => :index
+  end
+
+protected
+  
+  def build_blog
+    @blog = @site.blogs.new(blog_params)
+  end
+  
+  def blog_params
+    params.fetch(:blog, {}).permit!
+  end
+end

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

@@ -1,34 +1,33 @@
 class Admin::Blog::CommentsController < Admin::Blog::BaseController
   
-  before_filter :load_post,     :only => [:index]
-  before_filter :load_comment,  :only => [:destroy, :publish]
+  before_action :load_blog
+  before_action :load_comment, :only => [:destroy, :toggle_publish]
   
   def index
-    @comments = @post ? @post.comments : Blog::Comment.all
+    @comments = if @post = @blog.posts.where(:id => params[:post_id]).first
+      @post.comments.page(params[:page])
+    else
+      @blog.comments.page(params[:page])
+    end
   end
-  
+
   def destroy
     @comment.destroy
+    flash[:success] = 'Comment deleted'
+    redirect_to :action => :index
   end
   
-  def publish
-    @comment.update_attribute(:is_published, true)
+  def toggle_publish
+    @comment.update_attribute(:is_published, !@comment.is_published?)
   end
-  
+
 protected
   
-  def load_post
-    return unless params[:post_id]
-    @post = Blog::Post.find(params[:post_id])
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = 'Blog Post not found'
-    redirect_to :action => :index
-  end
-  
   def load_comment
-    @comment = Blog::Comment.find(params[:id])
+    @comment = @blog.comments.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    # ... do nothing
+    flash[:error] = 'Comment not found'
+    redirect_to :action => :index
   end
   
 end

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

@@ -1,63 +1,63 @@
 class Admin::Blog::PostsController < Admin::Blog::BaseController
   
-  before_filter :build_post, :only => [:new, :create]
-  before_filter :load_post,  :only => [:edit, :update, :destroy]
-  
+  before_action :load_blog
+  before_action :build_post, :only => [:new, :create]
+  before_action :load_post,  :only => [:edit, :update, :destroy]
+
   def index
-    @posts = if defined? WillPaginate
-      Blog::Post.paginate :page => params[:page]
-    elsif defined? Kaminari
-      Blog::Post.page params[:page]
-    else
-      Blog::Post.all
-    end
+    @posts = @blog.posts.order(:published_at).page(params[:page])
   end
-  
+
   def new
     render
   end
-  
+
   def create
     @post.save!
-    flash[:notice] = 'Blog Post created'
+    flash[:success] = 'Blog Post created'
     redirect_to :action => :edit, :id => @post
-    
+
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to create Blog Post'
     render :action => :new
   end
-  
+
   def edit
     render
   end
-  
+
   def update
-    @post.update_attributes!(params[:post])
-    flash[:notice] = 'Blog Post updated'
+    @post.update_attributes!(post_params)
+    flash[:success] = 'Blog Post updated'
     redirect_to :action => :edit, :id => @post
-    
+
   rescue ActiveRecord::RecordInvalid
     flash.now[:error] = 'Failed to update Blog Post'
     render :action => :edit
   end
-  
+
   def destroy
     @post.destroy
-    flash[:notice] = 'Blog Post removed'
+    flash[:success] = 'Blog Post removed'
     redirect_to :action => :index
   end
-  
+
 protected
-  
+
   def load_post
-    @post = Blog::Post.find(params[:id])
+    @post = @blog.posts.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     flash[:error] = 'Blog Post not found'
     redirect_to :action => :index
   end
-  
+
   def build_post
-    @post = Blog::Post.new(params[:post])
+    @post = @blog.posts.new(post_params)
+    @post.published_at ||= Time.zone.now
   end
   
+  def post_params
+    params.fetch(:post, {}).permit!
+  end
+
 end

data/app/controllers/blog/base_controller.rb

@@ -0,0 +1,31 @@
+class Blog::BaseController < Cms::BaseController
+  
+  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