postmarkdown 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39584271054fe1a1f30ce61cde326c8c068c9f81
-  data.tar.gz: b4cd96a67850bda71f46f55d1b0650942e6affa4
+  metadata.gz: 6352f57fb6998050fa57cf5ee679df6ab6642fdb
+  data.tar.gz: ea8152b8c4e31e39cc5f29c502c527a09b9790ac
 SHA512:
-  metadata.gz: febf77d5f33061acf85b890173af01111b9fd92eb72e53ae9c201a5a882fa04060be035f45fb8d7ac0b736c949d4bc4e2f465208a1f0b16f90d94c5ace87259d
-  data.tar.gz: 675831ce290bc902294d845041d4ce51268f39dd3ad4b10b26bac2753c317012cd0f24ce9323d85c8df2a348cc78bb06278a8f3f6e3cbac8c9a25d5e25c6bf5b
+  metadata.gz: bf0b4f0856b75a9f0b8566b458562ea68b4fa36c0498c67871a98982a5d2c6e943abc18dfd853332e72a084aadc4c50fb1717e74943facca5c2917cd974b9212
+  data.tar.gz: 219b3e2557bf1244f59708e4ebeb266db801ea232a7380a4329a0dfda0a2630c47db3e01baa15b48f9270c22b77adb2483049105c0cd398e148a6939c9c870ce

data/Gemfile

@@ -2,5 +2,4 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'timecop', :require => false
 gem 'generator_spec', :require => false

data/README.markdown

@@ -156,6 +156,20 @@ What about mapping Postmarkdown to root? We got you covered:
     postmarkdown :as => ''
     root :to => 'posts#index'
 
+## Previewing Future-dated Posts
+
+By default, Postmarkdown will only show posts that are dated on or before today.
+If you're writing a post to be published sometime in the future,
+you won't be able to view it in the browser.
+
+To override this behaviour, add the following to an initializer
+(`config/initializers/postmarkdown.rb`):
+
+    Postmarkdown::Config.options[:allow_preview] = true
+
+With the :allow_preview option set, you'll be able to view individual posts by
+their URL but they will remain hidden from the index and feed until the post date.
+
 ## Example Directory Structure
 
     ├── app
@@ -178,7 +192,6 @@ What about mapping Postmarkdown to root? We got you covered:
 
 ## TODO
 
-* 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

data/app/controllers/posts_controller.rb

@@ -21,8 +21,10 @@ class PostsController < ApplicationController
   helper_method :resource
 
   def collection
+    options = params.slice(:year, :month, :day)
+    options[:visible] = true
     @collection ||= begin
-      posts = Post.where(params.slice(:year, :month, :day))
+      posts = Post.where(options)
       posts = Kaminari.paginate_array(posts).page(params[:page]).per(posts_per_page)
       posts
     end

data/app/models/post.rb

@@ -81,6 +81,7 @@ class Post
   def visible?
     timestamp <= Time.zone.now
   end
+  alias_method :visible, :visible?
 
   def to_s
     "#{title.inspect} (#{slug})"
@@ -91,7 +92,11 @@ class Post
       file_extensions = Postmarkdown::Config.options[:markdown_file_extensions].join(',')
       @@posts ||= Dir.glob("#{directory}/*.{#{file_extensions}}").map do |filename|
         Post.new filename
-      end.select(&:visible?).sort_by { |post| [post.date, post.slug] }.reverse
+      end.sort_by { |post| [post.date, post.slug] }.reverse
+    end
+
+    def visible
+      all.select(&:visible?)
     end
 
     def directory
@@ -100,7 +105,7 @@ class Post
 
     def where(conditions = {})
       conditions = conditions.symbolize_keys
-      conditions.assert_valid_keys :year, :month, :day, :slug, :to_param
+      conditions.assert_valid_keys :year, :month, :day, :slug, :to_param, :visible
       [:year, :month, :day].each do |key|
         conditions[key] = conditions[key].to_i if conditions[key].present?
       end
@@ -110,19 +115,21 @@ class Post
     end
 
     def find(id)
-      where(:to_param => id).first or raise ActiveRecord::RecordNotFound, "Could not find post with ID #{id.inspect}"
+      options = {:to_param => id}
+      options[:visible] = true unless Postmarkdown::Config.options[:allow_preview]
+      where(options).first or raise ActiveRecord::RecordNotFound, "Could not find post with ID #{id.inspect}"
     end
 
     def first
-      all.first
+      visible.first
     end
 
     def last
-      all.last
+      visible.last
     end
 
     def feed
-      all.first(10)
+      visible.first(10)
     end
 
     def feed_last_modified

data/gemfiles/rails3_1.gemfile

@@ -2,7 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "timecop", :require=>false
 gem "generator_spec", :require=>false
 gem "rails", "~> 3.1.0"
 

data/gemfiles/rails3_2.gemfile

