hackety_sling 0.0.4 → 0.0.5

data/.travis.yml

@@ -1,3 +1,4 @@
 script: "bundle exec rake"
 rvm:
   - 1.9.2
+  - 1.9.3

data/README.md

@@ -24,7 +24,7 @@ class MySuperBlog < Sinatra::Base
 
 
   # Optional
-  set :hackety_sling_posts_on_index
+  set :hackety_sling_posts_on_index, 2
 
   get '/other-sinatra-page/' do
     erubis :other_sinatra_page

data/lib/sinatra/hackety_sling/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module HacketySling
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
   end
 end

data/lib/sinatra/hackety_sling.rb

@@ -16,13 +16,13 @@ module Sinatra
         erb :index
       end
 
-      app.get '/archive/' do
+      app.get '/archive/?' do
         @posts = Post.order_by(:date => :asc).all
         erb :post_list
       end
 
       %w(tags author).each do |attribute|
-        app.get "/#{attribute}/:value/" do |value|
+        app.get "/#{attribute}/:value/?" do |value|
           @posts = Post.order_by(:date => :desc)
           @posts = @posts.where(attribute.to_sym.include => value).all
           erb :posts
@@ -30,18 +30,18 @@ module Sinatra
       end
 
       Post.all.each do |post|
-        app.get post.permalink do
+        app.get "#{post.permalink}?" do
           @post = post
           erb :post
         end
         base_name = post.file_name_without_extension.sub(/^\d{4}-\d{2}-\d{2}-/, '')
-        app.get "/#{base_name}/" do
+        app.get "/#{base_name}/?" do
           redirect post.permalink, 301
         end
       end
 
       ymd = [:year, :month, :day]
-      app.get %r{^/(\d{4}/)(\d{2}/)?(\d{2}/)?$} do
+      app.get %r{^/(\d{4}/?)(\d{2}/?)?(\d{2}/?)?$} do
         selector_hash = {}
         params[:captures].each_with_index do |date_part, index|
           selector_hash[ymd[index]] = date_part.to_i unless date_part.nil?

data/test/hackety_sling_test.rb

@@ -23,95 +23,72 @@ describe TestApp do
   end
 
   describe 'when requesting the index path' do
-    it 'should request the 2 most current posts by default' do
+    it 'displays the 2 most current posts by default' do
       get '/'
       assert last_response.ok?
-      refute last_response.body.include? @post_titles[0]
-      refute last_response.body.include? @post_titles[1]
-      assert last_response.body.include? @post_titles[2]
-      assert last_response.body.include? @post_titles[3]
+      assert_equal ['Test post 4', 'Test post 3'], post_titles
     end
 
-    it 'the number of posts should be configurable' do
+    it 'the number of posts is configurable' do
       app.set :hackety_sling_posts_on_index, 3
       get '/'
+      app.set :hackety_sling_posts_on_index, 2 # set back to original value
       assert last_response.ok?
-      refute last_response.body.include? @post_titles[0]
-      assert last_response.body.include? @post_titles[1]
-      assert last_response.body.include? @post_titles[2]
-      assert last_response.body.include? @post_titles[3]
+      assert_equal ['Test post 4', 'Test post 3', 'Test post 2'], post_titles
     end
   end
 
   describe 'when requesting posts by time' do
-    it 'should show all posts of one year' do
+    it 'shows all posts of one year' do
       get '/2010/'
       assert last_response.ok?
-      assert last_response.body.include? @post_titles[0]
-      assert last_response.body.include? @post_titles[1]
-      assert last_response.body.include? @post_titles[2]
-      refute last_response.body.include? @post_titles[3]
+      assert_equal ['Test post 3', 'Test post 2', 'Test post 1'], post_titles
     end
 
-    it 'should show all posts of one month' do
+    it 'shows all posts of one month' do
       get '/2010/11/'
       assert last_response.ok?
-      refute last_response.body.include? @post_titles[0]
-      refute last_response.body.include? @post_titles[1]
-      assert last_response.body.include? @post_titles[2]
-      refute last_response.body.include? @post_titles[3]
+      assert_equal ['Test post 3'], post_titles
     end
 
-    it 'should show all posts of one day' do
+    it 'shows all posts of one day' do
       get '/2010/08/10/'
       assert last_response.ok?
