comfy_blog 0.1.8 → 1.0.0

data/app/views/admin/blog/posts/new.html.haml

@@ -0,0 +1,5 @@
+.page-header
+  %h2 New Blog Post
+
+= comfy_form_for @post, :as => :post, :url => {:action => :create} do |form|
+  = render form

data/app/views/blog/comments/_form.html.haml

@@ -0,0 +1,10 @@
+= formatted_form_for @comment, :url => blog_comments_path(@cms_site.path, @blog.path, @post.slug) do |form|
+  
+  -# don't need this when installed into your app
+  = form.hidden_field :authenticity_token, :value => form_authenticity_token
+  
+  = form.text_field :author
+  = form.text_field :email
+  = form.text_area :content
+  
+  = form.submit 'Submit'

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

@@ -0,0 +1,13 @@
+%h1 Blog Posts
+
+- @posts.each do |post|
+  
+  %h1= link_to post.title, blog_post_path(@cms_site.path, @blog.path, post.slug)
+  .author
+    = post.author
+  .date
+    = post.published_at.to_s(:db)
+  .content
+    = post.content.html_safe
+  
+= paginate @posts

data/app/views/blog/posts/index.rss.builder

@@ -1,17 +1,19 @@
 xml.instruct! :xml, :version => '1.0'
 xml.rss :version => '2.0' do
   xml.channel do
-    xml.title ComfyBlog.config.title
-    xml.description ComfyBlog.config.description
-    xml.link request.url
+    xml.title @blog.label
+    xml.description @blog.description
+    xml.link blog_posts_url(@cms_site.path, @blog.path)
     
     @posts.each do |post|
+      url = blog_post_url(@cms_site.path, @blog.path, post.slug)
+      
       xml.item do
         xml.title post.title
         xml.description post.content
         xml.pubDate post.created_at.to_s(:rfc822)
-        xml.link blog_post_url(post)
-        xml.guid blog_post_url(post)
+        xml.link url
+        xml.guid url
       end
     end
   end

data/app/views/blog/posts/show.html.haml

@@ -0,0 +1,18 @@
+%h1 Blog Post
+
+%h1= @post.title
+
+.author
+  = @post.author
+.date
+  = @post.published_at.to_s(:db)
+.content
+  = @post.content.html_safe
+
+.comments
+  - @post.comments.published.each do |comment|
+    .comment
+      .author= comment.author
+      .content= comment.content
+  
+  = render :partial => 'blog/comments/form'

data/app/views/layouts/blog/application.html.haml

@@ -0,0 +1,7 @@
+!!!
+%html
+  %head
+    %title Comfy Blog
+  %body
+    = yield
+    

data/comfy_blog.gemspec

@@ -1,133 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = "comfy_blog"
-  s.version = "0.1.8"
+require 'comfy_blog/version'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Oleg Khabarov", "The Working Group Inc."]
-  s.date = "2012-05-09"
-  s.description = ""
-  s.email = "oleg@twg.ca"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    "Gemfile",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "app/assets/images/rails.png",
-    "app/assets/javascripts/application.js",
-    "app/controllers/admin/blog/base_controller.rb",
-    "app/controllers/admin/blog/comments_controller.rb",
-    "app/controllers/admin/blog/posts_controller.rb",
-    "app/controllers/admin/blog/tags_controller.rb",
-    "app/controllers/application_controller.rb",
-    "app/controllers/blog/comments_controller.rb",
-    "app/controllers/blog/posts_controller.rb",
-    "app/helpers/blog/application_helper.rb",
-    "app/models/.gitkeep",
-    "app/models/blog/comment.rb",
-    "app/models/blog/post.rb",
-    "app/models/blog/tag.rb",
-    "app/models/blog/tagging.rb",
-    "app/views/admin/blog/_navigation.html.erb",
-    "app/views/admin/blog/comments/_comment.html.erb",
-    "app/views/admin/blog/comments/destroy.js.erb",
-    "app/views/admin/blog/comments/index.html.erb",
-    "app/views/admin/blog/comments/publish.js.erb",
-    "app/views/admin/blog/posts/_form.html.erb",
-    "app/views/admin/blog/posts/_post.html.erb",
-    "app/views/admin/blog/posts/edit.html.erb",
-    "app/views/admin/blog/posts/index.html.erb",
-    "app/views/admin/blog/posts/new.html.erb",
-    "app/views/admin/blog/tags/_form.html.erb",
-    "app/views/admin/blog/tags/_tag.html.erb",
-    "app/views/admin/blog/tags/edit.html.erb",
-    "app/views/admin/blog/tags/index.html.erb",
-    "app/views/admin/blog/tags/new.html.erb",
-    "app/views/blog/comments/_comment.html.erb",
-    "app/views/blog/comments/_disqus.html.erb",
-    "app/views/blog/comments/_form.html.erb",
-    "app/views/blog/comments/create.js.erb",
-    "app/views/blog/posts/_post.html.erb",
-    "app/views/blog/posts/index.html.erb",
-    "app/views/blog/posts/index.rss.builder",
-    "app/views/blog/posts/show.html.erb",
-    "app/views/layouts/application.html.erb",
-    "comfy_blog.gemspec",
-    "config.ru",
-    "config/application.rb",
-    "config/boot.rb",
-    "config/database.yml",
-    "config/environment.rb",
-    "config/environments/development.rb",
-    "config/environments/test.rb",
-    "config/initializers/comfy_blog.rb",
-    "config/initializers/secret_token.rb",
-    "config/locales/en.yml",
-    "config/routes.rb",
-    "db/migrate/01_create_comfy_blog.rb",
-    "db/schema.rb",
-    "db/seeds.rb",
-    "lib/comfy_blog.rb",
-    "lib/comfy_blog/configuration.rb",
-    "lib/comfy_blog/core_ext/string.rb",
-    "lib/comfy_blog/engine.rb",
-    "lib/comfy_blog/form_builder.rb",
-    "lib/generators/comfy/blog/README",
-    "lib/generators/comfy/blog/blog_generator.rb",
-    "lib/tasks/comfy_blog.rake",
-    "script/rails",
-    "test/fixtures/.gitkeep",
-    "test/fixtures/blog/comments.yml",
-    "test/fixtures/blog/posts.yml",
-    "test/fixtures/blog/taggings.yml",
-    "test/fixtures/blog/tags.yml",
-    "test/functional/.gitkeep",
-    "test/functional/admin/blog/comments_controller_test.rb",
-    "test/functional/admin/blog/posts_controller_test.rb",
-    "test/functional/admin/blog/tags_controller_test.rb",
-    "test/functional/blog/comments_controller_test.rb",
-    "test/functional/blog/posts_controller_test.rb",
-    "test/integration/routing_test.rb",
-    "test/test_helper.rb",
-    "test/unit/.gitkeep",
-    "test/unit/comment_test.rb",
-    "test/unit/configuration_test.rb",
-    "test/unit/helpers/blog/application_helper_test.rb",
-    "test/unit/post_test.rb",
-    "test/unit/tag_test.rb",
-    "test/unit/tagging_test.rb"
-  ]
-  s.homepage = "http://github.com/comfy/comfy-blog"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
-  s.summary = "ComfyBlog is a blog engine for Rails 3.1 apps (and ComfortableMexicanSofa)"
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = 'comfy_blog'
+  s.version     = ComfyBlog::VERSION
+  s.authors     = ["Oleg Khabarov", "The Working Group Inc"]
+  s.email       = ["oleg@khabarov.ca"]
+  s.homepage    = "http://github.com/comfy/comfy-blog"
+  s.summary     = "Simple Blog Engine for ComfortableMexicanSofa"
+  s.description = "Simple Blog Engine for ComfortableMexicanSofa"
+  s.license     = 'MIT'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.platform      = Gem::Platform::RUBY
+  s.require_paths = ['lib']
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
-      s.add_runtime_dependency(%q<rails_autolink>, [">= 1.0.4"])
-      s.add_runtime_dependency(%q<jquery-rails>, [">= 1.0.0"])
-    else
-      s.add_dependency(%q<rails>, [">= 3.1.0"])
-      s.add_dependency(%q<rails_autolink>, [">= 1.0.4"])
-      s.add_dependency(%q<jquery-rails>, [">= 1.0.0"])
-    end
-  else
-    s.add_dependency(%q<rails>, [">= 3.1.0"])
-    s.add_dependency(%q<rails_autolink>, [">= 1.0.4"])
-    s.add_dependency(%q<jquery-rails>, [">= 1.0.0"])
-  end
+  s.add_dependency 'comfortable_mexican_sofa', '>= 1.10.0'
 end
