serious 0.3.1 → 0.3.2

data/.travis.yml

@@ -0,0 +1,6 @@
+script: "bundle exec rake test"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - 1.9.3

data/README.rdoc

@@ -33,6 +33,9 @@ the processing chain to your liking, add custom ERb helpers and so on. See the d
 stupid_formatter (http://rdoc.info/projects/colszowka/stupid_formatter) to learn how to 
 customize the formatting.
 
+Articles with a date in the future will not appear on the site, thus allowing you to prepare article
+that should be published later.
+
 == Getting started
 
 Install the gem:

data/Rakefile

@@ -11,7 +11,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.rdoc_files.include('README*')

data/lib/serious.rb

@@ -18,6 +18,7 @@ class Serious < Sinatra::Base
   set :articles, Proc.new { File.join(Dir.getwd, 'articles') }
   set :pages, Proc.new { File.join(Dir.getwd, 'pages') }
   set :static, true # Required to serve static files, see http://www.sinatrarb.com/configuration.html
+  set :future, false
   
   not_found do
     erb :"404"
@@ -106,5 +107,4 @@ Serious.set :environment, :test
 Serious.set :date_format, "%B %o %Y"
 Serious.set :disqus, false
 Serious.set :google_analytics, false
-Serious.set :feed_url, '/atom.xml'
-
+Serious.set :feed_url, '/atom.xml'

data/lib/serious/article.rb

@@ -13,9 +13,15 @@ class Serious::Article
     #
     def all(options={})
       options = {:limit => 10000, :offset => 0}.merge(options)
-      (article_paths[options[:offset]...options[:limit]+options[:offset]] || []).map {|article_path| new(article_path) }
+      now = DateTime.now
+      articles = article_paths.map do |article_path|
+        article = new(article_path)
+        article if article && (Serious.future || article.date <= now)
+      end.compact[options[:offset]...options[:limit]+options[:offset]]
+      
+      articles || []
     end
-    
+
     #
     # Retrieves the article(s) for the given arguments. The arguments must be part of the filename.
     # You can give any combination, but the arguments must appear in the same order as given in the
@@ -26,7 +32,11 @@ class Serious::Article
     def find(*args)
       # Reformat arguments (one-digit months and days should be converted to two-digit format)
       args = args.map {|a| a.to_s =~ /^\d{1}$/ ? "%02d" % a : a }
-      articles = article_paths.select {|path| File.basename(path) =~ /#{args.join('-')}/i }.map {|path| new(path) }
+      now = DateTime.now
+      articles = article_paths.select {|path| File.basename(path) =~ /#{args.join('-')}/i }.map do |path|
+        article = new(path)
+        article if article && (Serious.future || article.date <= now)
+      end.compact
     end
     
     #

data/lib/serious/tasks.rb

@@ -1,8 +1,11 @@
 # encoding: utf-8
 
-# Swallow the actual run method from config.ru
+# Swallow the actual run and use methods from config.ru so config can be fetched
+# without NoMethodError...
 def run(*args)
 end
+def use(*args)
+end
 
 begin
   config = File.read('config.ru')

data/lib/serious/version.rb

@@ -2,4 +2,4 @@
 # Serious::VERSION since Serious is a class that inherits from Sinatra::Base
 # and we'd be getting Superclass mismatch errors here since Sinatra is
 # unavailable when evaluating this file standalone...
-SERIOUS_VERSION = '0.3.1'
+SERIOUS_VERSION = '0.3.2'

data/serious.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   
   s.bindir = 'bin'
   s.executables = ['serious']
-  s.default_executable = 'serious'
   
   s.add_dependency 'sinatra', ">= 1.0.0"
   s.add_dependency 'stupid_formatter', '>= 0.2.0'
@@ -25,10 +24,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency "shoulda", "2.10.3"
   s.add_development_dependency "hpricot", ">= 0.8.0"
   s.add_development_dependency "rack-test", ">= 0.5.0"
+  s.add_development_dependency "rake", ">= 0.8.7"
+  s.add_development_dependency "rdoc"
   s.add_development_dependency 'simplecov'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-end
+end

data/test/articles/3010-04-20-we-come-in-peace.txt

@@ -0,0 +1,3 @@
+title: We come in peace!
+
+We got tied of waiting so we came to say hello

data/test/helper.rb

@@ -100,7 +100,8 @@ class Test::Unit::TestCase
   
   def self.should_contain(expect, item)
     should "contain #{expect}" do
-      assert_match(/#{expect}/, item)
+      # expect = Regex.new(expect) unless expect.kind_of(Regex)
+      assert_match(expect, item)
     end
   end
   
@@ -130,4 +131,16 @@ class Test::Unit::TestCase
       Dir.chdir('..')
     end
   end
+
+  def serious(site_name="", arguments="", cache=true)
+    if cache
+      @cache ||= {}
+      return @cache[site_name] if @cache[site_name]
+    end
+    
+    executable = File.expand_path('../../bin/serious', __FILE__)
+    output = `#{executable} #{site_name} #{arguments}`
+    @cache[site_name] = output if cache
+    output
+  end
 end

data/test/test_article.rb

@@ -9,20 +9,20 @@ class TestArticle < Test::Unit::TestCase
     setup do
       @articles = Serious::Article.all
     end
-    
+
     should("return 4 articles") { assert_equal 4, @articles.length }
     should "have only instances of Serious::Article in the collection" do
       assert @articles.all? {|a| a.instance_of?(Serious::Article) }
     end
-    
+
     should "return an existing path for all articles" do
       assert @articles.all? {|a| File.exist? a.path }
     end
-    
+
     should "have 2009-12-24 as the first article's date" do
       assert_equal Date.new(2009, 12, 24), @articles.first.date
     end
-    
+
     should "have 2000-01-01 as the last article's date" do
       assert_equal Date.new(2000, 1, 1), @articles.last.date
     end

data/test/test_bin.rb

@@ -14,7 +14,7 @@ class TestBin < Test::Unit::TestCase
       FileUtils.mkdir('tmp') if not File.exist?('tmp')
       Dir.chdir('tmp')
     end
-    
+
     when_running_serious_with '' do
       should_print "Usage: serious DIRNAME"
       should_print "Only lowercase letters and dashes"
@@ -73,9 +73,9 @@ class TestBin < Test::Unit::TestCase
       should_not_have_path 'public-included/views'
       should_have_file 'public-included/Gemfile'
       should_have_file 'public-included/config.ru' do |file|
-        should_contain "Serious.set :public, File.join(Dir.getwd, 'public')"
-        should_not_contain ":views"
-        should_not_contain ":root"        
+        should_contain "Serious.set :public, File.join\(Dir.getwd, 'public'\)", file
+        should_not_contain ":views", file
+        should_not_contain ":root", file        
       end
       should_have_file "public-included/public/css/serious.css"
       should_have_file "public-included/public/css/application.css"
@@ -86,9 +86,9 @@ class TestBin < Test::Unit::TestCase
       should_not_have_path 'views-included/public'
       should_have_file 'views-included/Gemfile'
       should_have_file 'views-included/config.ru' do |file|
-        should_contain "Serious.set :views, File.join(Dir.getwd, 'views')"
-        should_not_contain ":public"
-        should_not_contain ":root"        
+        should_contain "Serious.set :views, File.join\(Dir.getwd, 'views'\)", file
+        should_not_contain ":public", file
+        should_not_contain ":root", file
       end
       should_have_file "views-included/views/layout.erb"
     end
@@ -97,9 +97,9 @@ class TestBin < Test::Unit::TestCase
       should_have_dir 'views-and-public/articles'
       should_have_file 'views-and-public/Gemfile'
       should_have_file 'views-and-public/config.ru' do |file|
-        should_contain "Serious.set :root, Dir.getwd"
-        should_not_contain ":public"
-        should_not_contain ":views"       
+        should_contain "Serious.set :root, Dir.getwd", file
+        should_not_contain ":public", file
+        should_not_contain ":views", file
       end
       should_have_file "views-and-public/public/css/serious.css"
       should_have_file "views-and-public/public/css/application.css"
@@ -118,20 +118,8 @@ class TestBin < Test::Unit::TestCase
   # Run this only once...
   context "zzz" do
     should "remove tmp at the end" do
-      FileUtils.rm_rf File.expand_path(File.join(File.dirname(__FILE__), 'tmp'))
-    end
-  end
-  
-  def serious(site_name="", arguments="", cache=true)
-    if cache
-      @cache ||= {}
-      return @cache[site_name] if @cache[site_name]
+      FileUtils.rm_rf File.expand_path('../tmp', __FILE__)
     end
-    
-    executable = File.expand_path(File.join(File.dirname(__FILE__), '..', '../../bin/serious'))
-    output = `#{executable} #{site_name} #{arguments}`
-    @cache[site_name] = output if cache
-    output
   end
   
 end

data/test/test_serious.rb

@@ -179,7 +179,31 @@ class TestSerious < Test::Unit::TestCase
     should_contain_text "The requested page could not be found!", "#container h2:first"
     should_not_contain_text "Well we were born within one hour of each other.", ".article .body"
   end
-  
+
+  context "Get /3010/04/20/we-come-in-peace" do
+    setup do
+      app.set :future, false
+      get '/3010/04/20/we-come-in-peace'
+    end
+
+    should_respond_with 404
+    should_set_cache_control_to 300
+    should_contain_text "The requested page could not be found!", "#container h2:first"
+    should_not_contain_text "We got tied of waiting so we came to say hello", ".article .body"
+  end
+
+  context "Get /3010/04/20/we-come-in-peace" do
+    setup do
+      app.set :future, true
+      get '/3010/04/20/we-come-in-peace'
+    end
+
+    should_respond_with 200
+    should_set_cache_control_to 300
+    should_contain_text "We come in peace!", "#container h2:first"
+    should_contain_text "We got tied of waiting so we came to say hello", ".article .body"
+  end
+
   # ===================================================================
   # Tests for the public folder
   # ===================================================================

metadata

@@ -1,146 +1,128 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: serious
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Christoph Olszowka
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-09 00:00:00 +01:00
-default_executable: serious
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-06 00:00:00.000000000 +02:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70321852676300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: stupid_formatter
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70321852676300
+- !ruby/object:Gem::Dependency
+  name: stupid_formatter
+  requirement: &70321852675780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70321852675780
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70321852675300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70321852675300
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70321852674820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 33
-        segments: 
-        - 2
-        - 10
-        - 3
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.10.3
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hpricot
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70321852674820
+- !ruby/object:Gem::Dependency
+  name: hpricot
+  requirement: &70321852674360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70321852674360
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70321852673900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70321852673900
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70321852673440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *70321852673440
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70321852673020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-description: Serious is a simple, file-driven blog engine inspired by toto and driven by sinatra with an emphasis on easy setup
-email: 
+  prerelease: false
+  version_requirements: *70321852673020
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70321852672520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70321852672520
+description: Serious is a simple, file-driven blog engine inspired by toto and driven
+  by sinatra with an emphasis on easy setup
+email:
 - christoph at olszowka de
-executables: 
+executables:
 - serious
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
-- CHANGELOG.rdoc
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -169,6 +151,7 @@ files:
 - test/articles/2009-04-01-foo-bar.txt
 - test/articles/2009-12-11-ruby-is-the-shit.txt
 - test/articles/2009-12-24-merry-christmas.txt
+- test/articles/3010-04-20-we-come-in-peace.txt
 - test/helper.rb
 - test/pages/about.txt
 - test/pages/foo-bar.txt
@@ -180,42 +163,35 @@ files:
 has_rdoc: true
 homepage: https://github.com/colszowka/serious
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: serious
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Serious is a simple, file-driven blog engine inspired by toto and driven by sinatra with an emphasis on easy setup
-test_files: 
+summary: Serious is a simple, file-driven blog engine inspired by toto and driven
+  by sinatra with an emphasis on easy setup
+test_files:
 - test/articles/2000-01-01-disco-2000.txt
 - test/articles/2009-04-01-foo-bar.txt
 - test/articles/2009-12-11-ruby-is-the-shit.txt
 - test/articles/2009-12-24-merry-christmas.txt
+- test/articles/3010-04-20-we-come-in-peace.txt
 - test/helper.rb
 - test/pages/about.txt
 - test/pages/foo-bar.txt

data/CHANGELOG.rdoc

@@ -1,10 +0,0 @@
-= Changelog for serious
-http://github.com/colszowka/serious
-
-== v0.3.0 (2010-08-17)
-
- * Fixed encoding issues with Ruby 1.9.1/1.9.2-rc2, added unit tests. Works on Heroku with Ruby 1.9.1 now (colszowka)
- * Made blog generator (serious command) use Heroku with Ruby 1.9.1 by default (when --heroku switch is active) (colszowka)
- * Use Bundler Gemfile instead of Heroku .gems file in blog generator (colszowka)
- * Use Bundler internally for easy development setup (git clone -> bundle install -> rake test) (colszowka)
- * Trailing slashes in article urls Regexp fixed (rb2k)