wheelhouse-blog 1.0.1 → 1.0.2

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2011-12 Sam Pohlenz
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,6 +1,8 @@
 Blog Plugin for Wheelhouse CMS
 ==============================
 
+![Screenshot of blog plugin](https://www.wheelhousecms.com/media/308e77b2/Blog-Plugin.png)
+
 This gem makes it easy to integrate a blog or news feed into your Wheelhouse CMS site.
 
 It currently supports:
@@ -9,6 +11,7 @@ It currently supports:
 - tags
 - categories
 - archives
+- pagination
 - multiple blogs
 
 It does not yet support commenting but this will be implemented in the near future. In the meanwhile, it is fairly easy to integrate comments using a third-party JavaScript library such as [Disqus](http://disqus.com/) or [Facebook Comments](https://developers.facebook.com/docs/reference/plugins/comments/).
@@ -25,4 +28,4 @@ Then run `bundle install`.
 
 **2. Create a new blog from the New Page dropdown.**
 
-**3. Copy the templates from `app/templates/blog` to your theme templates folder to customize.**
+**3. To customize, copy the partials (`_post.html.haml` and `_layout.html.haml`) from `app/templates/blog` to your theme templates folder.**

data/app/assets/stylesheets/wheelhouse-blog/admin.css.sass

@@ -13,3 +13,13 @@
   li
     margin-top: 0
     margin-bottom: 3px
+
+.posts-per-page
+  label
+    width: 40%
+    line-height: 2.5
+  
+  input[type="text"]
+    width: 4em
+    float: left
+    

data/app/handlers/blog/blog_handler.rb

@@ -1,34 +1,37 @@
 class Blog::BlogHandler < Wheelhouse::ResourceHandler
-  get :cache => true do
-    # Nothing extra required
+  get "/(page/:page)", :cache => true do
+    @posts = paginate(@blog.posts)
   end
 
   get "/feed.xml", :cache => true do
-    request.format = :xml
-    render :template => "feed.xml", :layout => false
+    render :template => "feed", :formats => [:rss], :layout => false
   end
   
-  get '/tag/:tag', :cache => true do
-    @posts = @blog.posts.tagged_with(params[:tag])
-    render :template => "tag.html"
+  get '/tag/:tag(/page/:page)', :cache => true do
+    @posts = paginate(@blog.posts.tagged_with(params[:tag]))
+    render :template => "tag"
   end
   
-  get '/category/:category', :cache => true do
-    @posts = @blog.posts.in_category(params[:category])
-    render :template => "category.html"
+  get '/category/:category(/page/:page)', :cache => true do
+    @posts = paginate(@blog.posts.in_category(params[:category]))
+    render :template => "category"
+  end
+  
+  get "/:year(/:month)(/page/:page)", :cache => true do
+    @archive = Blog::Archive.new(@blog, params[:year], params[:month].presence)
+    raise ActionController::RoutingError, "No route matches #{request.path.inspect}" if @archive.invalid?
+    
+    @posts = paginate(@archive.posts)
+    render :template => "archive"
   end
   
   get "/:year/:month/:permalink", :cache => true do
     @post = @blog.find_post(params[:year], params[:month], params[:permalink])
     render @post
   end
-  
-  get "/:year/:month", :cache => true do
-    @year  = params[:year].to_i
-    @month = params[:month].to_i
-    raise ActionController::RoutingError, "No route matches #{request.path.inspect}" if @year.zero? || @month.zero?
-    
-    @posts = @blog.posts.in_year_and_month(@year, @month)
-    render :template => "archive.html"
+
+private
+  def paginate(posts)
+    posts.paginate(:page => params[:page].presence || 1, :per_page => @blog.posts_per_page)
   end
 end

data/app/helpers/blog/blog_helper.rb

@@ -1,9 +1,15 @@
 module Blog::BlogHelper
+  def blog(label=nil)
+    @_blogs ||= {}
+    
+    if label
+      @_blogs[label] ||= Blog::Blog.get(label)
+    else
+      @_blogs[:default] ||= Blog::Blog.first
+    end
+  end
+  
   def blog_post_tag_links(post)
     post.tags.map { |tag| link_to(tag, post.blog.tag_path(tag), :title => "View all posts tagged #{tag}") }.join(', ').html_safe
   end
-
-  def format_month(year, month)
-    "#{Date::MONTHNAMES[month]} #{year}"
-  end
 end

data/app/helpers/blog/pagination_helper.rb

@@ -0,0 +1,32 @@
+module Blog::PaginationHelper
+  WILL_PAGINATE_BASE = defined?(WillPaginate::ViewHelpers) ? WillPaginate::ViewHelpers::LinkRenderer : WillPaginate::LinkRenderer
+  
+  class LinkRenderer < WILL_PAGINATE_BASE
+    PAGE_PARAMETER = /\/page\/\d+$/
+    
+  protected
+    def url(page)
+      path = @template.request.path
+      
+      if page == 1
+        path.sub(PAGE_PARAMETER, "")
+      elsif path =~ PAGE_PARAMETER
+        path.sub(PAGE_PARAMETER, "/page/#{page}")
+      else
+        path + "/page/#{page}"
+      end
+    end
+    alias url_for url
+  end
+  
+  DEFAULTS = {
+    :renderer => LinkRenderer,
+    :next_label => "Older Posts &raquo;",
+    :previous_label => "&laquo; Newer Posts",
+    :page_links => false
+  }
+  
+  def blog_pagination(options={})
+    will_paginate(@posts, DEFAULTS.merge(options)) if @posts
+  end
+end

data/app/models/blog/archive.rb

@@ -0,0 +1,75 @@
+class Blog::Archive
+  attr_reader :year, :month
+  attr_accessor :count
+  
+  def initialize(blog, year, month=nil)
+    @blog, @year = blog, year.to_i
+    @month = month.to_i if month
+    yield self if block_given?
+  end
+  
+  def to_s
+    format.to_s
+  end
+  
+  def format(format="%B %Y")
+    month ? to_date.strftime(format) : year
+  end
+  
+  def path
+    @blog.path(year, month)
+  end
+  
+  def posts
+    @posts ||= begin
+      posts = @blog.posts.where(:year => year)
+      posts = posts.where(:month => month) if month
+      posts
+    end
+  end
+  
+  def invalid?
+    month.present? && !valid_month?
+  end
+  
+  def to_date
+    Date.new(year, month, 1)
+  end
+  
+  def <=>(other)
+    other.to_date <=> to_date
+  end
+  
+  def self.from_mongo(blog, hash)
+    new(blog, hash["year"], hash["month"]) do |archive|
+      archive.count = hash["count"].to_i
+    end
+  end
+  
+  def self.build(blog, options)
+    options[:group] ||= [:year, :month]
+    
+    group(blog.posts, :key => options[:group]).map { |hash|
+      Blog::Archive.from_mongo(blog, hash)
+    }.sort
+  end
+  
+  # Backwards-compatiblity with old-style archives
+  def to_ary
+    [to_date, path, count]
+  end
+
+private
+  def valid_month?
+    month > 0 && month < 12
+  end
+  
+  def self.group(base, options={})
+    scope = base.current_scope
+    selector, _ = MongoModel::MongoOptions.new(scope.klass, scope.finder_options).to_a
+    
+    scope.collection.group({ :cond => selector,
+                             :initial => { :count => 0 },
+                             :reduce => "function(doc, out) { out.count++; }" }.merge(options))
+  end
+end

data/app/models/blog/blog.rb

@@ -3,9 +3,12 @@ class Blog::Blog < Wheelhouse::Resource
   include Wheelhouse::Resource::Content
 
   property :title, String, :translate => true, :required => true
+  property :posts_per_page, Integer, :default => 20
 
   has_many :posts, :class => "Blog::Post", :conditions => { :state => 'Published' }, :order => :published_at.desc
-  has_many :all_posts, :class => "Blog::Post", :order => :created_at.desc
+  has_many :all_posts, :class => "Blog::Post"
+  has_many :posts_for_admin, :class => "Blog::Post", :order => [:_admin_sort_index.desc, :created_at.desc],
+                             :select => [:id, :type, :title, :state, :published_at, :created_by_id, :author_name, :blog_id]
 
   activities :all
   
@@ -21,6 +24,10 @@ class Blog::Blog < Wheelhouse::Resource
     posts.find_by_year_and_month_and_permalink!(year.to_i, month.to_i, permalink)
   end
   
+  def feed_path
+    path('feed.xml')
+  end
+  
   def tag_path(tag)
     path('tag', tag.parameterize)
   end
@@ -29,27 +36,20 @@ class Blog::Blog < Wheelhouse::Resource
     path('category', category.parameterize)
   end
   
-  def archive_path(year, month)
-    path(year.to_i, month.to_i)
+  def archive_path(year, month=nil)
+    month ? path(year.to_i, month.to_i) : path(year.to_i)
   end
   
-  def archives
-    selector = MongoModel::MongoOptions.new(posts.klass, posts.finder_options).to_a.first
-    posts.collection.group(:key => [:year, :month], :cond => selector, :initial => { :count => 0 }, :reduce => "function(doc, out) { out.count++ }").map { |hash|
-      year, month, count = hash["year"], hash["month"], hash["count"]
-      
-      [Date.civil(year, month, 1), archive_path(year, month), count.to_i]
-    }.sort { |a, b| b.first <=> a.first }
+  def archives(options={})
+    Blog::Archive.build(self, options)
   end
   
   def tags
-    selector = MongoModel::MongoOptions.new(posts.klass, posts.finder_options).to_a.first
-    posts.collection.distinct(:tags, selector)
+    Blog::Tag.for_blog(self).cached
   end
   
   def categories
-    selector = MongoModel::MongoOptions.new(posts.klass, posts.finder_options).to_a.first
-    posts.collection.distinct(:categories, selector)
+    Blog::Category.for_blog(self).cached
   end
   
   def additional_children

data/app/models/blog/category.rb

@@ -0,0 +1 @@
+Blog::Category = Blog::Taxonomy.new(:categories)

data/app/models/blog/post.rb

@@ -29,17 +29,19 @@ class Blog::Post < Wheelhouse::Resource
   
   scope :tagged_with, lambda { |tag| where(:_tags => tag.parameterize) }
   scope :in_category, lambda { |category| where(:_categories => category.parameterize) }
-  scope :in_year_and_month, lambda { |year, month| where(:year => year, :month => month) }
-  
-  scope :properties_for_admin, select(:id, :type, :title, :state, :published_at, :created_by_id, :author_name, :blog_id)
   
   before_save :set_published_timestamp, :if => :published?
   before_save :cache_author_name
+  before_save :set_admin_sort_index
   
   delegate :site, :to => :blog
+  
   after_save :clear_cache!
   after_destroy :clear_cache!
   
+  after_save :update_taxonomies
+  after_destroy :update_taxonomies
+  
   self.parent_resource = :blog
   self.default_template = "post"
   
@@ -81,4 +83,13 @@ private
   def cache_author_name
     write_attribute(:author_name, author.name) if author
   end
+  
+  def update_taxonomies
+    Blog::Tag.refresh
+    Blog::Category.refresh
+  end
+  
+  def set_admin_sort_index
+    attributes[:_admin_sort_index] = published? ? [0, published_at.to_i] : [1, updated_at.to_i]
+  end
 end

data/app/models/blog/tag.rb

@@ -0,0 +1 @@
+Blog::Tag = Blog::Taxonomy.new(:tags)

data/app/models/blog/taxonomy.rb

@@ -0,0 +1,112 @@
+class Blog::Taxonomy
+  include MongoModel::MapReduce
+  
+  class_attribute :taxonomy_type
+  
+  class << self
+    alias_method :subclass_new, :new
+  end
+  
+  def self.new(type)
+    Class.new(self) do
+      self.taxonomy_type = type
+      
+      def self.new(*args, &block)
+        subclass_new(*args, &block)
+      end
+    end
+  end
+  
+  self.parent_collection = Blog::Post.collection
+  
+  attr_reader :name, :count
+  attr_accessor :blog
+  
+  def initialize(name, count)
+    @name, @count = name, count.to_i
+  end
+  
+  def path
+    raise "#path requires a blog to be set" unless blog
+    blog.send(path_method, name)
+  end
+  
+  def to_s
+    name
+  end
+  
+  def parameterize
+    name.parameterize
+  end
+  
+  def hash
+    name.hash
+  end
+  
+  def inspect
+    "#<#{self.class.name} \"#{name}\">"
+  end
+  
+  def ==(other)
+    if other === self.class
+      self == other
+    else
+      name == other
+    end
+  end
+  alias eql? ==
+  
+  def self.alphabetical
+    order(:"_id.name".asc)
+  end
+  
+  def self.top(n=nil)
+    ordered = order(:value.desc)
+    n ? ordered.first(n) : ordered
+  end
+  
+  def self.refresh
+    scoped.to_a
+  end
+  
+  def self.for_blog(blog)
+    where('_id.blog_id' => blog.id).on_load do |taxonomy|
+      taxonomy.blog = blog
+    end
+  end
+  
+  def self.from_mongo(attrs)
+    new(attrs['_id']['name'], attrs['value'])
+  end
+  
+  def self.map_function
+    <<-MAP
+    function() {
+      if (!this.#{taxonomy_type}) { return; }
+      
+      for (i in this.#{taxonomy_type}) {
+        emit({ blog_id: this.blog_id, name: this.#{taxonomy_type}[i] }, 1);
+      }
+    }
+    MAP
+  end
+  
+  def self.reduce_function
+    <<-REDUCE
+    function(key, values) {
+      var count = 0;
+      
+      for (i in values) {
+        count += values[i];
+      }
+      
+      return count;
+    }
+    REDUCE
+  end
+
+private
+  def path_method
+    "#{self.class.taxonomy_type.to_s.singularize}_path"
+  end
+end

data/app/templates/blog/_layout.html.haml

@@ -4,3 +4,5 @@
   %p= description
 
 = yield
+
+= blog_pagination

data/app/templates/blog/archive.html.haml

@@ -1,5 +1,5 @@
-- title [format_month(@year, @month), @blog.title].join(' - ')
-- breadcrumb format_month(@year, @month)
+- title [@archive.format, @blog.title].join(' - ')
+- breadcrumb @archive.format
 
-= render :layout => "layout", :locals => { :description => "Posts from: #{format_month(@year, @month)}" } do
+= render :layout => "layout", :locals => { :description => "Posts from: #{@archive.format}" } do
   = render :partial => "post", :collection => @posts

data/app/templates/blog/index.html.haml

@@ -3,4 +3,4 @@
 - title @blog.title
 
 = render :layout => "layout" do
-  = render :partial => "post", :collection => @blog.posts
+  = render :partial => "post", :collection => @posts

data/app/views/blog/blogs/_posts.haml

@@ -4,7 +4,7 @@
 .buttons
   = link_to "New Post", new_blog_post_path(@blog), :class => 'add'
 
-- @posts = @blog.all_posts.properties_for_admin.paginate(:page => params[:p])
+- @posts = @blog.posts_for_admin.paginate(:page => params[:p])
 
 = table_for Blog::Post, :id => "blog-posts" do |table|
   - table.rows(@posts) do |row, post|

data/app/views/blog/blogs/form.haml

@@ -15,6 +15,9 @@
   %dl
     = navigation_options
     = template_options
+    = sidebar_expander :pagination_options do
+      = field :posts_per_page, :class => "fixed posts-per-page" do
+        = form.text_field :posts_per_page
   
   - if @blog.persisted?
     %hr

data/config/locales/en.yml

@@ -2,6 +2,10 @@ en:
   resource:
     models:
       blog/post: Blog Post
+    
+    attributes:
+      blog/blog:
+        posts_per_page: Posts per page
         
   helpers:
     label:
@@ -14,6 +18,9 @@ en:
         tags_string: Tags
         published_at: Publish Date
   
-  tabs:
-    blog/blog:
-      blog_settings: Blog Settings
+    tabs:
+      blog/blog:
+        blog_settings: Blog Settings
+
+  sidebar:
+    pagination_options: Pagination Options

data/lib/wheelhouse-blog.rb

@@ -1,4 +1,5 @@
 require "wheelhouse"
+require "will_paginate"
 
 module Blog
   class Plugin < Wheelhouse::Plugin
@@ -7,6 +8,8 @@ module Blog
     # Enable blog sections by default
     config.wheelhouse.blog.sections = true
     
+    config.precompile << "wheelhouse-blog/admin.*"
+    
     isolate_namespace Blog
     
     resources do
@@ -22,9 +25,5 @@ module Blog
         Section(blog.label, blog)
       end if ::Blog::Plugin.config.wheelhouse.blog.sections
     end
-    
-    initializer "precompile assets" do |app|
-      app.config.assets.precompile << "wheelhouse-blog/admin.*"
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wheelhouse-blog
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wheelhouse
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: mongomodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.6
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Integrates blogs into your Wheelhouse CMS site.
 email: info@wheelhousecms.com
 executables: []
@@ -41,13 +73,18 @@ files:
 - app/handlers/blog/blog_handler.rb
 - app/handlers/blog/post_handler.rb
 - app/helpers/blog/blog_helper.rb
+- app/helpers/blog/pagination_helper.rb
+- app/models/blog/archive.rb
 - app/models/blog/blog.rb
+- app/models/blog/category.rb
 - app/models/blog/post.rb
+- app/models/blog/tag.rb
+- app/models/blog/taxonomy.rb
 - app/templates/blog/_layout.html.haml
 - app/templates/blog/_post.html.haml
 - app/templates/blog/archive.html.haml
 - app/templates/blog/category.html.haml
-- app/templates/blog/feed.xml.builder
+- app/templates/blog/feed.rss.builder
 - app/templates/blog/index.html.haml
 - app/templates/blog/post.html.haml
 - app/templates/blog/tag.html.haml
@@ -58,6 +95,7 @@ files:
 - config/routes.rb
 - lib/wheelhouse-blog.rb
 - README.md
+- LICENSE
 homepage: https://www.wheelhousecms.com
 licenses: []
 post_install_message: