bcms_blog 1.0.0 → 1.1.0

data/app/models/blog_post.rb

@@ -1,69 +1,113 @@
 class BlogPost < ActiveRecord::Base
   acts_as_content_block :taggable => true
-  
+
+  belongs_to_attachment
+  def set_attachment_file_path
+    # The default behavior is use /attachments/file.txt for the attachment path,
+    # assuming file.txt was the name of the file the user uploaded
+    # You should override this with your own strategy for setting the attachment path
+    super
+  end
+
+  def set_attachment_section
+    # The default behavior is to put all attachments in the root section
+    # Override this method if you would like to change that
+    super
+  end
+
+
   before_save :set_published_at
-  
+
   belongs_to :blog
   belongs_to_category
   belongs_to :author, :class_name => "User"
   has_many :comments, :class_name => "BlogComment", :foreign_key => "post_id"
-  
+
   before_validation :set_slug
-  validates_presence_of :name, :slug
+  validates_presence_of :name, :slug, :blog_id, :author_id
 
-  named_scope :published_on, lambda {|date|
-    d = if date.kind_of?(Hash)
-      Date.new(date[:year].to_i, date[:month].to_i, date[:day].to_i)
-    else
-      date
-    end
-    
-    {:conditions => [
-      "blog_posts.published_at >= ? AND blog_posts.published_at < ?", 
-      d.beginning_of_day, 
-      (d.beginning_of_day + 1.day)
-    ]}
+  named_scope :published_between, lambda { |start, finish|
+    { :conditions => [
+         "blog_posts.published_at >= ? AND blog_posts.published_at < ?",
+         start, finish ] }
   }
-      
-  named_scope :with_slug, lambda{|slug| {:conditions => ["blog_posts.slug = ?",slug]}}  
-  
+
+  named_scope :not_tagged_with, lambda { |tag| {
+    :conditions => [
+      "blog_posts.id not in (
+        SELECT taggings.taggable_id FROM taggings
+        JOIN tags ON tags.id = taggings.tag_id
+        WHERE taggings.taggable_type = 'BlogPost'
+        AND (tags.name = ?)
+      )",
+      tag
+    ]
+  } }
+
+  INCORRECT_PARAMETERS = "Incorrect parameters. This is probably because you are trying to view the " +
+                         "portlet through the CMS interface, and so we have no way of knowing what " +
+                         "post(s) to show"
+
+  delegate :editable_by?, :to => :blog
+
   def set_published_at
     if !published_at && publish_on_save
       self.published_at = Time.now
     end
   end
-  
+
+  # This is necessary because, oddly, the publish! method in the Publishing behaviour sends an update
+  # query directly to the database, bypassing callbacks, so published_at does not get set by our
+  # set_published_at callback.
+  def after_publish_with_set_published_at
+    if published_at.nil?
+      self.published_at = Time.now
+      self.save!
+    end
+    after_publish_without_set_published_at if respond_to? :after_publish_without_set_published_at
+  end
+  if instance_methods.map(&:to_s).include? 'after_publish'
+    alias_method_chain :after_publish, :set_published_at
+  else
+    alias_method       :after_publish, :after_publish_with_set_published_at
+  end
+
   def self.default_order
     "created_at desc"
   end
-  
+
   def self.columns_for_index
     [ {:label => "Name", :method => :name, :order => "name" },
-      {:label => "Published", :method => :published_label, :order => "published" } ]
-  end  
-  
+      {:label => "Published At", :method => :published_label, :order => "published_at" } ]
+  end
+
   def published_label
     published_at ? published_at.to_s(:date) : nil
   end
-  
+
   def set_slug
     self.slug = name.to_slug
   end
-  
+
+  def path
+    send("#{blog.name_for_path}_post_path", route_params)
+  end
+  def route_name
+    "#{blog.name_for_path}_post"
+  end
   def route_params
     {:year => year, :month => month, :day => day, :slug => slug}
-  end  
-  
+  end
+
   def year
     published_at.strftime("%Y") unless published_at.blank?
   end
-  
+
   def month
     published_at.strftime("%m") unless published_at.blank?
   end
-  
+
   def day
     published_at.strftime("%d") unless published_at.blank?
   end