@@ -2,7 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "timecop", :require=>false
 gem "generator_spec", :require=>false
 gem "rails", "~> 3.2.0"
 

data/gemfiles/rails4_0.gemfile

@@ -2,7 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "timecop", :require=>false
 gem "generator_spec", :require=>false
 gem "rails", "~> 4.0.2"
 

data/lib/postmarkdown/config.rb

@@ -15,6 +15,8 @@ Postmarkdown::Config.options[:posts_per_page] = 5
 
 Postmarkdown::Config.options[:layout] = 'application'
 
+Postmarkdown::Config.options[:allow_preview] = false
+
 Postmarkdown::Config.options[:permalink_regex] = {}
 Postmarkdown::Config.options[:permalink_regex][:day]   = %r[\d{4}/\d{2}/\d{2}/[^/]+]
 Postmarkdown::Config.options[:permalink_regex][:month] = %r[\d{4}/\d{2}/[^/]+]

data/lib/postmarkdown/version.rb

@@ -1,3 +1,3 @@
 module Postmarkdown
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/spec/integrations/posts_spec.rb

@@ -190,6 +190,28 @@ describe 'Post views', :type => :request do
     end
   end
 
+  context "allow_preview" do
+    before { time_travel_to '2011-04-30' }
+
+    context "allow_preview = false (default)" do
+      it 'should not find the future post' do
+        lambda do
+          visit post_path('2011/05/01/full-metadata')
+        end.should raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    context "allow_preview = true" do
+      before { Postmarkdown::Config.options[:allow_preview] = true }
+      after { Postmarkdown::Config.options[:allow_preview] = false }
+
+      it 'should show the post' do
+        visit post_path('2011/05/01/full-metadata')
+        page.should have_content('Post with full metadata') # title
+      end
+    end
+  end
+
   context 'theme' do
     before { @original_layout = Postmarkdown::Config.options[:layout] }
     after { Postmarkdown::Config.options[:layout] = @original_layout }

data/spec/lib/generators/postmarkdown/post_generator_spec.rb

@@ -14,35 +14,35 @@ module Postmarkdown
 
     context 'with the slug parameter' do
       it 'creates a file for the slug and the current date' do
-        Timecop.freeze(Time.utc(2012, 1, 1, 10, 20, 30)) do
-          run_generator %w(test-post)
+        Time.zone.stub(:now).and_return Time.utc(2012, 1, 1, 10, 20, 30)
 
-          Dir.glob('tmp/app/posts/*').should == ['tmp/app/posts/2012-01-01-102030-test-post.markdown']
+        run_generator %w(test-post)
 
-          Post.all.count.should == 1
+        Dir.glob('tmp/app/posts/*').should == ['tmp/app/posts/2012-01-01-102030-test-post.markdown']
 
-          post = Post.first
-          post.slug.should == 'test-post'
-          post.date.should == Date.parse('2012-01-01')
-          post.title.should == 'Test post'
-        end
+        Post.all.count.should == 1
+
+        post = Post.first
+        post.slug.should == 'test-post'
+        post.date.should == Date.parse('2012-01-01')
+        post.title.should == 'Test post'
       end
     end
 
     context 'with the slug parameter including an underscore' do
       it 'creates the correct file and sets the right values' do
-        Timecop.freeze(Time.utc(2012, 1, 1, 10, 20, 30)) do
-          run_generator %w(test-post_with_underscores)
+        Time.zone.stub(:now).and_return Time.utc(2012, 1, 1, 10, 20, 30)
 
-          Dir.glob('tmp/app/posts/*').should == ['tmp/app/posts/2012-01-01-102030-test-post_with_underscores.markdown']
+        run_generator %w(test-post_with_underscores)
 
-          Post.all.count.should == 1
+        Dir.glob('tmp/app/posts/*').should == ['tmp/app/posts/2012-01-01-102030-test-post_with_underscores.markdown']
 
-          post = Post.first
-          post.slug.should == 'test-post_with_underscores'
-          post.date.should == Date.parse('2012-01-01')
-          post.title.should == 'Test post_with_underscores'
-        end
+        Post.all.count.should == 1
+
+        post = Post.first
+        post.slug.should == 'test-post_with_underscores'
+        post.date.should == Date.parse('2012-01-01')
+        post.title.should == 'Test post_with_underscores'
       end
     end
 

data/spec/spec_helper.rb

@@ -14,7 +14,6 @@ require 'capybara/rspec'
 require 'rspec/rails'
 require 'capybara/rails'
 
-require 'timecop'
 require 'generator_spec/test_case'
 Dir[File.expand_path('lib/generators/postmarkdown/*.rb')].each { |f| require f }
 
@@ -26,7 +25,7 @@ RSpec.configure do |config|
   config.order = :random
 
   config.after do
-    Timecop.return
+    back_to_the_present
     FileUtils.rm_rf('spec/tmp/app/posts/.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postmarkdown
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jason Weathered
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails