beef-articles 0.2.2 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/app/helpers/articles_helper.rb

@@ -9,42 +9,42 @@ module ArticlesHelper
   
   def comments_link(article)
     if(article.comments.count!=0)
-      "|  #{link_to('Comment'.pluralize, article_permalink(article, :anchor => 'comments'))} (#{article.comments.count.to_s})"
+      "|  #{link_to('Comment'.pluralize, [article, {:anchor => 'comments'}])} (#{article.comments.count.to_s})"
     else
-      "#{(article.commentable?)? '|' : ''}  #{link_to 'Comment', article_permalink(article, :anchor => 'comments') if article.commentable?}"
+      "#{(article.commentable?)? '|' : ''}  #{link_to 'Comment', [article, {:anchor => 'comments'}] if article.commentable?}"
     end
   end
 
-  def digg_link(article, html_options = {})
-    link_to 'Digg', "http://digg.com/submit?phase=2&url=#{article_permalink(article, :only_path => false)}", html_options.reverse_merge(:class => 'share-link', :id => 'digg-submit', :title => 'Digg this!')
+  def digg_link(options, html_options = {})
+    link_to 'Digg', "http://digg.com/submit?phase=2&url=#{url_for(options)}", html_options.reverse_merge(:class => 'share-link', :id => 'digg-submit', :title => 'Digg this!')
   end
 
-  def delicious_link(article, html_options = {})
-    link_to 'delicious', "http://del.icio.us/post?url=#{article_permalink(article, :only_path => false)}", html_options.reverse_merge(:class => 'share-link', :id => 'delicious-submit', :title => 'Save to delicious')
+  def delicious_link(options, html_options = {})
+    link_to 'delicious', "http://del.icio.us/post?url=#{url_for(options)}", html_options.reverse_merge(:class => 'share-link', :id => 'delicious-submit', :title => 'Save to delicious')
   end
   
-  def facebook_link(article, html_options = {})
-    link_to 'Facebook', "http://www.facebook.com/sharer.php?u=#{article_permalink(article, :only_path => false)}", html_options.reverse_merge(:class => 'share-link', :id => 'facebook-submit', :title => 'Share on Facebook')
+  def facebook_link(options, html_options = {})
+    link_to 'Facebook', "http://www.facebook.com/sharer.php?u=#{url_for(options)}", html_options.reverse_merge(:class => 'share-link', :id => 'facebook-submit', :title => 'Share on Facebook')
   end
   
-  def stumble_link(article, html_options = {})
-    link_to 'Stumble Upon', "http://www.stumbleupon.com/submit?url=#{article_permalink(article, :only_path => false)}", html_options.reverse_merge(:class => 'share-link', :id => 'stumble-submit', :title => 'Stumble on this')
+  def stumble_link(options, html_options = {})
+    link_to 'Stumble Upon', "http://www.stumbleupon.com/submit?url=#{url_for(options)}", html_options.reverse_merge(:class => 'share-link', :id => 'stumble-submit', :title => 'Stumble on this')
   end
   
-  def mail_link(article, html_options = {})
-    mail_to nil, "Email", html_options.reverse_merge( :subject => article.title, :body => article_permalink(article, :only_path => false), :class => 'share-link', :id => 'mail-link', :title => 'Email this to a friend')
+  def mail_link(options, html_options = {})
+    mail_to nil, "Email", html_options.reverse_merge( :body => url_for(options), :class => 'share-link', :id => 'mail-link', :title => 'Email this to a friend')
   end
   
-  def twitter_link(article, html_options = {})
-    link_to 'Twitter', "http://twitter.com/home?status=#{article_permalink(article, :only_path => false)}", html_options.reverse_merge(:class => 'share-link', :id => 'twitter-submit', :title => 'Tweet this')
+  def twitter_link(options, html_options = {})
+    link_to 'Twitter', "http://twitter.com/home?status=#{url_for(options)}}", html_options.reverse_merge(:class => 'share-link', :id => 'twitter-submit', :title => 'Tweet this')
   end
   
-  def reddit_link(article, html_options = {})
-    link_to 'Reddit', "http://www.reddit.com/submit?url=#{article_permalink(article, :only_path => false)}", html_options.reverse_merge(:class => 'share-link', :id => 'reddit-submit', :title => 'Reddit this!')
+  def reddit_link(options, html_options = {})
+    link_to 'Reddit', "http://www.reddit.com/submit?url=#{url_for(options)}", html_options.reverse_merge(:class => 'share-link', :id => 'reddit-submit', :title => 'Reddit this!')
   end
     
