refinerycms-blog 1.6.1 → 1.6.2

data/app/helpers/blog_posts_helper.rb

@@ -41,4 +41,15 @@ module BlogPostsHelper
   def next_or_previous?(post)
     post.next.present? or post.prev.present?
   end
+
+  def blog_post_teaser(post)
+    if post.respond_to?(:custom_teaser) && post.custom_teaser.present?
+     post.custom_teaser.html_safe
+    else
+     truncate(post.body, {
+       :length => RefinerySetting.find_or_set(:blog_post_teaser_length, 250),
+       :preserve_html_tags => true
+      }).html_safe
+    end
+  end
 end

data/app/models/blog_post.rb

@@ -26,7 +26,7 @@ class BlogPost < ActiveRecord::Base
                   :approximate_ascii => RefinerySetting.find_or_set(:approximate_ascii, false, :scoping => 'blog'),
                   :strip_non_ascii => RefinerySetting.find_or_set(:strip_non_ascii, false, :scoping => 'blog')
 
-  attr_accessible :title, :body, :tag_list, :draft, :published_at, :browser_title, :meta_keywords, :meta_description, :user_id, :category_ids, :custom_url
+  attr_accessible :title, :body, :tag_list, :draft, :published_at, :browser_title, :meta_keywords, :meta_description, :user_id, :category_ids, :custom_url, :custom_teaser
 
   scope :by_archive, lambda { |archive_date|
     where(['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month])

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

@@ -4,4 +4,12 @@
     margin: 0px;
     padding: 0px;
   }
+  a#copy_body_link {
+    background: url("/images/refinery/icons/add.png") no-repeat scroll 0 6px transparent;
+    border-bottom: 0 none;
+    display: inline;
+    line-height: 29px;
+    margin-top: 0;
+    padding-left: 20px;
+  }
 </style>

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

@@ -13,9 +13,12 @@
   <div class='field'>
     <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>
       <ul id='page_parts'>
-        <li class='ui-state-default'>
+        <li class='ui-state-default ui-state-active'>
           <%= link_to "Body", "#page_part_body" %>
         </li>
+        <li class='ui-state-default'>
+          <%= link_to "Teaser", "#page_part_teaser" %>
+        </li>
         <% Refinery::Blog.tabs.each_with_index do |tab, tab_index| %>
           <li class='ui-state-default' id="custom_<%= tab.name %>_tab">
             <%= link_to tab.name.titleize, "#custom_tab_#{tab_index}" %>
@@ -31,6 +34,11 @@
                        :f => f,
                        :part_index => (part_index += 1),
                      } -%>
+          <%= render :partial => 'teaser_part',
+                     :locals => {
+                       :f => f,
+                       :part_index => (part_index += 1),
+                     } if f.object.respond_to?(:custom_teaser) -%>
         <% Refinery::Blog.tabs.each_with_index do |tab, tab_index| %>
           <div class='page_part' id='<%= "custom_tab_#{tab_index}" %>'>
             <%= render :partial => tab.partial, :locals => {:f => f} %>

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

@@ -1,5 +1,23 @@
 <script>
   (function($) {
-    $('#page-tabs').tabs();
+    $(function() {
+      $('#page-tabs').tabs();
+      $('#copy_body_link').click(function(event) {
+        // Find the WYMEditor that maps to the custom_teaser field
+        var teaserTextArea = $('#blog_post_custom_teaser')[0];
+        var teaserEditor = null;
+        $.each(WYMeditor.INSTANCES, function(index, editor) {
+          if (editor._element[0] == teaserTextArea) {
+            teaserEditor = editor;
+          }
+        });
+
+        if (teaserEditor) {
+          teaserEditor.html($('#blog_post_body').attr('value'));
+        }
+
+        event.preventDefault();
+      });
+    });
   })(jQuery);
 </script>

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

