beef-articles 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/app/controllers/admin/articles_controller.rb

@@ -1,10 +1,11 @@
 class Admin::ArticlesController < Admin::BaseController
+  unloadable
   sortable_attributes :title, :permalink, :published_at, :published_to, :body, :description, :allow_comments 
 
   # GET /articles
   # GET /articles.xml
   def index
-    @articles = Article.paginate :page => params[:page], :order => sort_order
+    @articles = Article.paginate :page => params[:page], :order => sort_order(:default => 'publised_at DESC')
 
     respond_to do |format|
       format.html # index.html.erb

data/app/controllers/admin/categories_controller.rb

@@ -1,4 +1,5 @@
 class Admin::CategoriesController < Admin::BaseController
+  unloadable
   sortable_attributes :title, :description 
 
   # GET /categories

data/app/controllers/admin/comments_controller.rb

@@ -1,4 +1,5 @@
 class Admin::CommentsController < Admin::BaseController
+  unloadable
   sortable_attributes :created_at, :name, :comment
 
   def index

data/app/controllers/articles_controller.rb

@@ -1,5 +1,6 @@
 class ArticlesController < ApplicationController
-
+  unloadable
+  
   def index
     @page_title = 'Articles'
     if params[:category_id]
@@ -19,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] || 6, :order => 'published_at DESC', :include => [:created_by] )
     
-    @tags = Article.published.authored_by(params[:user_id]).categorised(@category).tag_counts
+    @tags = Article.published.authored_by(@user).categorised(@category).tag_counts
     
     respond_to do |format|
       format.html # index.html.erb

data/app/controllers/comments_controller.rb

@@ -1,4 +1,5 @@
 class CommentsController < ApplicationController
+  unloadable
   
   before_filter :find_commentable
 

data/app/helpers/articles_helper.rb

@@ -62,11 +62,10 @@ module ArticlesHelper
     escape ? escape_once(url) : url
   end
   
-  def archive(options = {} )
+  def archive(conditions = nil, html_options = {})
     this_year = params[:year] || Time.now.year
     html = ''
-   
-    all_articles = Article.find(:all, :select => 'published_at', :order => "published_at DESC", :conditions => ['published_at <= ?', Time.now ])
+    all_articles = Article.published.all(:conditions => conditions, :select => 'published_at')
     grouped_by_year = all_articles.group_by{ |a| a.published_at.year  }.sort.reverse
     grouped_by_year.each do |year, articles|
       html << '<li>'
@@ -85,7 +84,7 @@ module ArticlesHelper
       end
       html << '</li>'
     end
-    content_tag :ul, html, options.reverse_merge!( :class => 'archive' ) unless html.empty?
+    content_tag :ul, html, html_options.reverse_merge!( :class => 'archive' ) unless html.empty?
   end
   
   def related_articles(content_node, &block)
@@ -97,8 +96,10 @@ module ArticlesHelper
     end
   end
   
-  def recent_articles(limit = 3, &block)
-    articles =  Article.published.all( :limit => limit, :order => 'published_at DESC')
+  def recent_articles(options = {}, &block)
+    options.merge!(:order => 'published_at DESC')
+    options.reverse_merge!(:limit => 3)
+    articles =  Article.published.all(options)
     if block_given?
       yield(articles)
     else

data/articles.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{articles}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2009-07-23}
+  s.date = %q{2009-07-29}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-articles
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-23 00:00:00 -07:00
+date: 2009-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,6 +81,7 @@ files:
 - test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/beef/articles
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Article/Blogging engine