-  
-end
+end

data/app/portlets/blog_post_portlet.rb

@@ -1,24 +1,38 @@
 class BlogPostPortlet < Portlet
-  
+  #render_inline false
+  #enable_template_editor false
+
   def render
-    # @blog_post should already be set by the page route
-    if !@blog_post && params[:blog_post_id]
-      @blog_post = BlogPost.find(params[:blog_post_id])
+    scope = Blog.find(self.blog_id).posts
+    if params[:blog_post_id]
+      @blog_post = scope.find(params[:blog_post_id])
+    elsif params[:slug]
+      if params[:year]
+        date = Date.new(params[:year].to_i, params[:month].to_i, params[:day].to_i)
+        scope = scope.published_between(date, date + 1.day)
+      end
+      @blog_post = scope.find_by_slug!(params[:slug])
+    else
+      raise BlogPost::INCORRECT_PARAMETERS
     end
+
     pmap = flash[instance_name] || params
+    pmap[:blog_comment] ||= {}
+
     @blog_comment = @blog_post.comments.build pmap[:blog_comment]
     @blog_comment.errors.add_from_hash flash["#{instance_name}_errors"]
   end
-  
+
   def create_comment
+    params[:blog_comment].merge! :ip => request.remote_ip
     blog_comment = BlogComment.new(params[:blog_comment])
-    if blog_comment.save
+    if blog_comment.valid? && blog_comment.save
       url_for_success
     else
       store_params_in_flash
       store_errors_in_flash(blog_comment.errors)
       url_for_failure
     end
-  end  
-    
-end
+  end
+
+end

data/app/portlets/blog_posts_portlet.rb

@@ -0,0 +1,50 @@
+class BlogPostsPortlet < Portlet
+  def after_initialize
+    self.render_blog_post_code ||= 'truncate(blog_post.name, 30)'
+  end
+
+  # Mark this as 'true' to allow the portlet's template to be editable via the CMS admin UI.
+  enable_template_editor false
+
+  def render(_options = {})
+    # Since we can't pass any options to render_portlet, you can use $blog_posts_portlet_options if you want to pass in/override some options
+    # This is an ugly workaround for https://browsermedia.lighthouseapp.com/projects/28481-browsercms-30/tickets/350-make-it-possible-to-pass-options-to-render_portletrender_connectable in case we want to call render_portlet with some options
+    _options = $blog_posts_portlet_options || {}
+    _options.symbolize_keys!
+
+    portlet_attributes = self.portlet_attributes.inject({}) {|hash, a| hash[a.name] = a.value; hash}.reject {|k,v| v.blank?}.symbolize_keys
+
+    #options.reverse_merge!(params.slice(:tags)).symbolize_keys!
+    @options = portlet_attributes.merge(_options)
+    Rails.logger.debug "... BlogPostsPortlet#render(options=#{@options.inspect} #{@options.class})"
+
+    if @options[:blog_id]
+      finder = Blog.find(@options[:blog_id]).posts
+    elsif @options[:blog_name]
+      finder = Blog.find_by_name(@options[:blog_name]).posts
+    else
+      finder = BlogPost
+    end
+
+    if @options[:tags].is_a?(Array) && @options[:tags].size > 1
+      other_tags = @options[:tags][1..-1]
+      @options[:tags] = @options[:tags][0]
+    end
+
+    finder = finder.published
+    finder = Blog.posts_finder(finder, @options)
+
+    @blog_posts = finder.all(
+      :limit => @options[:limit] || 25,
+      :order => "published_at desc"
+    )
+
+    if other_tags
+      @blog_posts.select! {|p| (p.tags.map(&:name).map(&:downcase) & other_tags.map(&:downcase)).size == other_tags.size }
+    end
+
+    raise ActiveRecord::RecordNotFound.new("No articles found") if @blog_posts.empty?
+
+    @portlet = self
+  end
+end

data/app/views/cms/blog_posts/_form.html.erb