@@ -0,0 +1,11 @@
+<div class='page_part' id='page_part_teaser'>
+  <%= f.text_area :custom_teaser, :rows => 20, :class => 'wymeditor widest' -%>
+  <p>
+    <span class='clearfix label_inline_with_link'>
+      <%= link_to t('admin.blog.posts.form.copy_body'), "#",
+                  :id => 'copy_body_link',
+                  :title => t('admin.blog.posts.form.copy_body_help') %>
+    </span>
+  </p>
+</div>
+

data/app/views/blog/shared/_post.html.erb

@@ -12,7 +12,7 @@
             <%=raw categories.collect { |category| link_to category.title, blog_category_url(category) }.to_sentence %>
           </aside>
         <% end %>
-        <% if (tags = post.tag_list).any? %>
+        <% if (tags = post.tags).any? %>
           <aside class='tagged'>
             <%= t('tagged', :scope => 'blog.posts.show') %>
             <%=raw tags.collect { |tag| link_to tag, tagged_posts_path(tag.id, tag.name.parameterize) }.to_sentence %>
@@ -21,9 +21,7 @@
       </section>
     </header>
     <section class='clearfix'>
-      <%= truncate(post.body,
-                   :length => RefinerySetting.find_or_set(:blog_post_teaser_length, 250),
-                   :preserve_html_tags => true) %>
+      <%= blog_post_teaser(post) %>
     </section>
     <footer>
       <p>

data/changelog.md

@@ -1,3 +1,10 @@
+## 1.7 [UNRELEASED]
+* Custom teaser field to overwrite the automatic truncation of the body [wikyd](https://github.com/wikyd)
+* Tagging URL strategy updated again [joemsak](https://github.com/joemsak)
+
+## 1.6.2 [UNRELEASED]
+* Tagging bug fixed [ruprict](https://github.com/ruprict)
+
 ## 1.6.1 [21 June 2011]
 * Tagging URL strategy updated for reliability /blog/posts/tagged/ID-name-parameterized [joemsak](https://github.com/joemsak)
 * Heroku/PostgreSQL support for autocomplete tags [joemsak](https://github.com/joemsak)

data/config/locales/en.yml

@@ -40,6 +40,8 @@ en:
           published_at: Publish Date
           custom_url: Custom Url
           custom_url_help: Generate the url for the blog post from this text instead of the title.
+          copy_body: Copy Post Body to Teaser
+          copy_body_help: Copies the post body to the teaser.  Leave teaser blank to let Refinery automatically make the teaser.
         index:
           no_items_yet: 'There are no Blog Posts yet. Click "%{create}" to add your first blog post.'
         uncategorized:

data/config/routes.rb

@@ -6,7 +6,7 @@
     match 'categories/:id', :to => 'categories#show', :as => 'blog_category'
     match ':id/comments', :to => 'posts#comment', :as => 'blog_post_blog_comments'
     get 'archive/:year(/:month)', :to => 'posts#archive', :as => 'archive_blog_posts'
-    get 'tagged/:tag_id-:tag_name' => 'posts#tagged', :as => 'tagged_posts'
+    get 'tagged/:tag_id/:tag_name' => 'posts#tagged', :as => 'tagged_posts'
   end
 
   scope(:path => 'refinery', :as => 'admin', :module => 'admin') do

data/db/migrate/7_add_custom_teaser_field_to_blog_posts.rb

@@ -0,0 +1,10 @@
+class AddCustomTeaserFieldToBlogPosts < ActiveRecord::Migration
+  def self.up
+    add_column :blog_posts, :custom_teaser, :text
+  end
+
+  def self.down
+    remove_column :blog_posts, :custom_teaser
+  end
+end
+

data/features/category.feature

@@ -19,5 +19,5 @@ Feature: Blog Post Categories
     And I press "Save"
 
     Then there should be 1 blog post
-    And the blog post should have "1" category
+    And the blog post should have 1 category
     And the blog post should have the category "Videos"

data/features/support/factories/blog_comments.rb

@@ -4,5 +4,5 @@ Factory.define(:blog_comment) do |f|
   f.name "Joe Commenter"
   f.sequence(:email) { |n| "person#{n}@example.com" }
   f.body "Which one is the best for picking up new shoes?"
-  f.association :post
+  f.association :post, :factory => :blog_post
 end

data/features/support/factories/blog_posts.rb

@@ -1,6 +1,6 @@
 require 'factory_girl'
 
-Factory.define(:post, :class => BlogPost) do |f|
+Factory.define(:blog_post, :class => BlogPost) do |f|
   f.sequence(:title) { |n| "Top #{n} Shopping Centers in Chicago" }
   f.body "These are the top ten shopping centers in Chicago. You're going to read a long blog post about them. Come to peace with it."
   f.draft false

data/features/support/step_definitions/category_steps.rb

@@ -1,11 +1,11 @@
 Given /^there is a category titled "([^"]*)"$/ do |title|
-  @category = Factory(:blog_category, :title => title)
+  @category = Factory.create(:blog_category, :title => title)
 end
 
-Then /^the blog post should have "([^"]*)" category$/ do |num_category|
-  BlogPost.last.categories.count.should == num_category
+Then /^the blog post should have ([\d]*) categor[yies]{1,3}$/ do |num_category|
+  BlogPost.last.categories.count.should == num_category.to_i
 end
 
-Then /^the blog post should have the category "([^"]*)"$/ do |category| 
+Then /^the blog post should have the category "([^"]*)"$/ do |category|
   BlogPost.last.categories.first.title.should == category
 end

data/features/support/step_definitions/tags_steps.rb

@@ -1,8 +1,10 @@
 Given /^there is a blog post titled "([^"]*)" and tagged "([^"]*)"$/ do |title, tag_name|
-  @blog_post = Factory(:post, :title => title, :tag_list => tag_name)
+  @blog_post = Factory.create(:blog_post, :title => title, :tag_list => tag_name)
 end
 
 When /^I visit the tagged posts page for "([^"]*)"$/ do |tag_name|
+  @blog_post ||= Factory.create(:blog_post, :tag_list => tag_name)
+  tag = BlogPost.tag_counts_on(:tags).first
   visit tagged_posts_path(tag.id, tag_name.parameterize)
 end
 

data/lib/gemspec.rb

@@ -2,9 +2,7 @@
 require File.expand_path('../refinery/blog/version', __FILE__)
 version = ::Refinery::Blog::Version.to_s
 raise "Could not get version so gemspec can not be built" if version.nil?
-files = Dir.glob("**/*").flatten.reject do |file|
-  file =~ /\.gem(spec)?$/
-end
+files = Dir.glob("**/*").flatten.reject{|f| f =~ %r{.gem$}}
 
 gemspec = <<EOF
 Gem::Specification.new do |s|
@@ -19,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
 
   # Runtime dependencies
-  s.add_dependency    'refinerycms-core',   '~> 1.0.0'
+  s.add_dependency    'refinerycms-core',   '~> 1.0.3'
   s.add_dependency    'filters_spam',       '~> 0.2'
   s.add_dependency    'acts-as-taggable-on'
   s.add_dependency    'seo_meta',           '~> 1.1.0'

data/lib/refinery/blog/version.rb

@@ -3,7 +3,7 @@ module Refinery
     class Version
       @major = 1
       @minor = 6
-      @tiny  = 1
+      @tiny  = 2
 
       class << self
         attr_reader :major, :minor, :tiny

data/readme.md

@@ -17,7 +17,7 @@ Refinery CMS version 1.0.0 or above.
 
 Open up your ``Gemfile`` and add at the bottom this line:
 
-    gem 'refinerycms-blog', '~> 1.5'
+    gem 'refinerycms-blog', '~> 1.6.1'
 
 Now, run ``bundle install``
 

data/refinerycms-blog.gemspec

