beef-articles 0.4.14 → 0.4.15

data/VERSION

@@ -1 +1 @@
-0.4.14
+0.4.15

data/app/controllers/admin/articles_controller.rb

@@ -1,11 +1,11 @@
 class Admin::ArticlesController < Admin::BaseController
   unloadable
-  sortable_attributes :created_at, :published_at, :title, :permalink, :published_to, :body, :description, :allow_comments, :created => 'users.name',:category => 'categories.title', :updated => 'updated_bies_articles.name' 
+  sortable_attributes :created_at, :published_at, :title, :permalink, :published_to, :body, :description, :allow_comments, :created => 'users.name', :category => 'categories.title', :updated => 'updated_bies_articles.name'
 
   # GET /articles
   # GET /articles.xml
   def index
-    @articles = Article.paginate :page => params[:page], :per_page => 20, :order => sort_order(:default => 'desc'), :include => [:created_by, :updated_by, :category]
+    @articles = article_type.paginate :page => params[:page], :per_page => 20, :order => sort_order(:default => 'desc'), :include => [:created_by, :updated_by, :category]
 
     respond_to do |format|
       format.html # index.html.erb
@@ -16,7 +16,7 @@ class Admin::ArticlesController < Admin::BaseController
   # GET /articles/1
   # GET /articles/1.xml
   def show
-    @article = Article.find(params[:id])
+    @article = article_type.find(params[:id])
 
     respond_to do |format|
       format.html
@@ -27,7 +27,7 @@ class Admin::ArticlesController < Admin::BaseController
   # GET /articles/new
   # GET /articles/new.xml
   def new
-    @article = Article.new
+    @article = article_type.new
 
     respond_to do |format|
       format.html { render :action =>'show' }
@@ -38,13 +38,13 @@ class Admin::ArticlesController < Admin::BaseController
   # POST /articles
   # POST /articles.xml
   def create
-    @article = Article.new(params[:article])
+    @article = article_type.new(params[:article])
     @article.updated_by = @article.created_by = current_user
 
     respond_to do |format|
       if @article.save
         flash[:notice] = 'Article was successfully created.'
-        format.html { redirect_to(admin_articles_url) }
+        format.html { redirect_to :action => 'index'  }
         format.xml  { render :xml => @article, :status => :created, :location => @article }
       else
         format.html { render :action => "show" }
@@ -56,13 +56,13 @@ class Admin::ArticlesController < Admin::BaseController
   # PUT /articles/1
   # PUT /articles/1.xml
   def update
-    @article = Article.find(params[:id])
+    @article = article_type.find(params[:id])
     @article.updated_by = current_user
 
     respond_to do |format|
       if @article.update_attributes(params[:article])
         flash[:notice] = 'Article was successfully updated.'
-        format.html { redirect_to(admin_articles_url) }
+        format.html { redirect_to :action => 'index' }
         format.xml  { head :ok }
       else
         format.html { render :action => "show" }
@@ -74,20 +74,27 @@ class Admin::ArticlesController < Admin::BaseController
   # DELETE /articles/1
   # DELETE /articles/1.xml
   def destroy
-    @article = Article.find(params[:id])
+    @article = article_type.find(params[:id])
     @article.destroy
     flash[:notice] = 'Article was successfully deleted.'
 
     respond_to do |format|
-      format.html { redirect_to(admin_articles_url) }
+      format.html { redirect_to :action => 'index' }
       format.xml  { head :ok }
     end
   end
-  
+
   def preview
     preview_params = params[:article]
-    article = Article.find_by_id(params[:id])
+    article = article_type.find_by_id(params[:id])
     preview_params.reverse_merge!(article.attributes) if article
     session[:article_preview] = preview_params
   end
+
+protected
+
+  def article_type
+    Article
+  end
+
 end

data/app/controllers/articles_controller.rb

@@ -1,6 +1,6 @@
 class ArticlesController < ApplicationController
   unloadable
-  
+
   def index
     @page_title = 'Articles'
     if params[:category_id]
@@ -17,44 +17,43 @@ class ArticlesController < ApplicationController
     if params[:year]
       @page_title << " from #{params[:day]} #{Date::MONTHNAMES[params[:month].to_i] unless params[:month].nil?} #{params[:year]}"
     end
-    
-    @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(:limit => 20)
-    
+
+    @articles = article_type.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_type.per_page, :include => [:created_by] )
+
+    @tags = article_type.published.authored_by(@user).categorised(@category).tag_counts(:limit => 20)
+
     respond_to do |format|
       format.html # index.html.erb
       format.xml { render :xml => @articles }
       format.json { render :json => @articles }
-      format.rss 
-      format.js 
+      format.rss
+      format.js
     end
   end
 
   def show
-    @article = Article.published.find_by_permalink(params[:year], params[:month], params[:day], params[:permalink])
+    @article = article_type.published.find_by_permalink(params[:year], params[:month], params[:day], params[:permalink])
     @images = @article.assets.images
     @documents = @article.assets.documents
-    
+
     @page_title = @article.title
     @page_description = @article.description
     @page_keywords = @article.tag_list
-    
+
     @tags = @article.tag_counts
-    
+
     respond_to do |format|
       format.html # show.html.erb
       format.xml  { render :xml => @article }
     end
   end
-  
+
   def preview
     @page_class = 'show'
-    @article = Article.new(session[:article_preview])
+    @article = article_type.new(session[:article_preview])
     asset_ids = session[:article_preview][:asset_ids]
     @images = Asset.images.all(:conditions => {:id => asset_ids }).sort{|x,y| asset_ids.index(y.id.to_s) <=> asset_ids.index(x.id.to_s) }.reverse
     @documents = Asset.documents.all(:conditions => {:id => asset_ids }).sort{|x,y| asset_ids.index(y.id.to_s) <=> asset_ids.index(x.id.to_s) }.reverse
-
     @article.id = 0
     @article.published_at = Time.now
     @article.created_by = current_user
@@ -62,4 +61,11 @@ class ArticlesController < ApplicationController
     session[:article_preview] = nil
     render :action => "show"
   end
+
+protected
+
+  def article_type
+    Article
+  end
+
 end

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

@@ -1,16 +1,17 @@
 <h1>Listing Articles</h1>
 
 <ul class="choices">
-  <li><%= link_to 'New article', new_admin_article_path, :title => 'Create a new article' %></li>
+  <li><%= link_to 'New article', { :action => 'new' }, :title => 'Create a new article' %></li>
 </ul>
 
-<%= will_paginate %>
+<%= will_paginate @articles %>
 
 <table>
   <thead>
     <tr>
       <%= sortable_table_header :name => "Title", :sort => "title" %>
       <%= sortable_table_header :name => "Status",  :sort => "published_at" %>
+      <%= sortable_table_header :name => "Category",  :sort => "category" if Category.all.any? %>
       <%= sortable_table_header :name => "Author",  :sort => "created" %>
       <%= sortable_table_header :name => "Editor",  :sort => "updated" %>
       <%= sortable_table_header :name => "Updated",  :sort => "updated_at" %>
@@ -26,6 +27,9 @@
     <tr id="article-<%= article.id %>">
       <td><%= link_to h( article.title ), admin_article_path(article), :title => 'Edit this article' %></td>
       <td><%= content_status(article) %></td>
+<% if Category.all.any? -%>
+      <td><%=h article.category.title unless article.category.nil? %></td>
+<% end -%>
       <td><%= article.author %></td>
       <td><%= article.editor %></td>
       <td><%= article.updated_at.to_formatted_s(:short) %></td>
@@ -43,6 +47,7 @@
     <tr>
       <%= sortable_table_header :name => "Title", :sort => "title" %>
       <%= sortable_table_header :name => "Status",  :sort => "published_at" %>
+      <%= sortable_table_header :name => "Category",  :sort => "category" if Category.all.any? %>
       <%= sortable_table_header :name => "Author",  :sort => "created_by" %>
       <%= sortable_table_header :name => "Editor",  :sort => "updated_by" %>
       <%= sortable_table_header :name => "Updated",  :sort => "updated_at" %>
@@ -55,5 +60,5 @@
   </tfoot>
 </table>
 
-<%= will_paginate %>
+<%= will_paginate @articles %>
 

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

@@ -5,9 +5,9 @@
 
 <h1><%= @article.new_record? ? 'New' : 'Editing an' %> Article</h1>
 
-<% form_for([:admin, @article], :html => {:id => 'has-assets-form'}) do |f| %>
+<% form_for(:article, @article, :url => polymorphic_path([:admin, @article]), :html => {:id => 'has-assets-form', :method => ( @article.new_record? ? :post : :put ) }) do |f| %>
   <%= f.error_messages %>
-  
+
   <p>
     <%= f.label :title, 'Title*' %><br/>
     <%= f.text_field :title, :class => 'title' %>
@@ -28,7 +28,7 @@
 <% if Category.exists? %>
   <p>
     <%= f.label :category %>
-    <%= f.collection_select :category_id, Category.all, :id, :title, :prompt => true %> 
+    <%= f.collection_select :category_id, Category.all, :id, :title, :prompt => true %>
   </p>
 <% end -%>
   <p>

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

@@ -11,12 +11,12 @@
 
 <!-- so:main-content -->
 <div id="main-content">
-    
+
   <dl id="articles">
   <%= render :partial => @articles %>
   </dl>
-  
-  <%= will_paginate(:previous_label => 'previous', :next_label => 'next') %>
-    
+
+  <%= will_paginate(@articles, :previous_label => 'previous', :next_label => 'next') %>
+
 </div>
 <!-- eo:main-content -->

data/beef-articles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beef-articles}
-  s.version = "0.4.14"
+  s.version = "0.4.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve England"]
-  s.date = %q{2010-05-24}
+  s.date = %q{2010-06-23}
   s.email = %q{steve@wearebeef.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -60,19 +60,19 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/beef/articles}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Article/Blogging engine}
   s.test_files = [
     "test/articles_test.rb",
-     "test/test_helper.rb",
-     "test/schema.rb"
+     "test/schema.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mbleigh-acts-as-taggable-on>, [">= 0"])
       s.add_runtime_dependency(%q<jackdempsey-acts_as_commentable>, [">= 0"])
     else

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: beef-articles
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 0
   - 4
-  - 14
-  version: 0.4.14
+  - 15
+  version: 0.4.15
 platform: ruby
 authors: 
 - Steve England
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 +01:00
+date: 2010-06-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mbleigh-acts-as-taggable-on
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -36,11 +33,9 @@ dependencies:
   name: jackdempsey-acts_as_commentable
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -106,31 +101,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   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 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Article/Blogging engine
 test_files: 
 - test/articles_test.rb
-- test/test_helper.rb
 - test/schema.rb
+- test/test_helper.rb