beef-articles 0.3.12 → 0.3.13

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+test/*.log

data/VERSION

@@ -1 +1 @@
-0.3.12
+0.3.13

data/app/controllers/admin/articles_controller.rb

@@ -1,6 +1,6 @@
 class Admin::ArticlesController < Admin::BaseController
   unloadable
-  sortable_attributes :published_at, :title, :permalink, :published_to, :body, :description, :allow_comments 
+  sortable_attributes :created_at, :published_at, :title, :permalink, :published_to, :body, :description, :allow_comments, :created_by => 'created_by.name' 
 
   # GET /articles
   # GET /articles.xml

data/app/controllers/admin/categories_controller.rb

@@ -73,8 +73,11 @@ class Admin::CategoriesController < Admin::BaseController
   # DELETE /categories/1.xml
   def destroy
     @category = Category.find(params[:id])
-    @category.destroy
-    flash[:notice] = 'Category was successfully deleted.'
+    if @category.destroy
+      flash[:notice] = 'Category was successfully deleted.'
+    else
+      flash[:error] = 'Category could not be deleted.'
+    end
 
     respond_to do |format|
       format.html { redirect_to(admin_categories_url) }

data/app/controllers/articles_controller.rb

@@ -20,7 +20,7 @@ class ArticlesController < ApplicationController
     
     @articles = Article.in_time_delta( params[:year], params[:month], params[:day] ).published.tagged_with(params[:tag], :on => :tags).authored_by(@user).categorised(@category).paginate( :page => params[:page], :per_page => params[:per_page] || Article.per_page, :include => [:created_by] )
     
-    @tags = Article.published.authored_by(@user).categorised(@category).tag_counts
+    @tags = Article.published.authored_by(@user).categorised(@category).tag_counts(:limit => 20)
     
     respond_to do |format|
       format.html # index.html.erb

data/app/controllers/comments_controller.rb

@@ -8,14 +8,15 @@ class CommentsController < ApplicationController
     
     @comment = @commentable.comments.build(params[:comment])
     
-    unless Settings.defensio_api_key.blank?
+    if defined?( Viking ) and !Settings.defensio_api_key.blank? 
+      viking = Viking.connect(:defensio, :api_key => Settings.defensio_api_key, :blog => root_url)
       viking_response = viking.check_comment( :user_ip => request.remote_ip,
                                               :article_date => @commentable.published_at,
-                                              :comment_author => @comment.author,
+                                              :comment_author => @comment.name,
                                               :comment_type => 'comment',
                                               :comment_content => @comment.comment,
                                               :comment_author_email => @comment.email,
-                                              :user_logged_in => logged_in?,
+                                              :user_logged_in => signed_in?,
                                               :referrer => request.referer,
                                               :permalink => @commentable )
                                               

data/app/helpers/articles_helper.rb

@@ -11,7 +11,7 @@ module ArticlesHelper
     tabs = Article.published.all(:select => 'users.name, users.permalink', :group => 'created_by_id', :joins => :created_by ).collect do |user|
       content_tag :li, link_to( user.name, articles_authored_path(user.permalink) )
     end
-    content_tag( :h3, 'Authors' ) + content_tag( :ul, tabs.join, :class => "authors" ) if tabs.any?
+    content_tag( :h2, 'Authors' ) + content_tag( :ul, tabs.join, :class => "authors" ) if tabs.any?
   end
   
   def comments_link(article)
@@ -94,17 +94,17 @@ module ArticlesHelper
     content_tag :ul, html, html_options.reverse_merge!( :class => 'archive' ) unless html.empty?
   end
   
-  def related_articles(content_node, &block)
-    articles = Article.find_tagged_with content_node.tag_list, :conditions => ['published_at <= ? AND content_nodes.id != ?', Time.now, content_node.id ], :limit => 3,  :include => :created_by
+  def related_articles(taggable, &block)
+    articles = Article.published.all(taggable.related_search_options(:tags, Article, :limit => 3))
+    return if articles.empty?
     if block_given?
       yield(articles)
     else
-      articles_list(articles)
+      content_tag(:div, content_tag( :h2, 'Related' ) + articles_list(articles), :class => "related")
     end
   end
   
   def recent_articles(options = {}, &block)
-    options.merge!(:order => 'published_at DESC')
     options.reverse_merge!(:limit => 3)
     articles =  Article.published.all(options)
     if block_given?
@@ -116,7 +116,7 @@ module ArticlesHelper
   
   def articles_list(articles)
     return if articles.empty?
-    articles.collect! { |article| content_tag( 'li', "#{link_to(article.title, article)}")    }
+    articles.collect! { |article| content_tag( 'li', "#{link_to(article.title, article)} #{article.published_at.to_formatted_s(:short_dot)}")    }
     content_tag( 'ul', articles.join, :class => 'article-list' )
   end
   

data/app/models/category.rb

@@ -9,6 +9,22 @@ class Category < ActiveRecord::Base
   named_scope :with, lambda { |many| {:joins => many.to_sym, :group => 'categories.id'} }
   
   before_save :set_url
+  before_destroy :no_content?
+
+  def has_content?
+    has_content = false
+    self.class.reflect_on_all_associations.each do |assoc|
+      if send(assoc.name).any?
+        has_content = true
+        break
+      end
+    end
+    return has_content
+  end
+  
+  def no_content?
+    !has_content?
+  end
 
 private
 

data/app/views/admin/articles/index.html.erb

@@ -9,10 +9,12 @@
 <table>
   <thead>
     <tr>
-      <%= sortable_table_header :name => "Title",  :sort => "title" %>
-      <th>Status</th>
-      <th>Author</th>
+      <%= sortable_table_header :name => "Title", :sort => "title" %>
+      <%= sortable_table_header :name => "Status",  :sort => "published_at" %>
+      <%= sortable_table_header :name => "Author",  :sort => "created_by" %>
+      <%= sortable_table_header :name => "Editor",  :sort => "updated_by" %>
       <%= sortable_table_header :name => "Updated",  :sort => "updated_at" %>
+      <%= sortable_table_header :name => "Created",  :sort => "created_at" %>
       <%= sortable_table_header :name => "Published At",  :sort => "published_at" %>
       <%= sortable_table_header :name => "Published To",  :sort => "published_to" %>
       <th colspan="3">Actions</th>
@@ -24,7 +26,9 @@
       <td><%= link_to h( article.title ), admin_article_path(article) %></td>
       <td><%= content_status(article) %></td>
       <td><%= article.author %></td>
+      <td><%= article.editor %></td>
       <td><%= article.updated_at.strftime('%d %b') %></td>
+      <td><%= article.created_at.strftime('%d %b') %></td>
       <td><%= article.published_at.strftime('%d %b') unless article.published_at.nil? %></td>
       <td><%= article.published_to.strftime('%d %b') unless article.published_to.nil? %></td>
       <td><%= link_to 'Show', article_url(article), :class => 'show' if article.published? %></td>
@@ -35,10 +39,12 @@
   </tbody>
   <tfoot>
     <tr>
-      <%= sortable_table_header :name => "Title",  :sort => "title" %>
-      <th>Status</th>
-      <th>Author</th>
+      <%= sortable_table_header :name => "Title", :sort => "title" %>
+      <%= sortable_table_header :name => "Status",  :sort => "published_at" %>
+      <%= sortable_table_header :name => "Author",  :sort => "created_by" %>
+      <%= sortable_table_header :name => "Editor",  :sort => "updated_by" %>
       <%= sortable_table_header :name => "Updated",  :sort => "updated_at" %>
+      <%= sortable_table_header :name => "Created",  :sort => "created_at" %>
       <%= sortable_table_header :name => "Published At",  :sort => "published_at" %>
       <%= sortable_table_header :name => "Published To",  :sort => "published_to" %>
       <th colspan="3">Actions</th>

data/app/views/articles/_article.html.erb

@@ -5,7 +5,7 @@
 </dt>
 <dd>
   <p class="post-meta">
-    <span class="date"><%= article.published_at.to_formatted_s(:short_dot) %></span> | posted by <%= link_to article.author, articles_authored_path(article.created_by) %>
+    <span class="date"><%= article.published_at.to_formatted_s(:short_dot) %></span> | posted by <%= link_to article.author, articles_authored_path(article.created_by.permalink) %>
   </p>
   <p><%=h article.description %></p>
 </dd>

data/app/views/articles/index.html.erb

@@ -20,7 +20,7 @@
 <!-- eo:main-content -->
 
 <!-- so:supporting-content -->
-<div id="supporting-content">
+<div id="sidebar">
   <%= article_categories %>
   <%= article_authors %>
 

data/app/views/articles/show.html.erb

@@ -1,33 +1,24 @@
 <% content_for 'header' do %>
   <%= auto_discovery_link_tag :rss, articles_path(:rss) %>
 <% end %>
+<h1><%=h @article.title %></h1>
+<%= link_to 'RSS', articles_path(:rss), :class => 'rss' %>
 
 <div id="main-content">
-  <h1>News</h1>
-  <%= link_to 'RSS', articles_path(:rss), :class => 'rss' %>
-  <div class="post">
-    <h2><%=h @article.title %></h2>
-    <p class="post-meta">
-      on <span class="date"><%= @article.published_at.to_formatted_s(:short_dot) %></span> by <%= link_to @article.author, articles_authored_path(@article.created_by) %>
-    </p>
-    <%= @article.body %>
+  <p class="post-meta">
+    on <span class="date"><%= @article.published_at.to_formatted_s(:short_dot) %></span> by <%= link_to @article.author, articles_authored_path(@article.created_by.permalink) %>
+  </p>
+  <%= @article.body %>
+
+  <%= gallery @article.assets %>
+  <%= documents @article.assets %>
   
-    <% unless @article.assets.documents.empty? -%>
-    <ul>
-      <% for document in @article.assets.documents %>
-        <li><%= link_to document.filename %></li>
-      <% end %>
-    </ul>
-    <% end -%>
-
-    <a href="#" id="share-title" title="Share This Article">Share This</a>
-    <p class="share-links">
-      <%= mail_link @article %> <%= digg_link @article %> <%= delicious_link @article %> <%= facebook_link @article %> <%= stumble_link @article %> <%= twitter_link @article %> <%= reddit_link @article %> <%= technorati_link @article %>
-    </p>
-  </div><!-- eo:post -->
-
-
-<% if @article.allow_comments? or !@article.comments.empty? -%>
+  <a href="#" id="share-title" title="Share This Article">Share This</a>
+  <p class="share-links">
+    <%= mail_link @article %> <%= digg_link @article %> <%= delicious_link @article %> <%= facebook_link @article %> <%= stumble_link @article %> <%= twitter_link @article %> <%= reddit_link @article %> <%= technorati_link @article %>
+  </p>
+
+<% if @article.allow_comments? or @article.comments.any? -%>
   <div id="comments">
     <h2>Comments</h2>
 
@@ -41,15 +32,22 @@
     <h2 id="respond">Leave a Comment</h2>
     <%= render :partial => 'comments/form', :locals => { :commentable => @article } %>
 <% end -%>
-  </div>
+  </div><!-- eo:comments -->
 <% end -%>
 
 </div><!-- eo:main-content -->
 
-<div id="supporting-content">
-  <h3>Latest Posts</h3>
+<div id="sidebar">
+  <%= related_articles(@article) %>
+  
+  <h2>Latest Posts</h2>
   <%= recent_articles %>
+    
+  <%= article_categories %>
   
-  <h3>Archive</h3>
+  <%= article_authors %>
+  
+  <h2>Archive</h2>
   <%= archive %>
-</div><!-- eo: supporting-content -->
+
+</div><!-- eo:sidebar -->

data/articles.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{articles}
-  s.version = "0.3.12"
+  s.version = "0.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-08-27}
+  s.date = %q{2009-09-01}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -49,6 +49,8 @@ Gem::Specification.new do |s|
      "lib/articles.rb",
      "rails/init.rb",
      "test/articles_test.rb",
+     "test/database.yml",
+     "test/schema.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/beef/articles}
@@ -58,6 +60,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Article/Blogging engine}
   s.test_files = [
     "test/articles_test.rb",
+     "test/schema.rb",
      "test/test_helper.rb"
   ]
 

data/test/articles_test.rb

@@ -1,7 +1,28 @@
 require 'test_helper'
 
 class ArticlesTest < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  context('When an category has articles') do
+    setup do
+      @category = Factory(:category, :title => 'My filled up category')
+      4.times do
+        Factory(:article, :category => @category)
+      end
+    end
+    
+    should 'not be able to delete it' do
+      @category.destroy
+      assert_valid(Category.find_by_id(@category.id))
+    end
+  end
+  
+  context('When an category has no articles') do
+    setup do
+      @category = Factory(:category, :title => 'My empty category')
+    end
+    
+    should 'be able to delete it' do
+      @category.destroy
+      assert_nil(Category.find_by_id(@category.id))
+    end
   end
 end

data/test/database.yml

@@ -0,0 +1,21 @@
+sqlite:
+  :adapter: sqlite
+  :dbfile: acts_as_content_node_plugin.sqlite.db
+sqlite3:
+  :adapter: sqlite3
+  :dbfile: acts_as_content_node_plugin.sqlite3.db
+sqlite3mem:
+  :adapter: sqlite3
+  :dbfile: ":memory:"
+postgresql:
+  :adapter: postgresql
+  :username: postgres
+  :password: postgres
+  :database: acts_as_content_node_plugin_test
+  :min_messages: ERROR
+mysql:
+  :adapter: mysql
+  :host: localhost
+  :username: root
+  :password:
+  :database: acts_as_content_node_plugin_test

data/test/schema.rb

@@ -0,0 +1,25 @@
+ActiveRecord::Schema.define(:version => 0) do
+  create_table "articles", :force => true do |t|
+    t.string   "title"
+    t.string   "permalink"
+    t.datetime "published_at"
+    t.datetime "published_to"
+    t.text     "body"
+    t.string   "description"
+    t.boolean  "allow_comments",  :default => false
+    t.string   "cached_tag_list"
+    t.integer  "created_by_id"
+    t.integer  "updated_by_id"
+    t.integer  "category_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+  
+  create_table "categories", :force => true do |t|
+    t.string   "title"
+    t.string   "description"
+    t.string   "permalink"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+end

data/test/test_helper.rb

@@ -1,10 +1,56 @@
 require 'rubygems'
 require 'test/unit'
-require 'shoulda'
+require 'active_record'
+require 'shoulda/rails'
+require 'factory_girl'
+require 'faker'
+
+# Setting this makes parameterize work
+$KCODE = 'UTF8'
+
+# Makes TimeZone work
+Time.zone = 'UTC'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'app'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'articles'
 
-class Test::Unit::TestCase
+RAILS_DEFAULT_LOGGER = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
+ActiveRecord::Base.logger = RAILS_DEFAULT_LOGGER
+
+require "acts_as_commentable"
+require "acts_as_content_node"
+require "has_assets"
+module PluginMock
+  def acts_as_textiled(*args); end
+  def acts_as_taggable_on(*args); end
 end
+
+ActiveRecord::Base.extend PluginMock
+ActiveRecord::Base.send :include, Beef::Has::Assets
+ActiveRecord::Base.send :include, Beef::Acts::ContentNode
+ActiveRecord::Base.send :include, Beef::Acts::Publishable
+
+require "models/article"
+require "models/category"
+
+ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + "/database.yml"))
+ActiveRecord::Base.establish_connection(ENV["DB"] || "sqlite3mem")
+ActiveRecord::Migration.verbose = false
+load(File.join(File.dirname(__FILE__), "schema.rb"))
+
+Factory.define :article do |article|
+  article.title               {Faker::Lorem.words(5).join(' ')}
+  article.description         {Faker::Lorem.sentence}
+  article.body                {Faker::Lorem.paragraphs.join("\n\n\n")}
+  article.association :category, :factory => :category
+end
+
+Factory.define :published_article, :parent => :article do |article|
+  article.published_at   { Time.at(Time.now.to_i - rand(3.years)) }
+end
+
+Factory.define :category do |f|
+  f.title  {Faker::Lorem.words(5).join(' ')}
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-articles
 version: !ruby/object:Gem::Version 
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-27 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,10 +78,11 @@ files:
 - lib/articles.rb
 - rails/init.rb
 - test/articles_test.rb
+- test/database.yml
+- test/schema.rb
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/beef/articles
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -102,10 +103,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Article/Blogging engine
 test_files: 
 - test/articles_test.rb
+- test/schema.rb
 - test/test_helper.rb