-

data/config.ru

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

data/config/application.rb

@@ -2,32 +2,18 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+# Assets should be precompiled for production (so we don't need the gems loaded then)
+Bundler.require(*Rails.groups(assets: %w(development test)))
 
 module ComfyBlog
   class Application < Rails::Application
     
-    require 'comfy_blog'
+    require_relative '../lib/comfy_blog'
     
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -35,14 +21,8 @@ module ComfyBlog
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
+    
+    # Making sure we don't load our dev routes as part of the engine
+    config.paths['config/routes.rb'] << 'config/blog_routes.rb'
   end
 end

data/config/blog_routes.rb

@@ -0,0 +1,6 @@
+ComfyBlog::Application.routes.draw do
+  ComfortableMexicanSofa::Routing.admin
+  ComfyBlog::Routing.admin
+  ComfyBlog::Routing.content
+  ComfortableMexicanSofa::Routing.content :sitemap => true
+end

data/config/boot.rb

@@ -1,6 +1,5 @@
-require 'rubygems'
-
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+File.exists?(ENV['BUNDLE_GEMFILE'])

data/config/database.yml

@@ -1,25 +1,11 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
 development:
   adapter: sqlite3
   database: db/development.sqlite3
   pool: 5
-  timeout: 5000
+  timeout: 10000
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   adapter: sqlite3
   database: db/test.sqlite3
   pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+  timeout: 10000

data/config/environments/development.rb

@@ -1,33 +1,27 @@
 defined?(ComfyBlog::Application) && ComfyBlog::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
+  # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
 
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-  config.assets.allow_debugging = true
-
-  # Expands the lines which load the assets
+  # Debug mode disables concatenation and preprocessing of assets.
   config.assets.debug = true
 end

data/config/environments/test.rb

@@ -1,42 +1,36 @@
 defined?(ComfyBlog::Application) && ComfyBlog::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure static asset server for tests with Cache-Control for performance.
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
-
-  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-  config.assets.allow_debugging = true
 end

data/config/initializers/comfy_blog.rb

@@ -1,20 +1,5 @@
 ComfyBlog.configure do |config|
   
-  # set the cms admin path if you have changed it for CMS
-  #   config.admin_route_prefix = 'admin'
-  
-  # Controller that should be used for admin area
-  #   config.admin_controller = 'ApplicationController'
-  
-  # Form builder
-  #   config.form_builder = 'ComfyBlog::FormBuilder'
-  
-  # Set the public path if you have changed it
-  #   config.public_route_prefix = ''
-
-  # Layout used for public posts/comments
-  #   config.public_layout = 'application'
-  
   # Number of posts per page. Default is 10
   #   config.posts_per_page = 10
   
@@ -22,4 +7,4 @@ ComfyBlog.configure do |config|
   # Default is false.
   #   config.auto_publish_comments = false
   
-end
+end