wheelhouse-blog 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f0cfc6b5046f139c9cddb6c9fcf1400d13d5c776
+  data.tar.gz: 8352caac4c126120878fb06ed8600f8ab1e89140
+SHA512:
+  metadata.gz: b2720ecaf821bbd4ad77d56c53d60a024718699a529588b868ac9f31853f5f11b437058dbac33f418676cfd39035fa0f848d6bb30bd51a1472fbd068b3e84dd4
+  data.tar.gz: 20807ca9f2c5f41cb2d86072de2e925a154d298d25fda7ab48713119e9c5316c2f883f840def35d6ab509452a8dd84dadd4c83837772ee1db2ce5ce938722122

data/app/handlers/blog/blog_handler.rb

@@ -1,5 +1,7 @@
 class Blog::BlogHandler < Wheelhouse::ResourceHandler
-  get "/(page/:page)", :cache => true do
+  extend Blog::WheelhouseRouteConstraints
+  
+  get "/(page/:page)", :cache => true, :page => /\d+/ do
     @posts = paginate(@blog.posts)
   end
 
@@ -7,17 +9,17 @@ class Blog::BlogHandler < Wheelhouse::ResourceHandler
     render :template => "feed", :formats => [:rss], :layout => false
   end
   
-  get '/tag/:tag(/page/:page)', :cache => true do
+  get '/tag/:tag(/page/:page)', :cache => true, :page => /\d+/ do
     @posts = paginate(@blog.posts.tagged_with(params[:tag]))
     render :template => "tag"
   end
   
-  get '/category/:category(/page/:page)', :cache => true do
+  get '/category/:category(/page/:page)', :cache => true, :page => /\d+/ do
     @posts = paginate(@blog.posts.in_category(params[:category]))
     render :template => "category"
   end
   
-  get "/:year(/:month)(/page/:page)", :cache => true do
+  get "/:year(/:month)(/page/:page)", :cache => true, :year => /\d{4}/, :month => /\d\d?/, :page => /\d+/ do
     @archive = Blog::Archive.new(@blog, params[:year], params[:month].presence)
     raise ActionController::RoutingError, "No route matches #{request.path.inspect}" if @archive.invalid?
     
@@ -25,7 +27,7 @@ class Blog::BlogHandler < Wheelhouse::ResourceHandler
     render :template => "archive"
   end
   
-  get "/:year/:month/:permalink", :cache => true do
+  get "/:year/:month/:permalink", :cache => true, :year => /\d{4}/, :month => /\d\d?/ do
     @post = @blog.find_post(params[:year], params[:month], params[:permalink])
     render @post
   end

data/app/helpers/blog/blog_helper.rb

@@ -8,8 +8,4 @@ module Blog::BlogHelper
       @_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
 end

data/app/helpers/blog/pagination_helper.rb

@@ -9,13 +9,16 @@ module Blog::PaginationHelper
       path = @template.request.path
       
       if page == 1
-        path.sub(PAGE_PARAMETER, "")
+        path = path.sub(PAGE_PARAMETER, "")
       elsif path =~ PAGE_PARAMETER
-        path.sub(PAGE_PARAMETER, "/page/#{page}")
+        path = path.sub(PAGE_PARAMETER, "/page/#{page}")
       else
-        path + "/page/#{page}"
+        path += "/page/#{page}"
       end
+      
+      Wheelhouse::PathUtils.normalize_path(path)
     end
+    
     alias url_for url
   end
   

data/app/helpers/blog/post_helper.rb

@@ -0,0 +1,17 @@
+module Blog::PostHelper
+  def current_post?(post)
+    request.path == post.path
+  end
+  
+  def blog_post_tag_links(post, separator=", ")
+    safe_join(post.tags.map { |tag|
+      link_to(tag, post.blog.tag_path(tag), :title => "View all posts tagged #{tag}")
+    }, separator)
+  end
+  
+  def blog_post_category_links(post, separator=", ")
+    safe_join(post.categories.map { |category|
+      link_to(category, post.blog.category_path(category), :title => "View all posts in category #{category}")
+    }, separator)
+  end
+end

data/app/models/blog/blog.rb

@@ -10,6 +10,8 @@ class Blog::Blog < Wheelhouse::Resource
   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]
 
+  scope :sections_for_site, lambda { |site| where(:site_id => site.id).order(:created_at.asc).select(:id, :label) }
+
   activities :all
   
   icon "wheelhouse-blog/blog.png"

data/app/models/blog/post.rb

@@ -27,6 +27,7 @@ class Blog::Post < Wheelhouse::Resource
   
   validates_uniqueness_of :permalink, :scope => :blog_id
   
+  scope :published, where(:state => 'Published').order(:published_at.desc)
   scope :tagged_with, lambda { |tag| where(:_tags => tag.parameterize) }
   scope :in_category, lambda { |category| where(:_categories => category.parameterize) }
   

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

@@ -1,5 +1,5 @@
 %article.post
-  %h3= link_to_unless_current post.title, post
+  %h3= link_to_unless current_post?(post), post.title, post
   
   %p
     %em

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

@@ -1,6 +1,3 @@
-- content_for(:head) do
-  = stylesheet_link_tag "wheelhouse-blog/admin"
-
 .buttons
   = link_to "New Post", new_blog_post_path(@blog), :class => 'add'
 

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

@@ -22,4 +22,6 @@
   - if @blog.persisted?
     %hr
     = owner
-    
+
+- content_for(:head) do
+  = stylesheet_link_tag "wheelhouse-blog/admin"

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

@@ -19,7 +19,7 @@
   
   = sidebar_expander "Tags & Categories" do
     = field :categories do
-      = form.checkboxes :categories, @blog.categories, :editable => true, :placeholder => "Add a category..."
+      = form.checkboxes :categories, @blog.categories.map(&:name), :editable => true, :placeholder => "Add a category..."
 
     = field :tags do
-      = form.tags :tags, @blog.tags, :placeholder => "Add a tag..."
+      = form.tags :tags, @blog.tags.map(&:name), :placeholder => "Add a tag..."

data/lib/blog/wheelhouse_route_constraints.rb

@@ -0,0 +1,10 @@
+module Blog
+  module WheelhouseRouteConstraints
+    # Fixes handler route definitions in Wheelhouse 1.0 (fixed in 1.1) to allow
+    # route constraints to be set (e.g. match route segments to a regex).
+    def define_action(path, action_name, method, options={}, &block)
+      define_method(action_name, &block)
+      _mapper.match(path, { :via => method, :to => action(action_name) }.merge(options))
+    end
+  end
+end

data/lib/wheelhouse-blog.rb

@@ -1,6 +1,8 @@
 require "wheelhouse"
 require "will_paginate"
 
+require "blog/wheelhouse_route_constraints"
+
 module Blog
   class Plugin < Wheelhouse::Plugin
     config.wheelhouse.blog = ActiveSupport::OrderedOptions.new
@@ -13,7 +15,7 @@ module Blog
     isolate_namespace Blog
     
     resources do
-      ::Blog::Blog.select(:id, :label).map do |b|
+      ::Blog::Blog.sections_for_site(site).map do |b|
         Resource(::Blog::Post, :sublabel => b.label, :url => blog.new_blog_post_path(b))
       end
     end
@@ -21,9 +23,14 @@ module Blog
     resource { Resource(::Blog::Blog) }
     
     sections do
-      ::Blog::Blog.select(:id, :label).map do |blog|
+      ::Blog::Blog.sections_for_site(site).map do |blog|
         Section(blog.label, blog)
       end if ::Blog::Plugin.config.wheelhouse.blog.sections
     end
   end
+  
+  def self.all_posts_for(site)
+    blog_ids = ::Blog::Blog.where(:site_id => site.id).select(:id).map(&:id)
+    ::Blog::Post.where(:blog_id.in => blog_ids).published
+  end
 end

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: wheelhouse-blog
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2014-03-11 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.1
+        version: 1.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.14
 - !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.
@@ -65,6 +58,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - app/assets/images/wheelhouse-blog/blog.png
 - app/assets/images/wheelhouse-blog/post.png
 - app/assets/stylesheets/wheelhouse-blog/admin.css.sass
@@ -74,6 +69,7 @@ files:
 - app/handlers/blog/post_handler.rb
 - app/helpers/blog/blog_helper.rb
 - app/helpers/blog/pagination_helper.rb
+- app/helpers/blog/post_helper.rb
 - app/models/blog/archive.rb
 - app/models/blog/blog.rb
 - app/models/blog/category.rb
@@ -93,32 +89,29 @@ files:
 - app/views/blog/posts/form.haml
 - config/locales/en.yml
 - config/routes.rb
+- lib/blog/wheelhouse_route_constraints.rb
 - lib/wheelhouse-blog.rb
-- README.md
-- LICENSE
 homepage: https://www.wheelhousecms.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wheelhouse CMS Blog Plugin
 test_files: []
-has_rdoc: