sofa_blog 0.0.1 → 0.1.0

data/config/initializers/wrap_parameters.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters format: [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"

data/config/routes.rb

@@ -1,14 +1,19 @@
 Rails.application.routes.draw do
+  
+  namespace :sofa_blog, :path => '' do
 
-  namespace :cms_admin, :path => ComfortableMexicanSofa.config.admin_route_prefix do
-    resources :blog_posts do
-      resources :blog_comments do
-        member do
-          put :approve
-          put :disapprove
+    resources :posts, :only => [:show, :index]
+    
+    namespace :admin, :path => SofaBlog.config.admin_route_prefix do
+      resources :posts do
+        resources :comments do
+          member do
+            put :approve
+            put :disapprove
+          end
         end
       end
-    end
-  end
+    end unless SofaBlog.config.admin_route_prefix.blank?
+  end 
   
-end
+end

data/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run SofaBlog::Application

data/db/migrate/01_create_sofa_blog.rb

@@ -1,50 +1,51 @@
 class CreateSofaBlog < ActiveRecord::Migration
+  
   def self.up
-    create_table :blog_posts do |t|
+    create_table :sofa_blog_posts do |t|
       t.string  :title
       t.text    :content
       t.string  :author
-      t.boolean :published, :null => false, :default => false
-      t.integer :comments_count, :null => false, :default => 0
+      t.boolean :is_published,    :null => false, :default => false
+      t.integer :comments_count,  :null => false, :default => 0
       t.integer :approved_comments_count, :null => false, :default => 0
       t.timestamps
     end
-    add_index :blog_posts, [:published, :title]
-    add_index :blog_posts, [:title, :published]
-    
+    add_index :sofa_blog_posts, :created_at
+    add_index :sofa_blog_posts, [:is_published, :created_at]
     
-    create_table :blog_comments do |t|
-      t.integer :blog_post_id
-      t.string :name
-      t.string :email
-      t.text :content
-      t.boolean :approved, :null => false, :default => false
+    create_table :sofa_blog_comments do |t|
+      t.integer :post_id
+      t.string  :name
+      t.string  :email
+      t.text    :content
+      t.boolean :is_approved, :null => false, :default => false
       t.timestamps
     end
-    add_index :blog_comments, :blog_post_id
-    
-    
-    create_table :blog_tags do |t|
+    add_index :sofa_blog_comments, [:post_id, :created_at]
+    add_index :sofa_blog_comments, [:post_id, :is_approved, :created_at],
+      :name => 'index_sofa_blog_comments_on_post_and_approved_and_created_at'
+      
+    create_table :sofa_blog_tags do |t|
       t.string :name
-      t.integer :blog_taggings_count
+      t.integer :taggings_count
     end
-    add_index :blog_tags, [:name, :blog_taggings_count], :unique => true
-    add_index :blog_tags, :blog_taggings_count
+    add_index :sofa_blog_tags, [:name, :taggings_count], :unique => true
+    add_index :sofa_blog_tags, :taggings_count
 
 
-    create_table :blog_taggings do |t|
-      t.integer :blog_post_id
-      t.integer :blog_tag_id
+    create_table :sofa_blog_taggings do |t|
+      t.integer :post_id
+      t.integer :tag_id
       t.datetime :created_at
     end
-    add_index :blog_taggings, [:blog_post_id, :blog_tag_id, :created_at], :unique => true, :name => 'index_blog_taggings_on_post_id_tag_id_created_at'
-    
+    add_index :sofa_blog_taggings, [:post_id, :tag_id, :created_at], :unique => true, :name => 'index_sofa_blog_taggings_on_post_id_tag_id_created_at'
+  
   end
   
   def self.down
-    drop_table :blog_posts
-    drop_table :blog_comments
-    drop_table :blog_tags
-    drop_table :blog_taggings
+    drop_table :sofa_blog_posts
+    drop_table :sofa_blog_comments
+    drop_table :sofa_blog_tags
+    drop_table :sofa_blog_taggings
   end
 end

data/db/schema.rb

@@ -0,0 +1,59 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 1) do
+
+  create_table "sofa_blog_comments", :force => true do |t|
+    t.integer  "post_id"
+    t.string   "name"
+    t.string   "email"
+    t.text     "content"
+    t.boolean  "is_approved", :default => false, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "sofa_blog_comments", ["post_id", "created_at"], :name => "index_sofa_blog_comments_on_post_id_and_created_at"
+  add_index "sofa_blog_comments", ["post_id", "is_approved", "created_at"], :name => "index_sofa_blog_comments_on_post_and_approved_and_created_at"
+
+  create_table "sofa_blog_posts", :force => true do |t|
+    t.string   "title"
+    t.text     "content"
+    t.string   "author"
+    t.boolean  "is_published",            :default => false, :null => false
+    t.integer  "comments_count",          :default => 0,     :null => false
+    t.integer  "approved_comments_count", :default => 0,     :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "sofa_blog_posts", ["created_at"], :name => "index_sofa_blog_posts_on_created_at"
+  add_index "sofa_blog_posts", ["is_published", "created_at"], :name => "index_sofa_blog_posts_on_is_published_and_created_at"
+
+  create_table "sofa_blog_taggings", :force => true do |t|
+    t.integer  "post_id"
+    t.integer  "tag_id"
+    t.datetime "created_at"
+  end
+
+  add_index "sofa_blog_taggings", ["post_id", "tag_id", "created_at"], :name => "index_sofa_blog_taggings_on_post_id_tag_id_created_at", :unique => true
+
+  create_table "sofa_blog_tags", :force => true do |t|
+    t.string  "name"
+    t.integer "taggings_count"
+  end
+
+  add_index "sofa_blog_tags", ["name", "taggings_count"], :name => "index_sofa_blog_tags_on_name_and_taggings_count", :unique => true
+  add_index "sofa_blog_tags", ["taggings_count"], :name => "index_sofa_blog_tags_on_taggings_count"
+
+end

data/db/seeds.rb

@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+#   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
+#   Mayor.create(name: 'Emanuel', city: cities.first)

data/lib/sofa_blog/configuration.rb

@@ -0,0 +1,21 @@
+module SofaBlog
+  class Configuration
+    # Default url to access admin area is http://yourhost/cms-admin/ 
+    # You can change 'cms-admin' to 'admin', for example.
+    attr_accessor :admin_route_prefix
+    
+    # Controller that should be used for admin area
+    attr_accessor :admin_controller
+    
+    # Form builder
+    attr_accessor :form_builder
+    
+    # Configuration defaults
+    def initialize
+      @admin_route_prefix = 'admin'
+      @admin_controller   = 'ApplicationController'
+      @form_builder       = 'SofaBlog::FormBuilder'
+    end
+    
+  end
+end

data/lib/sofa_blog/engine.rb

@@ -1,17 +1,20 @@
+require 'sofa_blog'
 require 'rails'
-require 'comfortable_mexican_sofa'
-require "sofa_blog"
-require "rails"
 
 module SofaBlog
   class Engine < Rails::Engine
-    initializer 'sofa_blog' do |app|
-      ComfortableMexicanSofa::ViewHooks.add(:navigation, 'sofa_blog/nav')
-      ComfortableMexicanSofa::ViewHooks.add(:html_head, 'sofa_blog/head')
-      
-      ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :blog => [
-        'comfortable_mexican_sofa/blog/content'
-      ]
+    initializer 'sofa_blog.configuration' do |app|
+      if defined?(ComfortableMexicanSofa)
+        # Applying configuraion
+        SofaBlog.configure do |conf|
+          conf.admin_route_prefix = ComfortableMexicanSofa.config.admin_route_prefix
+          conf.admin_controller = 'CmsAdmin::BaseController'
+          conf.form_builder = 'ComfortableMexicanSofa::FormBuilder'
+        end
+        # Adding view hooks
+        ComfortableMexicanSofa::ViewHooks.add(:navigation, '/sofa_blog/admin/navigation')
+        ComfortableMexicanSofa::ViewHooks.add(:html_head, '/sofa_blog/admin/html_head')
+      end
     end
   end
 end

data/lib/sofa_blog/form_builder.rb

@@ -0,0 +1,50 @@
+class SofaBlog::FormBuilder < ActionView::Helpers::FormBuilder
+  
+  helpers = field_helpers -
+    %w(hidden_field fields_for) +
+    %w(select)
+    
+  helpers.each do |name|
+    class_eval %Q^
+      def #{name}(field, *args)
+        options = args.extract_options!
+        args << options
+        return super if options.delete(:disable_builder)
+        default_field('#{name}', field, options){ super }
+      end
+    ^
+  end
+  
+  def default_field(type, field, options = {}, &block)
+    errors = if object.respond_to?(:errors) && object.errors[field].present?
+      "<div class='errors'>#{[object.errors[field]].flatten.first}</div>"
+    end
+    if desc = options.delete(:desc)
+      desc = "<div class='desc'>#{desc}</div>"
+    end
+    %(
+      <div class='form_element #{type}_element #{'errors' if errors}'>
+        <div class='label'>#{label_for(field, options)}</div>
+        <div class='value'>#{yield}</div>
+        #{desc}
+        #{errors}
+      </div>
+    ).html_safe
+  end
+  
+  def label_for(field, options)
+    label = options.delete(:label) || field.to_s.titleize.capitalize
+    "<label for=\"#{object_name}_#{field}\">#{label}</label>".html_safe
+  end
+  
+  def simple_field(label = nil, content = nil, options = {}, &block)
+    content ||= @template.capture(&block) if block_given?
+    %(
+      <div class='form_element #{options.delete(:class)}'>
+        <div class='label'>#{label}</div>
+        <div class='value'>#{content}</div>
+      </div>
+    ).html_safe
+  end
+  
+end

data/lib/sofa_blog.rb

@@ -1,3 +1,22 @@
-module SofaBlog
-  require 'sofa_blog/engine' if defined?(Rails)
+# Loading engine only if this is not a standalone installation
+unless defined? SofaBlog::Application
+  require File.expand_path('sofa_blog/engine', File.dirname(__FILE__))
 end
+
+require File.expand_path('sofa_blog/configuration', File.dirname(__FILE__))
+require File.expand_path('sofa_blog/form_builder', File.dirname(__FILE__))
+
+module SofaBlog
+  class << self
+    
+    def configure
+      yield configuration
+    end
+    
+    def configuration
+      @configuration ||= Configuration.new
+    end
+    alias :config :configuration
+    
+  end
+end

data/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/sofa_blog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sofa_blog}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jack Neto", "The Working Group Inc"]
-  s.date = %q{2011-02-27}
+  s.authors = ["Jack Neto", "The Working Group Inc."]
+  s.date = %q{2011-10-07}
   s.description = %q{}
   s.email = %q{jack@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -17,72 +17,114 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
-    ".DS_Store",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",
     "README.md",
     "Rakefile",
     "VERSION",
-    "app/.DS_Store",
-    "app/controllers/cms_admin/blog_comments_controller.rb",
-    "app/controllers/cms_admin/blog_posts_controller.rb",
-    "app/models/blog_comment.rb",
-    "app/models/blog_post.rb",
-    "app/models/blog_tag.rb",
-    "app/models/blog_tagging.rb",
-    "app/views/.DS_Store",
-    "app/views/cms_admin/blog_comments/_blog_comment.html.erb",
-    "app/views/cms_admin/blog_comments/_form.html.erb",
-    "app/views/cms_admin/blog_comments/_status.html.erb",
-    "app/views/cms_admin/blog_comments/approve.rjs",
-    "app/views/cms_admin/blog_comments/disapprove.rjs",
-    "app/views/cms_admin/blog_comments/edit.html.erb",
-    "app/views/cms_admin/blog_comments/index.html.erb",
-    "app/views/cms_admin/blog_comments/new.html.erb",
-    "app/views/cms_admin/blog_posts/_blog_post.html.erb",
-    "app/views/cms_admin/blog_posts/_form.html.erb",
-    "app/views/cms_admin/blog_posts/edit.html.erb",
-    "app/views/cms_admin/blog_posts/index.html.erb",
-    "app/views/cms_admin/blog_posts/new.html.erb",
-    "app/views/sofa_blog/_head.html.erb",
-    "app/views/sofa_blog/_nav.html.erb",
-    "config/.DS_Store",
+    "app/assets/images/rails.png",
+    "app/assets/javascripts/sofa_blog/application.js",
+    "app/assets/javascripts/sofa_blog/jquery.autocomplete.js",
+    "app/assets/javascripts/sofa_blog/posts.js",
+    "app/assets/stylesheets/sofa_blog/admin.css",
+    "app/assets/stylesheets/sofa_blog/application.css",
+    "app/assets/stylesheets/sofa_blog/reset.css",
+    "app/controllers/application_controller.rb",
+    "app/controllers/sofa_blog/admin/base_controller.rb",
+    "app/controllers/sofa_blog/admin/comments_controller.rb",
+    "app/controllers/sofa_blog/admin/posts_controller.rb",
+    "app/controllers/sofa_blog/posts_controller.rb",
+    "app/helpers/sofa_blog/posts_helper.rb",
+    "app/helpers/sofa_blog_helper.rb",
+    "app/models/.gitkeep",
+    "app/models/sofa_blog/comment.rb",
+    "app/models/sofa_blog/post.rb",
+    "app/models/sofa_blog/tag.rb",
+    "app/models/sofa_blog/tagging.rb",
+    "app/views/layouts/application.html.erb",
+    "app/views/sofa_blog/admin/_html_head.html.erb",
+    "app/views/sofa_blog/admin/_navigation.html.erb",
+    "app/views/sofa_blog/admin/comments/_comment.html.erb",
+    "app/views/sofa_blog/admin/comments/_form.html.erb",
+    "app/views/sofa_blog/admin/comments/_status.html.erb",
+    "app/views/sofa_blog/admin/comments/approve.js.erb",
+    "app/views/sofa_blog/admin/comments/disapprove.js.erb",
+    "app/views/sofa_blog/admin/comments/edit.html.erb",
+    "app/views/sofa_blog/admin/comments/index.html.erb",
+    "app/views/sofa_blog/admin/comments/new.html.erb",
+    "app/views/sofa_blog/admin/posts/_form.html.erb",
+    "app/views/sofa_blog/admin/posts/_post.html.erb",
+    "app/views/sofa_blog/admin/posts/edit.html.erb",
+    "app/views/sofa_blog/admin/posts/index.html.erb",
+    "app/views/sofa_blog/admin/posts/new.html.erb",
+    "app/views/sofa_blog/posts/_post.html.erb",
+    "app/views/sofa_blog/posts/index.html.erb",
+    "config.ru",
+    "config/application.rb",
+    "config/boot.rb",
+    "config/database.yml",
+    "config/environment.rb",
+    "config/environments/development.rb",
+    "config/environments/production.rb",
+    "config/environments/test.rb",
+    "config/initializers/secret_token.rb",
+    "config/initializers/sofa_blog.rb",
+    "config/initializers/wrap_parameters.rb",
+    "config/locales/en.yml",
     "config/routes.rb",
     "db/migrate/01_create_sofa_blog.rb",
-    "doc/sofa.png",
-    "lib/generators/README",
-    "lib/generators/blog_generator.rb",
+    "db/schema.rb",
+    "db/seeds.rb",
     "lib/sofa_blog.rb",
+    "lib/sofa_blog/configuration.rb",
     "lib/sofa_blog/engine.rb",
-    "public/javascripts/jquery.autocomplete.pack.js",
-    "public/stylesheets/content.css",
+    "lib/sofa_blog/form_builder.rb",
+    "script/rails",
     "sofa_blog.gemspec",
-    "tmp/application.rb",
-    "tmp/boot.rb",
-    "tmp/environment.rb",
-    "tmp/initializers/formatted_form_builder.rb",
-    "tmp/initializers/wristband.rb"
+    "test/fixtures/.gitkeep",
+    "test/fixtures/sofa_blog/comments.yml",
+    "test/fixtures/sofa_blog/posts.yml",
+    "test/functional/.gitkeep",
+    "test/functional/sofa_blog/admin/comments_controller_test.rb",
+    "test/functional/sofa_blog/admin/posts_controller_test.rb",
+    "test/functional/sofa_blog/posts_controller_test.rb",
+    "test/test_helper.rb",
+    "test/unit/.gitkeep",
+    "test/unit/comment_test.rb",
+    "test/unit/helpers/sofa_blog/posts_helper_test.rb",
+    "test/unit/post_test.rb",
+    "test/unit/tag_test.rb",
+    "test/unit/tagging_test.rb"
   ]
   s.homepage = %q{http://github.com/twg/sofa-blog}
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A blog extension for Comfortable Mexican Sofa}
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{SofaBlog is a blog engine for Rails 3.1 apps (and ComfortableMexicanSofa)}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<comfortable_mexican_sofa>, [">= 1.0.46"])
-      s.add_runtime_dependency(%q<comfortable_mexican_sofa>, [">= 1.0.46"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.1.0.rc8"])
+      s.add_runtime_dependency(%q<rinku>, [">= 1.2.2"])
+      s.add_runtime_dependency(%q<jquery-rails>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<comfortable_mexican_sofa>, [">= 1.0.46"])
-      s.add_dependency(%q<comfortable_mexican_sofa>, [">= 1.0.46"])
+      s.add_dependency(%q<rails>, [">= 3.1.0.rc8"])
+      s.add_dependency(%q<rinku>, [">= 1.2.2"])
+      s.add_dependency(%q<jquery-rails>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<comfortable_mexican_sofa>, [">= 1.0.46"])
-    s.add_dependency(%q<comfortable_mexican_sofa>, [">= 1.0.46"])
+    s.add_dependency(%q<rails>, [">= 3.1.0.rc8"])
+    s.add_dependency(%q<rinku>, [">= 1.2.2"])
+    s.add_dependency(%q<jquery-rails>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/test/fixtures/sofa_blog/comments.yml

@@ -0,0 +1,6 @@
+default:
+  post: default
+  name: Default Name
+  email: default@test.test
+  content: Default Content
+  is_approved: true

data/test/fixtures/sofa_blog/posts.yml

@@ -0,0 +1,7 @@
+default:
+  title: Default Title
+  content: Default Content
+  author: Default Author
+  is_published: true
+  comments_count: 1
+  approved_comments_count: 1

data/test/functional/sofa_blog/admin/comments_controller_test.rb

@@ -0,0 +1,59 @@
+require File.expand_path('../../../test_helper', File.dirname(__FILE__))
+
+class SofaBlog::Admin::CommentsControllerTest < ActionController::TestCase
+  
+  def test_get_index
+    get :index, :post_id => sofa_blog_posts(:default).id
+    assert_response :success
+    assert assigns(:post)
+    assert assigns(:comments)
+    assert_template :index
+  end
+  
+  def test_get_new
+    get :new, :post_id => sofa_blog_posts(:default).id
+    assert_response :success
+    assert assigns(:post)
+    assert assigns(:comment)
+    assert_template :new
+  end
+  
+  def test_creation
+    assert_difference 'SofaBlog::Comment.count' do
+      post :create, :post_id => sofa_blog_posts(:default).id, :comment => {:name => 'John Doe', :email => 'john@test.com', :content => 'New comment'}
+      assert assigns(:post)
+      assert_equal 'Comment created', flash[:notice]
+      assert_redirected_to :action => :index
+    end
+  end
+  
+  def test_creation_failure
+    assert_no_difference 'SofaBlog::Comment.count' do
+      post :create, :post_id => sofa_blog_posts(:default).id, :post => {:name => nil, :email => nil, :content => 'New comment'}
+      assert_response :success
+      assert assigns(:post)
+      assert_template :new
+    end
+  end
+  
+  def test_get_edit
+    get :edit, :post_id => sofa_blog_posts(:default).id, :id => sofa_blog_comments(:default).id
+    assert_response :success
+    assert assigns(:post)
+    assert assigns(:comment)
+    assert_template :edit
+  end
+  
+  def test_get_edit_failure_on_bogus_comment
+    get :edit, :post_id => sofa_blog_posts(:default).id, :id => 'bogus'
+    assert_equal 'Comment not found', flash[:error]
+    assert_redirected_to :action => :index
+  end
+  
+  def test_get_edit_failure_on_bogus_post
+    get :edit, :post_id => 'bogus', :id => 'bogus'
+    assert_equal 'Blog post not found', flash[:error]
+    assert_redirected_to sofa_blog_admin_posts_path
+  end
+
+end