@@ -1,6 +1,11 @@
-<%= f.cms_drop_down :blog_id, Blog.all.map{|b| [b.name, b.id]} %>
+<%= f.cms_text_field :name, :label => 'Title' %>
+<%= f.cms_text_area :summary, :style => "height: 200px", :instructions => 'This will be displayed on the list page with a Read More link if present' %>
+<%= f.cms_text_editor :body %>
+<%= f.cms_datetime_select :published_at, :label => "Date", :instructions=>"The 'published' date/time for the post which is displayed publically." %>
+<% unless @block.new_record? %>
+  <%= f.cms_drop_down :author_id, @block.blog.potential_authors.map { |u| ["#{u.full_name} (#{u.login})", u.id] } %>
+<% end %>
 <%= f.cms_drop_down :category_id, categories_for('Blog Post').map{|c| [c.path, c.id]}, :include_blank => true %>
-<%= f.cms_text_field :name %>
 <%= f.cms_tag_list %>
-<%= f.cms_text_area :summary, :style => "height: 200px" %>
-<%= f.cms_text_editor :body %>
+<%= f.cms_drop_down :blog_id, Blog.editable_by(current_user).map{|b| [b.name, b.id]} %>
+<%= f.cms_file_field :attachment_file, :label => "Image" %>

data/app/views/cms/blog_posts/no_access.html.erb

@@ -0,0 +1,9 @@
+<% content_for(:html_head) do %>
+<%= stylesheet_link_tag "cms/content_library" %>
+<% end %>
+<% page_title "Content Library / List #{content_type.display_name_plural}" %>
+<% @toolbar_title = "List #{content_type.display_name_plural}" %>
+
+<div class="roundedcorners">
+  <p>Sorry, you don't have the permissions to write blog posts.</p>
+</div>

data/app/views/cms/blog_posts/render.html.erb

@@ -1,5 +1 @@
-<%= render :partial => "portlets/blog_post/blog_post", :object => @content_block %>
-<h2>Comments</h2>
-<% for comment in @content_block.comments %>
-  <p><%=h comment.body %></p>
-<% end %>
+<%= render :partial => "partials/blog_post", :object => @content_block %>

data/app/views/cms/blogs/_form.html.erb

@@ -1,2 +1,28 @@
 <%= f.cms_text_field :name %>
-<%= f.cms_text_area :template, :default_value => Blog.default_template %>
+<%= f.cms_check_box :moderate_comments %>
+
+<div class="checkbox_group fields" style="float: left; width: 100%">
+  <label>Permissions</label>
+  <%= hidden_field_tag "blog[group_ids][]", "", :id => nil %>
+  <div class="checkboxes">
+    <% for group in Group.cms_access.all(:order => "groups.name") %>
+    <div class="checkbox_fields">
+        <%= check_box_tag "blog[group_ids][]", group.id,
+            @block.groups.include?(group), :class => "cms_group_ids", :id => "cms_group_ids_#{group.id}", :tabindex => next_tabindex %>
+        <label for="cms_group_ids_<%= group.id %>"><%= group.name %></label>
+    </div>
+    <% end %>
+    <div class="instructions">Which &ldquo;CMS&rdquo; groups can edit and publish the blog?</div>
+    <div class="check_uncheck">
+      <%= link_to_check_all 'input.cms_group_ids' %>, 
+      <%= link_to_uncheck_all 'input.cms_group_ids' %>
+    </div>
+  </div>
+</div>
+<br clear="all" />
+
+<%= f.cms_text_area :template, :default_value => Blog.default_template %>
+
+<div class="instructions" style="float:none">
+  Saving your blog might take a couple of seconds while everything is set up.
+</div>  

data/app/views/cms/blogs/admin_only.html.erb

@@ -0,0 +1,9 @@
+<% content_for(:html_head) do %>
+<%= stylesheet_link_tag "cms/content_library" %>
+<% end %>
+<% page_title "Content Library / List #{content_type.display_name_plural}" %>
+<% @toolbar_title = "List #{content_type.display_name_plural}" %>
+
+<div class="roundedcorners">
+  <p>Sorry, this section is restricted to administrators.</p>
+</div>

data/app/views/cms/blogs/render.html.erb

@@ -1,3 +1,2 @@
-<% page_title @blog.name %>
-<h1><%=h page_title %></h1>
-<%= render :partial => "portlets/blog_post/blog_post", :collection => @blog_posts %>
+<% page_title @page_title || @blog.name %>
+<%= render :partial => "partials/blog_post", :collection => @blog_posts %>

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

@@ -0,0 +1,18 @@
+xml.instruct! :xml, :version=>"1.0" 
+xml.rss(:version=>"2.0") do
+  xml.channel do
+    xml.title("#{@blog.name} Posts Feed")
+    xml.link(blog_feeds_url(:id => @blog.id, :format => "rss"))
+    xml.description("")
+    xml.language('en-us')
+      for post in @blog_posts
+        xml.item do
+          xml.title(post.name)
+          xml.description(post.summary) unless post.summary.blank?             
+          xml.pubDate(post.published_at.strftime("%a, %d %b %Y %H:%M:%S %z")) unless post.published_at.blank?
+          xml.link(send("#{@blog.name_for_path}_post_url", post.route_params))
+          xml.guid(send("#{@blog.name_for_path}_post_url", post.route_params))
+        end
+      end
+  end
+end

data/app/views/partials/_blog_post.html.erb

@@ -0,0 +1,102 @@
+<style>
+  .blog_post {
+    border-bottom: 1px solid #ccc;
+    margin-bottom: 20px;
+  }
+
+  .blog_post h2 {
+    margin-bottom: 0
+  }
+
+  .blog_post h2,
+  .blog_post h2 a {
+    font: normal 30px/28px 'arial black', arial, sans-serif !important;
+    text-decoration: none !important;
+  }
+  .blog_post h2 a:hover {
+    text-decoration: underline !important;
+  }
+
+  .blog_post .image {
+    float: left;
+    border: 1px solid #ccc;
+    margin: 10px;
+    margin-top: 0;
+  }
+  .blog_post .date {
+    color: #666;
+  }
+  .blog_post .read_more {
+    font-weight: bold;
+  }
+
+  .blog_post .comment + .comment {
+    border-top: 1px dashed #ccc;
+  }
+
+  .clear {
+    clear: both;
+  }
+</style>
+
+<%
+  # _counter is defined only if we pass :collection to the partial
+  if defined?(blog_post_counter)
+    showing_individual_post = false
+  else
+    showing_individual_post = true
+    blog_post_counter = 0
+  end
+%>
+
+<div id="blog_post_<%= blog_post.id %>" class="blog_post clear">
+  <% if blog_post.attachment %>
+    <div class="image">
+      <%= image_tag blog_post.attachment.file_path %>
+    </div>
+  <% end %>
+
+  <h2><%= link_to h(blog_post.name), href = _blog_post_path(blog_post) %></h2>
+  
+  <div class="date"><%= blog_post.published_at.to_s(:long) %></div>
+  
+  <div class="body">
+    <% if showing_individual_post or blog_post.summary.blank? %>
+      <%= blog_post.body %>
+    <% else %>
+      <%= blog_post.summary %>
+      <p class="read_more">
+        <%= link_to 'Read More »', href %>
+      </p>
+    <% end %>
+  </div>
+  
+  <div class="meta">
+    <% unless blog_post.category_id.blank? %>
+      Posted in <%= link_to h(blog_post.category_name), _blog_path(blog_post.blog, 'posts_in_category', :category => blog_post.category_name) %>
+      <strong>|</strong>
+    <% end %>
+
+    <% if blog_post.tags.any? %>
+      Tags:
+      <span class="tags">
+        <%= blog_post.tags.map{|t| link_to(h(t.name), _blog_path(blog_post.blog, 'posts_with_tag', :tag => t.name)) }.join(", ") %>
+      </span>
+      <strong>|</strong>
+    <% end %>
+    
+    <%= link_to h(pluralize(blog_post.comments.published.count, "Comment")), "#{_blog_post_path(blog_post)}#comments" %>
+  </div>
+  <br class="clear" />
+
+  <% comments = blog_post.comments.published.reject(&:new_record?) %>
+  <% if showing_individual_post and comments.any? -%>
+    <h2>Comments</h2>
+    <% comments.each_with_index do |comment, i| %>
+      <div class="comment <%= 'first' if i == 0 %>">
+        <%= h comment.body %>
+        <p>&mdash;<%= comment.url.present? ? link_to(h(comment.author), comment.url) : h(comment.author) %></p>
+      </div>
+    <% end %>
+  <% end %>
+</div>

data/app/views/partials/_blog_post.html.haml

@@ -0,0 +1,91 @@
+%style
+  :sass
+    .blog_post.first
+      h2, h2 a
+        font: normal 30px/28px 'arial black', arial, sans-serif !important
+      border-bottom: 1px solid #ccc
+
+    .blog_post
+      border: 0px solid gray
+      margin-bottom: 20px
+
+      h2
+        margin-bottom: 0
+      h2, h2 a
+        font: normal 20px/23px 'arial black', arial, sans-serif !important
+        text-decoration: none !important
+      h2 a:hover
+        text-decoration: underline !important
+
+      .image
+        float: left
+        border: 1px solid #ccc
+        margin: 10px
+        margin-top: 0
+
+      .date
+        color: #666
+      .read_more
+        font-weight: bold
+
+      .comment + .comment
+        border-top: 1px dashed #ccc
+
+    .clear
+      clear: both
+
+:ruby
+  # _counter is defined only if we pass :collection to the partial
+  if defined?(blog_post_counter)
+    showing_individual_post = false
+  else
+    showing_individual_post = true
+    blog_post_counter = 0
+  end
+
+  if blog_post_counter == 0
+    max_width = 250
+    css_class = 'first'
+  else
+    max_width = 75
+    css_class = ''
+  end
+
+.blog_post.clear{:id => "blog_post_#{blog_post.id}", :class => css_class}
+  - if blog_post.attachment
+    -# .image= image_tag_with_max_size blog_post.attachment.file_path, blog_post.attachment.full_file_location, :width => max_width
+    .image= image_tag blog_post.attachment.file_path
+
+  %h2= link_to h(blog_post.name), href = _blog_post_path(blog_post)
+
+  .date= blog_post.published_at.to_s(:long)
+
+  .body
+    - if showing_individual_post or blog_post.summary.blank?
+      = blog_post.body
+    - else
+      = blog_post.summary
+      %p.read_more= link_to 'Read More »', href
+
+  - if showing_individual_post || blog_post_counter == 0
+    .meta
+      - unless blog_post.category_id.blank?
+        Posted in #{link_to h(blog_post.category_name), _blog_path(blog_post.blog, 'posts_in_category', :category => blog_post.category_name)}
+        %strong |
+      - if blog_post.tags.any?
+        Tags:
+        %span.tags
+          = blog_post.tags.map{|t| link_to(h(t.name), _blog_path(blog_post.blog, 'posts_with_tag', :tag => t.name)) }.join(", ")
+        %strong |
+        = link_to h(pluralize(blog_post.comments_count, "Comment")), "#{_blog_post_path(blog_post)}#comments"
+  %br.clear/
+
+  - comments = blog_post.comments.reject(&:new_record?)
+  - if showing_individual_post and comments.any?
+    %h2 Comments
+    - comments.each_with_index do |comment, i|
+      %div{:class => "comment #{'first' if i == 0}"}
+        = h comment.body
+        %p
+          \—#{comment.url.present? ? link_to(h(comment.author), comment.url) : h(comment.author)}
+

data/app/views/portlets/blog_post/_form.html.erb

@@ -1,2 +1,3 @@
 <%= f.cms_text_field :name %>
-<%= f.cms_text_area :template, :default_value => @block.class.default_template %>
+<%= f.cms_drop_down :blog_id, Blog.all.map{|b| [b.name, b.id.to_s]} %>
+<%# f.cms_text_area :template, :default_value => @block.class.default_template %>

data/app/views/portlets/blog_post/render.html.erb

@@ -1,36 +1,33 @@
-<% if @blog_post -%>
-  <% page_title @blog_post.name %>
-  <%= render :partial => "portlets/blog_post/blog_post", :object => @blog_post %>
-  <h2>Comments</h2>
-  <% for comment in @blog_post.comments %>
-    <p><%=h comment.body %></p>
-  <% end %>  
-  <div class="blog_comment_form">
-    <% form_for @blog_comment, :url => cms_handler_path(@portlet, "create_comment") do |f| %>
-      <%= f.hidden_field :post_id %>
-      <%= f.error_messages %>
-      <p>
-        <%= f.label :author %>
-        <%= f.text_field :author %>
-      </p>
-      <p>
-        <%= f.label :email %>
-        <%= f.text_field :email %>
-      </p>
-      <p>
-        <%= f.label :url %>
-        <%= f.text_field :url %>
-      </p>
-      <p>
-        <%= f.label :body %>
-        <%= f.text_area :body, :size => "50x3" %>
-      </p>
-      <p>
-        <%= submit_tag "Submit" %>
-      </p>
-    <% end %>
-  </div>  
-<% else -%>
-  <b>Missing required parameter</b><br/>
-  This portlet expects a request parameter 'blog_post_id'. Be sure the calling page provides it.
-<% end -%>
+<% page_title @blog_post.name %>
+<%= render :partial => "partials/blog_post", :object => @blog_post %>
+
+<style>
+  @import url('/stylesheets/cms/form_layout.css');
+</style>
+
+<div class="blog_comment_form">
+  <% form_for @blog_comment, :url => cms_handler_path(@portlet, "create_comment") do |f| %>
+    <%= f.hidden_field :post_id %>
+    <%= f.error_messages %>
+    <div class="fields text_fields">
+      <%= f.label :author, 'Name *' %>
+      <%= f.text_field :author %>
+    </div>
+    <div class="fields text_fields clear">
+      <%= f.label :email, 'E-mail address' %>
+      <%= f.text_field :email %>
+    </div>
+    <div class="fields text_fields clear">
+      <%= f.label :url, 'Web site' %>
+      <%= f.text_field :url %>
+    </div>
+    <div class="fields text_editor_fields clear">
+      <%= f.label :body, 'Body *' %>
+      <br/>
+      <%= f.text_area :body, :size => "50x5", :style => 'height: auto'  %>
+    </div>
+    <div class="buttons clear">
+      <%= submit_tag "Submit comment" %>
+    </div>
+  <% end %>
+</div>

data/app/views/portlets/blog_posts/_form.html.erb

@@ -0,0 +1,13 @@
+<%= f.cms_text_field :name, :label => 'Portlet Name', :instructions => 'Since we may have many Articles portlets, each with different parameters, give each portlet a descriptive name.' %>
+
+<%= f.cms_drop_down :blog_id, Blog.all.map{|b| [b.name, b.id.to_s]}, :include_blank => true, :label => "Show posts from", :instructions => 'Leave blank to include posts from all blogs' %>
+<%# f.cms_drop_down :show_posts_as, [['First post as full post, the rest as Summary + Read More link', 'first_full_post_others_summary'], ['Summary + Read More link', 'summary'], ['Full post', 'full_post'], ['Title (links to post)', 'link']] %>
+<%= f.cms_drop_down :show_posts_as, [['Title (links to post)', 'link'], ['Post', 'post']] %>
+<%= f.cms_check_box :show_full_posts %>
+<%= f.cms_drop_down :category_id, categories_for('Blog Post').map{|c| [c.path, c.id]}, :include_blank => true, :label => "Only posts in category" %>
+<%= f.cms_tag_list :label => "Only posts with tags", :instructions => 'Separate tags with spaces' %>
+<%= f.cms_text_field :exclude_tags, :label => 'Exclude posts with tags' %>
+<%= f.cms_text_field :limit, :label => 'Limit' %>
+<%= f.cms_text_area :render_blog_post_code, :label => 'Code to turn blog_post into link text' %>
+
+<%= f.cms_template_editor :template %>

data/app/views/portlets/blog_posts/render.html.haml

@@ -0,0 +1,9 @@
+- if @portlet.show_posts_as == 'post'
+  = render :partial => '/partials/blog_post', :collection => @blog_posts, :locals => {:show_full_posts => @options[:show_full_posts]}
+- elsif @portlet.show_posts_as == 'link'
+  %ul.blog_posts
+    - for blog_post in @blog_posts
+      - text = @portlet.render_blog_post_code.present? ? eval(@portlet.render_blog_post_code) : text = truncate(blog_post.name, 30)
+      %li= link_to text, _blog_post_path(blog_post)
+- else
+  Unrecognized option '#{@portlet.show_posts_as}' for @portlet.show_posts_as