comfy_blog 0.1.2 → 0.1.3

data/README.md

@@ -11,7 +11,7 @@ Add gem definition to your Gemfile:
 Then from the Rails project's root run:
     
     bundle install
-    rails g blog
+    rails g comfy:blog
     rake db:migrate
     
 Now you should be able to go to `/admin/blog/posts` and add new blog posts.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

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

@@ -23,7 +23,7 @@ class Admin::Blog::PostsController < Admin::Blog::BaseController
     redirect_to :action => :edit, :id => @post
     
   rescue ActiveRecord::RecordInvalid
-    flash[:error] = 'Failed to create Blog Post'
+    flash.now[:error] = 'Failed to create Blog Post'
     render :action => :new
   end
   
@@ -37,7 +37,7 @@ class Admin::Blog::PostsController < Admin::Blog::BaseController
     redirect_to :action => :edit, :id => @post
     
   rescue ActiveRecord::RecordInvalid
-    flash[:error] = 'Failed to update Blog Post'
+    flash.now[:error] = 'Failed to update Blog Post'
     render :action => :edit
   end
   

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

@@ -21,7 +21,7 @@ class Admin::Blog::TagsController < Admin::Blog::BaseController
     redirect_to :action => :index
     
   rescue ActiveRecord::RecordInvalid
-    flash[:error] = 'Failed to update Blog Tag'
+    flash.now[:error] = 'Failed to update Blog Tag'
     render :action => :edit
   end
   
@@ -31,7 +31,7 @@ class Admin::Blog::TagsController < Admin::Blog::BaseController
     redirect_to :action => :index
     
   rescue ActiveRecord::RecordInvalid
-    flash[:error] = 'Failed to create Blog Tag'
+    flash.now[:error] = 'Failed to create Blog Tag'
     render :action => :new
   end
   

data/app/views/admin/blog/_navigation.html.erb

@@ -1,2 +1 @@
-<li><%= active_link_to 'Blog posts', admin_blog_posts_path %></li>
-<li><%= active_link_to 'Blog tags', admin_blog_tags_path %></li>
+<li><%= active_link_to 'Blog posts', admin_blog_posts_path %></li>

data/app/views/admin/blog/posts/_form.html.erb

@@ -11,9 +11,9 @@
     <% end %>
   <% end %>
 <% end %>
-<%= form.text_field :tag_names, :label => 'Tags' %>
+<%= form.text_field :tag_names, :label => link_to('Tags', admin_blog_tags_path) %>
+<%= form.text_area :excerpt, :class => 'short' %>
 <%= form.text_area :content, :class => 'rich_text' %>
-<%= form.text_field :excerpt %>
 
 <% if defined?(ComfortableMexicanSofa) %>
   <% content_for :right_column do %>

data/app/views/admin/blog/posts/_post.html.erb

@@ -1,5 +1,6 @@
 <li>
   <div class='item'>
+    <div class='icon'></div>
     <div class='action_links'>
       <% unless ComfyBlog.disqus_enabled? %>
         <%= link_to pluralize(post.comments.count, 'comment'), admin_blog_post_comments_path(post) %>

data/comfy_blog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfy_blog"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   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-01-31"
+  s.date = "2012-02-07"
   s.description = ""
   s.email = "oleg@twg.ca"
   s.extra_rdoc_files = [
@@ -24,9 +24,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/assets/images/rails.png",
     "app/assets/javascripts/application.js",
-    "app/assets/stylesheets/comfy_blog/admin.css",
-    "app/assets/stylesheets/comfy_blog/application.css",
-    "app/assets/stylesheets/comfy_blog/reset.css",
     "app/controllers/admin/blog/base_controller.rb",
     "app/controllers/admin/blog/comments_controller.rb",
     "app/controllers/admin/blog/posts_controller.rb",
@@ -40,7 +37,6 @@ Gem::Specification.new do |s|
     "app/models/blog/post.rb",
     "app/models/blog/tag.rb",
     "app/models/blog/tagging.rb",
-    "app/views/admin/blog/_html_head.html.erb",
     "app/views/admin/blog/_navigation.html.erb",
     "app/views/admin/blog/comments/_comment.html.erb",
     "app/views/admin/blog/comments/destroy.js.erb",
@@ -72,7 +68,6 @@ Gem::Specification.new do |s|
     "config/database.yml",
     "config/environment.rb",
     "config/environments/development.rb",
-    "config/environments/production.rb",
     "config/environments/test.rb",
     "config/initializers/comfy_blog.rb",
     "config/initializers/secret_token.rb",
@@ -87,8 +82,8 @@ Gem::Specification.new do |s|
     "lib/comfy_blog/core_ext/string.rb",
     "lib/comfy_blog/engine.rb",
     "lib/comfy_blog/form_builder.rb",
-    "lib/generators/README",
-    "lib/generators/blog_generator.rb",
+    "lib/generators/comfy/blog/README",
+    "lib/generators/comfy/blog/blog_generator.rb",
     "lib/tasks/comfy_blog.rake",
     "script/rails",
     "test/fixtures/.gitkeep",

data/db/migrate/01_create_comfy_blog.rb

@@ -46,9 +46,9 @@ class CreateComfyBlog < ActiveRecord::Migration
   end
   
   def self.down
-    drop_table :sofa_blog_posts
-    drop_table :sofa_blog_comments
-    drop_table :sofa_blog_tags
-    drop_table :sofa_blog_taggings
+    drop_table :blog_posts
+    drop_table :blog_comments
+    drop_table :blog_tags
+    drop_table :blog_taggings
   end
 end

data/lib/comfy_blog/engine.rb

@@ -13,7 +13,6 @@ module ComfyBlog
         end
         # Adding view hooks
         ComfortableMexicanSofa::ViewHooks.add(:navigation, '/admin/blog/navigation')
-        ComfortableMexicanSofa::ViewHooks.add(:html_head, '/admin/blog/html_head')
       end
     end
   end

data/lib/generators/comfy/blog/blog_generator.rb

@@ -0,0 +1,35 @@
+module Comfy
+  module Generators
+    class BlogGenerator < Rails::Generators::Base
+      require 'rails/generators/active_record'
+      include Rails::Generators::Migration
+      include Thor::Actions
+      
+      source_root File.expand_path('../../../../..', __FILE__) 
+      
+      def generate_migration
+        destination   = File.expand_path('db/migrate/01_create_comfy_blog.rb', self.destination_root)
+        migration_dir = File.dirname(destination)
+        destination   = self.class.migration_exists?(migration_dir, 'create_comfy_blog')
+        
+        if destination
+          puts "\e[0m\e[31mFound existing create_comfy_blog.rb migration. Remove it if you want to regenerate.\e[0m"
+        else
+          migration_template 'db/migrate/01_create_comfy_blog.rb', 'db/migrate/create_comfy_blog.rb'
+        end
+      end
+      
+      def generate_initialization
+        copy_file 'config/initializers/comfy_blog.rb', 'config/initializers/comfy_blog.rb'
+      end
+      
+      def show_readme
+        readme 'lib/generators/comfy/blog/README'
+      end
+      
+      def self.next_migration_number(dirname)
+        ActiveRecord::Generators::Base.next_migration_number(dirname)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfy_blog
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70337561190460 !ruby/object:Gem::Requirement
+  requirement: &70093164285520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70337561190460
+  version_requirements: *70093164285520
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &70337561188860 !ruby/object:Gem::Requirement
+  requirement: &70093164279580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70337561188860
+  version_requirements: *70093164279580
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70337561187720 !ruby/object:Gem::Requirement
+  requirement: &70093164270340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70337561187720
+  version_requirements: *70093164270340
 description: ''
 email: oleg@twg.ca
 executables: []
@@ -60,9 +60,6 @@ files:
 - VERSION
 - app/assets/images/rails.png
 - app/assets/javascripts/application.js
-- app/assets/stylesheets/comfy_blog/admin.css
-- app/assets/stylesheets/comfy_blog/application.css
-- app/assets/stylesheets/comfy_blog/reset.css
 - app/controllers/admin/blog/base_controller.rb
 - app/controllers/admin/blog/comments_controller.rb
 - app/controllers/admin/blog/posts_controller.rb
@@ -76,7 +73,6 @@ files:
 - app/models/blog/post.rb
 - app/models/blog/tag.rb
 - app/models/blog/tagging.rb
-- app/views/admin/blog/_html_head.html.erb
 - app/views/admin/blog/_navigation.html.erb
 - app/views/admin/blog/comments/_comment.html.erb
 - app/views/admin/blog/comments/destroy.js.erb
@@ -108,7 +104,6 @@ files:
 - config/database.yml
 - config/environment.rb
 - config/environments/development.rb
-- config/environments/production.rb
 - config/environments/test.rb
 - config/initializers/comfy_blog.rb
 - config/initializers/secret_token.rb
@@ -123,8 +118,8 @@ files:
 - lib/comfy_blog/core_ext/string.rb
 - lib/comfy_blog/engine.rb
 - lib/comfy_blog/form_builder.rb
-- lib/generators/README
-- lib/generators/blog_generator.rb
+- lib/generators/comfy/blog/README
+- lib/generators/comfy/blog/blog_generator.rb
 - lib/tasks/comfy_blog.rake
 - script/rails
 - test/fixtures/.gitkeep
@@ -161,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4147721177865210323
+      hash: 1119342822693293236
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/assets/stylesheets/comfy_blog/admin.css

@@ -1,57 +0,0 @@
-/* === List items === */
-ul.list.posts li .item .label, 
-ul.list.comments li .item .label {
-  margin-left: 0px ! important;
-}
-ul.list.comments li .item .label .sublabel em {
-  margin-left: 5px;
-}
-ul.list.comments li .item .content {
-  font-size: 11px;
-  font-weight: normal;
-  margin: 5px 0px 0 35px;
-}
-
-/* === Tags === */
-span.tag {
-  font-size: 10px;
-  padding: 1px 5px;
-  background-color: #d5d5d5;
-  border-radius: 2px;
-  -moz-border-radius: 2px;
-}
-
-
-/* === Autocomplete === */
-.ac_results {
-  padding: 0px;
-  border: 1px solid #999;
-  background-color: white;
-  overflow: hidden;
-  z-index: 99999;
-  color: #666;
-  }
-.ac_results ul {
-  width: 100%;
-  list-style-position: outside;
-  list-style: none;
-  padding: 0;
-  margin: 0;
-} 
-.ac_results ul li {
-  margin: 0px;
-  padding: 2px 5px;
-  cursor: default;
-  display: block;
-  font-size: 12px;
-  line-height: 16px;
-  overflow: hidden;
-}
-
-.ac_odd {
-  background-color: #eee;
-}
-.ac_over {
-  background-color: #C4EAF6;
-  color: #000;
-}

data/app/assets/stylesheets/comfy_blog/application.css

@@ -1,73 +0,0 @@
-/*
-= require ./reset
-= require_self
-*/
-
-body {
-  padding: 25px;
-  font: 13px/18px Arial, sans-serif;
-}
-h1 {
-  font: bold 26px/34px Arial, sans-serif;
-  margin-bottom: 15px;
-}
-h2 {
-  font: bold 18px/20px Arial, sans-serif;
-  margin-bottom: 10px;
-}
-a {
-  color: #3875D7;
-  text-decoration: none;
-}
-a:hover {
-  text-decoration: underline;
-}
-table.formatted td, 
-table.formatted th {
-  padding: 2px 5px;
-  border-bottom: 1px dotted #ccc;
-}
-table.formatted th {
-  background-color: #666;
-  color: #fff;
-}
-table.formatted td img {
-  float: left;
-  padding: 2px;
-  margin-right: 2px;
-}
-table.formatted td .sublabel {
-  font-size: 11px;
-  line-height: 11px;
-  color: #888;
-}
-
-.form_element {
-  overflow: hidden;
-  margin-bottom: 5px;
-}
-.form_element .label {
-  width: 125px;
-  float: left;
-  text-align: right;
-}
-.form_element .value,
-.form_element .errors {
-  margin-left: 135px;
-}
-.form_element .value input[type='text'],
-.form_element .value textarea {
-  width: 400px;
-}
-
-.jcrop-holder {
-  margin-bottom: 15px;
-}
-
-.flash{
-  border: 2px solid #ccc;
-  padding: 10px;
-  margin-bottom: 15px;
-  text-align: center;
-}
-

data/app/assets/stylesheets/comfy_blog/reset.css

@@ -1 +0,0 @@
-html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;}

data/app/views/admin/blog/_html_head.html.erb

@@ -1 +0,0 @@
-<%= stylesheet_link_tag 'comfy_blog/admin' %>

data/config/environments/production.rb

@@ -1,51 +0,0 @@
-defined?(ComfyBlog::Application) && ComfyBlog::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # Code is not reloaded between requests
-  config.cache_classes = true
-
-  # Full error reports are disabled and caching is turned on
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
-
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
-
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
-
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
-
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
-
-  # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable threaded mode
-  # config.threadsafe!
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
-  config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
-end

data/lib/generators/blog_generator.rb

@@ -1,31 +0,0 @@
-class BlogGenerator < Rails::Generators::Base
-  require 'rails/generators/active_record'
-  include Rails::Generators::Migration
-  include Thor::Actions
-
-  source_root File.expand_path('../../..', __FILE__) 
-  
-  def generate_migration
-    destination   = File.expand_path('db/migrate/01_create_comfy_blog.rb', self.destination_root)
-    migration_dir = File.dirname(destination)
-    destination   = self.class.migration_exists?(migration_dir, 'create_comfy_blog')
-  
-    if destination
-      puts "\e[0m\e[31mFound existing create_comfy_blog.rb migration. Remove it if you want to regenerate.\e[0m"
-    else
-      migration_template 'db/migrate/01_create_comfy_blog.rb', 'db/migrate/create_comfy_blog.rb'
-    end
-  end
-  
-  def generate_initialization
-    copy_file 'config/initializers/comfy_blog.rb', 'config/initializers/comfy_blog.rb'
-  end
-  
-  def show_readme
-    readme 'lib/generators/README'
-  end
-  
-  def self.next_migration_number(dirname)
-    ActiveRecord::Generators::Base.next_migration_number(dirname)
-  end
-end