@@ -0,0 +1,202 @@
+Gem::Specification.new do |s|
+  s.name              = %q{refinerycms-blog}
+  s.version           = %q{1.6.2}
+  s.description       = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.}
+  s.date              = %q{2011-06-29}
+  s.summary           = %q{Ruby on Rails blogging engine for RefineryCMS.}
+  s.email             = %q{info@refinerycms.com}
+  s.homepage          = %q{http://refinerycms.com/blog}
+  s.authors           = ['Resolve Digital', 'Neoteric Design']
+  s.require_paths     = %w(lib)
+
+  # Runtime dependencies
+  s.add_dependency    'refinerycms-core',   '~> 1.0.3'
+  s.add_dependency    'filters_spam',       '~> 0.2'
+  s.add_dependency    'acts-as-taggable-on'
+  s.add_dependency    'seo_meta',           '~> 1.1.0'
+
+  # Development dependencies
+  s.add_development_dependency 'factory_girl'
+
+  s.files             = %w(
+    app
+    app/controllers
+    app/controllers/admin
+    app/controllers/admin/blog
+    app/controllers/admin/blog/categories_controller.rb
+    app/controllers/admin/blog/comments_controller.rb
+    app/controllers/admin/blog/posts_controller.rb
+    app/controllers/admin/blog/settings_controller.rb
+    app/controllers/blog
+    app/controllers/blog/categories_controller.rb
+    app/controllers/blog/posts_controller.rb
+    app/controllers/blog_controller.rb
+    app/helpers
+    app/helpers/blog_posts_helper.rb
+    app/mailers
+    app/mailers/blog
+    app/mailers/blog/comment_mailer.rb
+    app/models
+    app/models/blog
+    app/models/blog/comment_mailer.rb
+    app/models/blog_category.rb
+    app/models/blog_comment.rb
+    app/models/blog_post.rb
+    app/models/categorization.rb
+    app/views
+    app/views/admin
+    app/views/admin/blog
+    app/views/admin/blog/_submenu.html.erb
+    app/views/admin/blog/categories
+    app/views/admin/blog/categories/_category.html.erb
+    app/views/admin/blog/categories/_form.html.erb
+    app/views/admin/blog/categories/_sortable_list.html.erb
+    app/views/admin/blog/categories/edit.html.erb
+    app/views/admin/blog/categories/index.html.erb
+    app/views/admin/blog/categories/new.html.erb
+    app/views/admin/blog/comments
+    app/views/admin/blog/comments/_comment.html.erb
+    app/views/admin/blog/comments/_sortable_list.html.erb
+    app/views/admin/blog/comments/index.html.erb
+    app/views/admin/blog/comments/show.html.erb
+    app/views/admin/blog/posts
+    app/views/admin/blog/posts/_form.css.erb
+    app/views/admin/blog/posts/_form.html.erb
+    app/views/admin/blog/posts/_form.js.erb
+    app/views/admin/blog/posts/_form_part.html.erb
+    app/views/admin/blog/posts/_post.html.erb
+    app/views/admin/blog/posts/_sortable_list.html.erb
+    app/views/admin/blog/posts/_teaser_part.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/posts/uncategorized.html.erb
+    app/views/admin/blog/settings
+    app/views/admin/blog/settings/notification_recipients.html.erb
+    app/views/blog
+    app/views/blog/categories
+    app/views/blog/categories/show.html.erb
+    app/views/blog/comment_mailer
+    app/views/blog/comment_mailer/notification.html.erb
+    app/views/blog/posts
+    app/views/blog/posts/_comment.html.erb
+    app/views/blog/posts/_nav.html.erb
+    app/views/blog/posts/_post.html.erb
+    app/views/blog/posts/archive.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/blog/posts/tagged.html.erb
+    app/views/blog/shared
+    app/views/blog/shared/_categories.html.erb
+    app/views/blog/shared/_post.html.erb
+    app/views/blog/shared/_posts.html.erb
+    app/views/blog/shared/_rss_feed.html.erb
+    app/views/blog/shared/_tags.html.erb
+    app/views/shared
+    app/views/shared/admin
+    app/views/shared/admin/_autocomplete.html.erb
+    changelog.md
+    config
+    config/locales
+    config/locales/cs.yml
+    config/locales/de.yml
+    config/locales/en.yml
+    config/locales/es.yml
+    config/locales/fr.yml
+    config/locales/it.yml
+    config/locales/nb.yml
+    config/locales/nl.yml
+    config/locales/pl.yml
+    config/locales/pt-BR.yml
+    config/locales/ru.yml
+    config/locales/sk.yml
+    config/locales/zh-CN.yml
+    config/routes.rb
+    db
+    db/migrate
+    db/migrate/1_create_blog_structure.rb
+    db/migrate/2_add_user_id_to_blog_posts.rb
+    db/migrate/3_acts_as_taggable_on_migration.rb
+    db/migrate/4_create_seo_meta_for_blog.rb
+    db/migrate/5_add_cached_slugs.rb
+    db/migrate/6_add_custom_url_field_to_blog_posts.rb
+    db/migrate/7_add_custom_teaser_field_to_blog_posts.rb
+    db/seeds
+    db/seeds/refinerycms_blog.rb
+    features
+    features/authors.feature
+    features/category.feature
+    features/support
+    features/support/factories
+    features/support/factories/blog_categories.rb
+    features/support/factories/blog_comments.rb
+    features/support/factories/blog_posts.rb
+    features/support/paths.rb
+    features/support/step_definitions
+    features/support/step_definitions/authors_steps.rb
+    features/support/step_definitions/category_steps.rb
+    features/support/step_definitions/tags_steps.rb
+    features/tags.feature
+    lib
+    lib/gemspec.rb
+    lib/generators
+    lib/generators/refinerycms_blog_generator.rb
+    lib/refinery
+    lib/refinery/blog
+    lib/refinery/blog/tabs.rb
+    lib/refinery/blog/version.rb
+    lib/refinerycms-blog.rb
+    public
+    public/images
+    public/images/refinerycms-blog
+    public/images/refinerycms-blog/icons
+    public/images/refinerycms-blog/icons/cog.png
+    public/images/refinerycms-blog/icons/comment.png
+    public/images/refinerycms-blog/icons/comment_cross.png
+    public/images/refinerycms-blog/icons/comment_tick.png
+    public/images/refinerycms-blog/icons/comments.png
+    public/images/refinerycms-blog/icons/down.gif
+    public/images/refinerycms-blog/icons/folder.png
+    public/images/refinerycms-blog/icons/folder_add.png
+    public/images/refinerycms-blog/icons/folder_edit.png
+    public/images/refinerycms-blog/icons/page.png
+    public/images/refinerycms-blog/icons/page_add.png
+    public/images/refinerycms-blog/icons/page_copy.png
+    public/images/refinerycms-blog/icons/up.gif
+    public/images/refinerycms-blog/rss-feed.png
+    public/javascripts
+    public/javascripts/refinery
+    public/javascripts/refinery/refinerycms-blog.js
+    public/javascripts/refinerycms-blog.js
+    public/stylesheets
+    public/stylesheets/refinery
+    public/stylesheets/refinery/refinerycms-blog.css
+    public/stylesheets/refinerycms-blog.css
+    public/stylesheets/ui-lightness
+    public/stylesheets/ui-lightness/images
+    public/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
+    public/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
+    public/stylesheets/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
+    public/stylesheets/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
+    public/stylesheets/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
+    public/stylesheets/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
+    public/stylesheets/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
+    public/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
+    public/stylesheets/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
+    public/stylesheets/ui-lightness/images/ui-icons_222222_256x240.png
+    public/stylesheets/ui-lightness/images/ui-icons_228ef1_256x240.png
+    public/stylesheets/ui-lightness/images/ui-icons_ef8c08_256x240.png
+    public/stylesheets/ui-lightness/images/ui-icons_ffd27a_256x240.png
+    public/stylesheets/ui-lightness/images/ui-icons_ffffff_256x240.png
+    public/stylesheets/ui-lightness/jquery-ui-1.8.13.custom.css
+    readme.md
+    refinerycms-blog.gemspec
+    spec
+    spec/models
+    spec/models/blog_category_spec.rb
+    spec/models/blog_comment_spec.rb
+    spec/models/blog_post_spec.rb
+  )
+  
+end

data/spec/models/blog_category_spec.rb

@@ -3,7 +3,7 @@ Dir[File.expand_path('../../../features/support/factories/*.rb', __FILE__)].each
 
 describe BlogCategory do
   before(:each) do
-    @blog_category = Factory(:blog_category)
+    @blog_category = Factory.create(:blog_category)
   end
 
   describe "validations" do
@@ -20,20 +20,20 @@ describe BlogCategory do
     it "has a posts attribute" do
       @blog_category.should respond_to(:posts)
     end
-    
+
     it "returns posts by published_at date in descending order" do
       first_post = @blog_category.posts.create!({ :title => "Breaking News: Joe Sak is hot stuff you guys!!", :body => "True story.", :published_at => Time.now.yesterday })
-      latest_post = @blog_category.posts.create!({ :title => "parndt is p. okay", :body => "For a kiwi.", :published_at => Time.now })
+      latest_post = @blog_category.posts.create!({ :title => "parndt is p. okay", :body => "For a Kiwi.", :published_at => Time.now })
 
       @blog_category.posts.first.should == latest_post
     end
-      
+
   end
 
   describe "#post_count" do
     it "returns post count in category" do
       2.times do
-        @blog_category.posts << Factory(:post)
+        @blog_category.posts << Factory.create(:blog_post)
       end
       @blog_category.post_count.should == 2
     end

data/spec/models/blog_comment_spec.rb

@@ -6,7 +6,7 @@ describe BlogComment do
   context "wiring up" do
 
     before(:each) do
-      @comment = Factory(:blog_comment)
+      @comment = Factory.create(:blog_comment)
     end
 
     it "saves" do

data/spec/models/blog_post_spec.rb

@@ -2,19 +2,19 @@ require 'spec_helper'
 Dir[File.expand_path('../../../features/support/factories/*.rb', __FILE__)].each{|factory| require factory}
 
 describe BlogPost do
-  let(:blog_post ) { Factory :post }
-  
+  let(:blog_post ) { Factory.create(:blog_post) }
+
   describe "validations" do
     it "requires title" do
-      Factory.build(:post, :title => "").should_not be_valid
+      Factory.build(:blog_post, :title => "").should_not be_valid
     end
 
     it "won't allow duplicate titles" do
-      Factory.build(:post, :title => blog_post.title).should_not be_valid
+      Factory.build(:blog_post, :title => blog_post.title).should_not be_valid
     end
 
     it "requires body" do
-      Factory.build(:post, :body => nil).should_not be_valid
+      Factory.build(:blog_post, :body => nil).should_not be_valid
     end
   end
 
@@ -25,7 +25,7 @@ describe BlogPost do
     end
 
     it "destroys associated comments" do
-      Factory(:blog_comment, :blog_post_id => blog_post.id)
+      Factory.create(:blog_comment, :blog_post_id => blog_post.id)
       blog_post.destroy
       BlogComment.find_by_blog_post_id(blog_post.id).should == nil
     end
@@ -36,16 +36,16 @@ describe BlogPost do
       blog_post.should respond_to(:categories)
     end
   end
-  
+
   describe "tags" do
     it "acts as taggable" do
       blog_post.should respond_to(:tag_list)
-      
+
       #the factory has default tags, including 'chicago'
       blog_post.tag_list.should include("chicago")
     end
   end
-  
+
   describe "authors" do
     it "are authored" do
       BlogPost.instance_methods.map(&:to_sym).should include(:author)
@@ -54,54 +54,54 @@ describe BlogPost do
 
   describe "by_archive scope" do
     before do
-      @blog_post1 = Factory(:post, :published_at => Date.new(2011, 3, 11))
-      @blog_post2 = Factory(:post, :published_at => Date.new(2011, 3, 12))
-      
+      @blog_post1 = Factory.create(:blog_post, :published_at => Date.new(2011, 3, 11))
+      @blog_post2 = Factory.create(:blog_post, :published_at => Date.new(2011, 3, 12))
+
       #2 months before
-      Factory(:post, :published_at => Date.new(2011, 1, 10))
+      Factory.create(:blog_post, :published_at => Date.new(2011, 1, 10))
     end
 
     it "returns all posts from specified month" do
       #check for this month
       date = "03/2011"
-      BlogPost.by_archive(Time.parse(date)).count.should == 2
+      BlogPost.by_archive(Time.parse(date)).count.should be == 2
       BlogPost.by_archive(Time.parse(date)).should == [@blog_post2, @blog_post1]
     end
   end
 
   describe "all_previous scope" do
     before do
-      @blog_post1 = Factory(:post, :published_at => Time.now - 2.months)
-      @blog_post2 = Factory(:post, :published_at => Time.now - 1.month)
-      Factory :post, :published_at => Time.now
+      @blog_post1 = Factory.create(:blog_post, :published_at => Time.now - 2.months)
+      @blog_post2 = Factory.create(:blog_post, :published_at => Time.now - 1.month)
+      Factory.create(:blog_post, :published_at => Time.now)
     end
 
     it "returns all posts from previous months" do
-      BlogPost.all_previous.count.should == 2
+      BlogPost.all_previous.count.should be == 2
       BlogPost.all_previous.should == [@blog_post2, @blog_post1]
     end
   end
 
   describe "live scope" do
     before do
-      @blog_post1 = Factory(:post, :published_at => Time.now.advance(:minutes => -2))
-      @blog_post2 = Factory(:post, :published_at => Time.now.advance(:minutes => -1))
-      Factory(:post, :draft => true)
-      Factory(:post, :published_at => Time.now + 1.minute)
+      @blog_post1 = Factory.create(:blog_post, :published_at => Time.now.advance(:minutes => -2))
+      @blog_post2 = Factory.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
+      Factory.create(:blog_post, :draft => true)
+      Factory.create(:blog_post, :published_at => Time.now + 1.minute)
     end
 
     it "returns all posts which aren't in draft and pub date isn't in future" do
-      BlogPost.live.count.should == 2
+      BlogPost.live.count.should be == 2
       BlogPost.live.should == [@blog_post2, @blog_post1]
     end
   end
 
   describe "uncategorized scope" do
     before do
-      @uncategorized_blog_post = Factory(:post)
-      @categorized_blog_post = Factory(:post)
+      @uncategorized_blog_post = Factory.create(:blog_post)
+      @categorized_blog_post = Factory.create(:blog_post)
 
-      @categorized_blog_post.categories << Factory(:blog_category)
+      @categorized_blog_post.categories << Factory.create(:blog_category)
     end
 
     it "returns uncategorized posts if they exist" do
@@ -112,22 +112,22 @@ describe BlogPost do
 
   describe "#live?" do
     it "returns true if post is not in draft and it's published" do
-      Factory(:post).live?.should be_true
+      Factory.create(:blog_post).live?.should be_true
     end
 
     it "returns false if post is in draft" do
-      Factory(:post, :draft => true).live?.should be_false
+      Factory.create(:blog_post, :draft => true).live?.should be_false
     end
 
     it "returns false if post pub date is in future" do
-      Factory(:post, :published_at => Time.now.advance(:minutes => 1)).live?.should be_false
+      Factory.create(:blog_post, :published_at => Time.now.advance(:minutes => 1)).live?.should be_false
     end
   end
 
   describe "#next" do
     before do
-      Factory(:post, :published_at => Time.now.advance(:minutes => -1))
-      @blog_post = Factory(:post)
+      Factory.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
+      @blog_post = Factory.create(:blog_post)
     end
 
     it "returns next article when called on current article" do
@@ -137,8 +137,8 @@ describe BlogPost do
 
   describe "#prev" do
     before do
-      Factory(:post)
-      @blog_post = Factory(:post, :published_at => Time.now.advance(:minutes => -1))
+      Factory.create(:blog_post)
+      @blog_post = Factory.create(:blog_post, :published_at => Time.now.advance(:minutes => -1))
     end
 
     it "returns previous article when called on current article" do
@@ -148,9 +148,9 @@ describe BlogPost do
 
   describe "#category_ids=" do
     before do
-      @cat1 = Factory(:blog_category, :id => 1)
-      @cat2 = Factory(:blog_category, :id => 2)
-      @cat3 = Factory(:blog_category, :id => 3)
+      @cat1 = Factory.create(:blog_category, :id => 1)
+      @cat2 = Factory.create(:blog_category, :id => 2)
+      @cat3 = Factory.create(:blog_category, :id => 3)
       blog_post.category_ids = [1,2,"","",3]
     end
 
@@ -168,7 +168,7 @@ describe BlogPost do
       before do
         RefinerySetting.set(:comments_allowed, { :scoping => 'blog', :value => true })
       end
-      
+
       it "should be true" do
         BlogPost.comments_allowed?.should be_true
       end
@@ -178,10 +178,16 @@ describe BlogPost do
       before do
         RefinerySetting.set(:comments_allowed, { :scoping => 'blog', :value => false })
       end
-      
+
       it "should be false" do
         BlogPost.comments_allowed?.should be_false
       end
     end
   end
+
+  describe "custom teasers" do
+    it "should allow a custom teaser" do
+      Factory.create(:blog_post, :custom_teaser => 'This is some custom content').should be_valid
+    end
+  end
 end

metadata

@@ -1,80 +1,108 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: refinerycms-blog
-version: !ruby/object:Gem::Version
-  version: 1.6.1
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 1
+  - 6
+  - 2
+  version: 1.6.2
 platform: ruby
-authors:
+authors: 
 - Resolve Digital
 - Neoteric Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-22 00:00:00.000000000 +12:00
+
+date: 2011-06-29 00:00:00 +12:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: refinerycms-core
-  requirement: &2152867900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 0
+        - 3
+        version: 1.0.3
   type: :runtime
-  prerelease: false
-  version_requirements: *2152867900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: filters_spam
-  requirement: &2152866060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
   type: :runtime
-  prerelease: false
-  version_requirements: *2152866060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: acts-as-taggable-on
-  requirement: &2152861900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2152861900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: seo_meta
-  requirement: &2152850340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2152850340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: factory_girl
-  requirement: &2152849200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2152849200
-description: A really straightforward open source Ruby on Rails blog engine designed
-  for integration with RefineryCMS.
+  version_requirements: *id005
+description: A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.
 email: info@refinerycms.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - app/controllers/admin/blog/categories_controller.rb
 - app/controllers/admin/blog/comments_controller.rb
 - app/controllers/admin/blog/posts_controller.rb
@@ -106,6 +134,7 @@ files:
 - app/views/admin/blog/posts/_form_part.html.erb
 - app/views/admin/blog/posts/_post.html.erb
 - app/views/admin/blog/posts/_sortable_list.html.erb
+- app/views/admin/blog/posts/_teaser_part.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
@@ -148,6 +177,7 @@ files:
 - db/migrate/4_create_seo_meta_for_blog.rb
 - db/migrate/5_add_cached_slugs.rb
 - db/migrate/6_add_custom_url_field_to_blog_posts.rb
+- db/migrate/7_add_custom_teaser_field_to_blog_posts.rb
 - db/seeds/refinerycms_blog.rb
 - features/authors.feature
 - features/category.feature
@@ -198,32 +228,43 @@ files:
 - public/stylesheets/ui-lightness/images/ui-icons_ffffff_256x240.png
 - public/stylesheets/ui-lightness/jquery-ui-1.8.13.custom.css
 - readme.md
+- refinerycms-blog.gemspec
 - spec/models/blog_category_spec.rb
 - spec/models/blog_comment_spec.rb
 - spec/models/blog_post_spec.rb
 has_rdoc: true
 homepage: http://refinerycms.com/blog
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails blogging engine for RefineryCMS.
 test_files: []
+