-  def technorati_link(article, html_options = {})
-    link_to 'Technorati', "http://technorati.com/faves/?add=#{article_permalink(article, :only_path => false)}", html_options.reverse_merge(:class => 'share-link', :id => 'technorati-submit', :title => 'Technorati this!')
+  def technorati_link(options, html_options = {})
+    link_to 'Technorati', "http://technorati.com/faves/?add=#{url_for(options)}", html_options.reverse_merge(:class => 'share-link', :id => 'technorati-submit', :title => 'Technorati this!')
   end
   
   def archive(options = {} )
@@ -93,7 +93,7 @@ module ArticlesHelper
   
   def articles_list(articles)
     return if articles.empty?
-    articles.collect! { |article| content_tag( 'li', "#{link_to(article.title, article_permalink(article))}")    }
+    articles.collect! { |article| content_tag( 'li', "#{link_to(article.title, article)}")    }
     content_tag( 'ul', articles.join, :class => 'article-list' )
   end
   

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

@@ -21,13 +21,13 @@
   <tbody>
 <% @articles.each do |article| %>
     <tr id="article-<%= article.id %>">
-      <td><%=h article.title %></td>
+      <td><%= link_to h( article.title ), admin_article_path(article) %></td>
       <td><%= content_status(article) %></td>
       <td><%= article.author %></td>
       <td><%= article.updated_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_permalink(article), :class => 'show' if article.published? %></td>
+      <td><%= link_to 'Show', article_url(article), :class => 'show' if article.published? %></td>
       <td><%= link_to 'Edit', admin_article_path(article), :class => 'edit' %></td>
       <td><%= link_to 'Destroy', admin_article_path(article), :confirm => 'Are you sure?', :method => :delete, :class => 'delete' %></td>
     </tr>

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

@@ -1,7 +1,7 @@
 <!-- so:post -->
 <dt>
-  <%= link_to h(article.title), article_permalink(article) %>
-  <%= link_to(image_tag(article.assets.images.first.public_filename(:medium)), article_permalink(article)) unless article.assets.images.first.nil? %>
+  <%= link_to h(article.title), article %>
+  <%= link_to(image_tag(article.assets.images.first.public_filename(:medium)), article) unless article.assets.images.first.nil? %>
 </dt>
 <dd>
   <p class="post-meta">

data/app/views/articles/index.rss.builder

@@ -10,8 +10,8 @@ xml.rss(:version=>"2.0") do
           xml.category(article.tag_list)
           xml.description(article.description)
           xml.pubDate(article.published_at.rfc822)
-          xml.link(article_permalink(article, :only_path => false))
-          xml.guid(article_permalink(article, :only_path => false))
+          xml.link(article_url(article))
+          xml.guid(article_url(article))
         end
       end
   end

data/app/views/comments/_comment.html.erb

@@ -1,4 +1,4 @@
 <li id="comment-<%= comment.id %>">
   <%= sanitize comment.comment, :tags => Settings.allowed_html_tags_for_UGC.to_s.split(' '), :attributes => Settings.allowed_html_attributes_for_UGC.to_s.split(' ') %>
-  <a href="<%= article_permalink(commentable, :anchor => "comment-#{comment.id}") %>" title="Permalink to this comment"><%= comment.created_at.to_formatted_s(:short_dot)%></a> | posted by <%= link_to_unless comment.website.blank?, comment.name, "http://#{comment.website}" %>
+  <%= link_to comment.created_at.to_formatted_s(:short_dot), article_url(commentable, :anchor => "comment-#{comment.id}"), :title => "Permalink to this comment" %> | posted by <%= link_to_unless comment.website.blank?, comment.name, "http://#{comment.website}" %>
 </li>

data/articles.gemspec

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

data/config/routes.rb

@@ -17,7 +17,7 @@ ActionController::Routing::Routes.draw do |map|
     :controller => 'articles', :action => 'show',
     :year => /\d{4}/, :day => /\d{1,2}/, :month => /\d{1,2}/,
     :path_prefix => nil
-  map.resources :articles, :only => [:index], :collection => { :preview => :get }, :has_many => [:comments, { :only => :create } ]
+  map.resources :articles, :only => [:index], :collection => { :preview => :get }, :has_many => :comments
 
   map.namespace(:admin) do |admin|
     admin.resources :categories

data/lib/articles.rb

@@ -1,7 +1,11 @@
 module Beef
   module Articles
-    def article_permalink(article, options = {})
+    def article_path(article, options = {})
       article_permalink_path(article.published_at.year,article.published_at.month,article.published_at.day,article.permalink,options)
     end
+    
+    def article_url(article, options = {}) 
+      article_path(article, options.merge(:only_path => false)) 
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beef-articles
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Steve England
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-14 00:00:00 -07:00
+date: 2009-07-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency