postmarkdown 0.0.3 → 0.0.4

data/Appraisals

@@ -6,3 +6,8 @@ appraise 'rails3_1' do
   gem 'rails', '~> 3.1.0'
   gem 'combustion', '~> 0.3.1'
 end
+
+appraise 'rails3_2' do
+  gem 'rails', '~> 3.2.0'
+  gem 'combustion', '~> 0.3.1'
+end

data/app/controllers/posts_controller.rb

@@ -21,7 +21,17 @@ class PostsController < ApplicationController
   helper_method :resource
 
   def collection
-    @collection ||= Post.where(params.slice(:year, :month, :day))
+    @collection ||= begin
+      posts = Post.where(params.slice(:year, :month, :day))
+      posts = Kaminari.paginate_array(posts).page(params[:page]).per(posts_per_page)
+      posts
+    end
   end
   helper_method :collection
+
+  private
+
+  def posts_per_page
+    params[:count] || Postmarkdown::Config.options[:posts_per_page]
+  end
 end

data/app/models/post.rb

@@ -2,6 +2,7 @@ require 'active_record/errors'
 
 class Post
   extend ActiveModel::Naming
+  include ActiveModel::Conversion
 
   include Gravtastic
   is_gravtastic

data/app/views/posts/_post.html.haml

@@ -3,8 +3,9 @@
     %h1= link_to post.title, post
     = image_tag post.gravatar_url(:size => 32, :default => 'identicon'), :height => 32, :width => 32
     .meta
+      Posted on
       %time{:pubdate => 'true', :datetime => post.timestamp.iso8601}
-        Posted on #{post.date.strftime '%e %B %Y'}
+        = post.date.strftime '%e %B %Y'
       %span
         by
         = post.author

data/app/views/posts/index.html.haml

@@ -3,5 +3,6 @@
 %section#posts
   - if collection.present?
     = render collection, :summary => true
+    = paginate collection
   - else
     No posts found.

data/gemfiles/rails3_2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "ruby-debug19", :require=>false
+gem "rails", "~> 3.2.0"
+gem "combustion", "~> 0.3.1"
+
+gemspec :path=>"../"

data/lib/postmarkdown/config.rb

@@ -11,6 +11,8 @@ Postmarkdown::Config.options[:feed_title] = nil
 
 Postmarkdown::Config.options[:permalink_format] = :day
 
+Postmarkdown::Config.options[:posts_per_page] = 5
+
 Postmarkdown::Config.options[:use_theme] = false
 
 Postmarkdown::Config.options[:permalink_regex] = {}

data/lib/postmarkdown/engine.rb

@@ -5,6 +5,7 @@ module Postmarkdown
   require 'rdiscount'
   require 'nokogiri'
   require 'haml'
+  require 'kaminari'
 
   class Engine < Rails::Engine
   end

data/lib/postmarkdown/version.rb

@@ -1,3 +1,3 @@
 module Postmarkdown
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/postmarkdown.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'gravtastic'
   s.add_dependency 'nokogiri'
   s.add_dependency 'rdiscount'
+  s.add_dependency 'kaminari'
 
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rspec-rails', '~> 2.5'

data/readme.md

@@ -137,6 +137,16 @@ What about mapping Postmarkdown to root? We got you covered:
 * Syntax highlighting for code blocks
 * Generated routes should show example usage
 * Support more file formats, eg. textile
+* Built-in theme should have a link to the RSS Feed
+* Generator tests
+
+## Development
+
+```
+bundle
+rake appraisal:install
+rake # run the tests
+```
 
 ## License
 

data/spec/{acceptance → integrations}/posts_spec.rb

@@ -9,39 +9,66 @@ describe 'Post views', :type => :request do
   after { back_to_the_present }
 
   context 'Posts#index' do
-    before { visit posts_path }
-
-    it 'should show published posts' do
-      # 2011-05-01-full-metadata (published today)
-      page.should have_content('Post with full metadata')                # title
-      page.should have_content('Posted on 1 May 2011')                   # publish date
-      page.should have_content('by John Smith')                          # author
-      page.should have_content('This is another custom & test summary.') # summary
-
-      # 2011-04-28-summary
-      page.should have_content('A Test Post')                      # title
-      page.should have_content('Posted on 28 April 2011')          # publish date
-      page.should have_content('This is a custom & test summary.') # summary
-
-      # 2011-04-28-image
-      page.should have_content('Image')                   # title
-      page.should have_content('Posted on 28 April 2011') # publish date
-      page.should have_content('Image description.')      # summary
-
-      # 2011-04-01-first-post
-      page.should have_content('First Post')                 # title
-      page.should have_content('Posted on 1 April 2011')     # publish date
-      page.should have_content('Lorem ipsum dolor sit amet') # part of summary
-    end
-
-    it 'should not show unpublished posts' do
-      # 2015-02-13-custom-title (not published yet)
-      page.should_not have_content('This is a custom title') # title
-      page.should_not have_content('Content goes here.')     # summary
-    end
-
-    it 'should have the correct number of posts' do
-      all('section#posts article.post').size.should == 4
+    context 'default index' do
+      before { visit posts_path }
+
+      it 'should show published posts' do
+        # 2011-05-01-full-metadata (published today)
+        page.should have_content('Post with full metadata')                # title
+        page.should have_content('Posted on 1 May 2011')                   # publish date
+        page.should have_content('by John Smith')                          # author
+        page.should have_content('This is another custom & test summary.') # summary
+
+        # 2011-04-28-summary
+        page.should have_content('A Test Post')                      # title
+        page.should have_content('Posted on 28 April 2011')          # publish date
+        page.should have_content('This is a custom & test summary.') # summary
+
+        # 2011-04-28-image
+        page.should have_content('Image')                   # title
+        page.should have_content('Posted on 28 April 2011') # publish date
+        page.should have_content('Image description.')      # summary
+
+        # 2011-04-01-first-post
+        page.should have_content('First Post')                 # title
+        page.should have_content('Posted on 1 April 2011')     # publish date
+        page.should have_content('Lorem ipsum dolor sit amet') # part of summary
+      end
+
+      it 'should not show unpublished posts' do
+        # 2015-02-13-custom-title (not published yet)
+        page.should_not have_content('This is a custom title') # title
+        page.should_not have_content('Content goes here.')     # summary
+      end
+
+      it 'should have the correct number of posts' do
+        all('section#posts article.post').size.should == 4
+      end
+    end
+
+    describe 'pagination' do
+      def article_titles
+        all('article header h1').map(&:text)
+      end
+
+      before do
+        visit posts_path(:count => 2)
+      end
+
+      it 'returns the latest posts on the first page' do
+        article_titles.should eq [
+          'Post with full metadata',
+          'A Test Post',
+        ]
+      end
+
+      it 'returns earlier posts on the second page' do
+        click_link 'Next'
+        article_titles.should eq [
+          'Image',
+          'First Post',
+        ]
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -24,3 +24,5 @@ RSpec.configure do |config|
   config.mock_with :rspec
   config.include Delorean
 end
+
+ActiveSupport::Deprecation.debug = true

data/vendor/assets/stylesheets/postmarkdown/postmarkdown.css

@@ -63,5 +63,7 @@ section#content article header h1{}
 section#content article header img{display:none;}
 section#content article header .meta{color:#999;font-size:12px;}
 
+nav.pagination{margin-bottom:20px;}
+
 /* -- Footer ---------------------------------------------------------------- */
 footer{margin-bottom:20px;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postmarkdown
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70152203859260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152203859260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70152203858160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +40,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70152203858160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: gravtastic
-  requirement: &70152203857240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +56,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152203857240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70152203854740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +72,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152203854740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70152203872800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +88,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152203872800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  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'
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70152203871500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +120,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152203871500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70152203869080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +136,15 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70152203869080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70152203886600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +152,15 @@ dependencies:
         version: 1.0.0.beta
   type: :development
   prerelease: false
-  version_requirements: *70152203886600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70152203885940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +168,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152203885940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70152203884620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,7 +184,12 @@ dependencies:
         version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *70152203884620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: A simple Rails blog engine powered by markdown.
 email:
 - jason.weathered@ennova.com.au
@@ -152,6 +218,7 @@ files:
 - config.ru
 - gemfiles/rails3_0.gemfile
 - gemfiles/rails3_1.gemfile
+- gemfiles/rails3_2.gemfile
 - lib/generators/postmarkdown/install_generator.rb
 - lib/generators/postmarkdown/override_generator.rb
 - lib/generators/postmarkdown/post_generator.rb
@@ -168,7 +235,7 @@ files:
 - lib/postmarkdown/version.rb
 - postmarkdown.gemspec
 - readme.md
-- spec/acceptance/posts_spec.rb
+- spec/integrations/posts_spec.rb
 - spec/internal/.gitignore
 - spec/internal/app/posts/2011-04-01-first-post.markdown
 - spec/internal/app/posts/2011-04-28-image.markdown
@@ -206,7 +273,6 @@ files:
 - spec/support/rails_app/config/routes.rb
 - spec/support/rails_app/db/seeds.rb
 - spec/support/rails_app/doc/README_FOR_APP
-- todo.txt
 - vendor/assets/stylesheets/postmarkdown/postmarkdown.css
 homepage: ''
 licenses:
@@ -224,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2286187286475211552
+      hash: -4469381754881994462
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -233,15 +299,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2286187286475211552
+      hash: -4469381754881994462
 requirements: []
 rubyforge_project: postmarkdown
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A simple Rails blog engine powered by markdown.
 test_files:
-- spec/acceptance/posts_spec.rb
+- spec/integrations/posts_spec.rb
 - spec/internal/.gitignore
 - spec/internal/app/posts/2011-04-01-first-post.markdown
 - spec/internal/app/posts/2011-04-28-image.markdown

data/todo.txt

@@ -1,25 +0,0 @@
-TODO
-----
-[ ] Pagination
-[ ] Built-in theme should have a link to the RSS Feed
-[ ] Generator tests
-
-DONE
-----
-[x] Route: `postmarkdown :permalink_format => :slug`</del>
-[x] Add info about blog at root to readme</del>
-[x] RSpec tests for routes</del>
-[x] Support more markdown file extensions, eg. `*.md, *.mkd, *.mdown`</del>
-[x] Text for when there's no posts on the index page, eg. 'There are no posts'</del>
-[x] Fix pre code blocks</del>
-[x] RSpec model tests for author and email</del>
-[x] Set default feed title to app name + route path</del>
-  [x] For example, `TestApp::Application` with the route `postmarkdown :as => :awesome_blog` would generate the feed title would be 'Test App Awesome Blog'</del>
-[x] RSpec acceptance test for pre code blocks (= vs ~)
-[x] RSpec tests for the xml feed
-[x] 404 for missing post or invalid slug
-[x] Add post author to feed
-[x] Better example post
-[x] Generator automagically figures out who the author is based on git config
-[x] Default theme
-[x] Config option for using built-in theme