-      refute last_response.body.include? @post_titles[0]
-      assert last_response.body.include? @post_titles[1]
-      refute last_response.body.include? @post_titles[2]
-      refute last_response.body.include? @post_titles[3]
+      assert_equal ['Test post 2'], post_titles
     end
   end
 
   describe 'when requesting a certain blog post' do
-    it 'should show the blog post' do
+    it 'shows the blog post' do
       get '/2010/11/13/test-post-3/'
       assert last_response.ok?
-      refute last_response.body.include? @post_titles[0]
-      refute last_response.body.include? @post_titles[1]
-      assert last_response.body.include? @post_titles[2]
-      refute last_response.body.include? @post_titles[3]
+      assert_equal ['Test post 3'], post_titles
     end
 
-    it 'should redirect to the url with date if only the slug was given' do
+    it 'redirects to the url with date if only the slug was given' do
       get '/test-post-2/'
       assert_redirected_to '/2010/08/10/test-post-2/', 301
     end
   end
 
   describe 'when requesting posts by tag' do
-    it 'should show all posts with a certain tag' do
+    it 'shows all posts with a certain tag' do
       get '/tags/ruby/'
       assert last_response.ok?
-      assert last_response.body.include? @post_titles[0]
-      assert last_response.body.include? @post_titles[1]
-      refute last_response.body.include? @post_titles[2]
-      refute last_response.body.include? @post_titles[3]
+      assert_equal ['Test post 2', 'Test post 1'], post_titles
     end
   end
 
   describe 'when requesting posts by author' do
-    it 'should show all posts with a certain author' do
+    it 'shows all posts with a certain author' do
       get '/author/ralph/'
       assert last_response.ok?
-      refute last_response.body.include? @post_titles[0]
-      refute last_response.body.include? @post_titles[1]
-      assert last_response.body.include? @post_titles[2]
-      refute last_response.body.include? @post_titles[3]
+      assert_equal ['Test post 3'], post_titles
     end
   end
 
   describe 'when requesting the archive page' do
-    it 'should respond to the archive path' do
+    it 'responds to the archive path' do
       get '/archive/'
       assert last_response.ok?
       @post_titles.each do |post_title|
@@ -121,7 +98,7 @@ describe TestApp do
   end
 
   describe 'the atom feed' do
-    it 'should be generated ok' do
+    it 'is generated ok' do
       get '/atom.xml'
       assert last_response.ok?
     end
@@ -138,5 +115,8 @@ describe TestApp do
     assert status == last_response.status, status_msg
     assert (path == redirect_url || url(path) == redirect_url), location_msg
   end
-end
 
+  def post_titles
+    last_response.body.scan(/Test post \d/)
+  end
+end

data/test/post_test.rb

@@ -9,11 +9,11 @@ require 'sinatra/hackety_sling/post'
 include Sinatra::HacketySling
 
 describe Post do
-  it 'should return the correct date permalink' do
+  it 'returns the correct date permalink' do
     assert_equal '/2010/08/09/', Post.order_by(:title => :asc).first.date_permalink
   end
 
-  it 'should return the correct permalink' do
+  it 'returns the correct permalink' do
     assert_equal '/2010/08/09/test-post-1/', Post.order_by(:title => :asc).first.permalink
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hackety_sling
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000Z
+date: 2011-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: document_mapper
-  requirement: &70301858857940 !ruby/object:Gem::Requirement
+  requirement: &70227312894320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301858857940
+  version_requirements: *70227312894320
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70301858857080 !ruby/object:Gem::Requirement
+  requirement: &70227312871760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301858857080
+  version_requirements: *70227312871760
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70301858855940 !ruby/object:Gem::Requirement
+  requirement: &70227312868620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301858855940
+  version_requirements: *70227312868620
 - !ruby/object:Gem::Dependency
   name: ratom
-  requirement: &70301858854820 !ruby/object:Gem::Requirement
+  requirement: &70227312865820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301858854820
+  version_requirements: *70227312865820
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70301858852940 !ruby/object:Gem::Requirement
+  requirement: &70227312864580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301858852940
+  version_requirements: *70227312864580
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70301858851920 !ruby/object:Gem::Requirement
+  requirement: &70227312863460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301858851920
+  version_requirements: *70227312863460
 description: A simple blog engine based on Sinatra and document_mapper
 email:
 - ralph@rvdh.de
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4069875926690539564
+      hash: -3764646363990707626
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4069875926690539564
+      hash: -3764646363990707626
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10