hackety_sling 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec087cce60257c2b6cc60afb89f13352d3ea48f20693eb14b0b12491043b470
-  data.tar.gz: bb2a69d945aa6e170a1071829d4d52829f4049a29e51afb4a912748801c5d6ed
+  metadata.gz: f305500207b2425bd681b8ca00f10b688499fae9c1653f693791c4ddb6184794
+  data.tar.gz: aca3fb0911b69d4bdb05800e4a22627f525d34b0831487eb0332621d920eb130
 SHA512:
-  metadata.gz: 514777edf3e1caf49c0f725302f105680500ad73cd9f5dd9fc81e4949e888bdf7d5157f162514cd88013d933842ff0d856e3af13a43e9489b0e3285a1f7200f7
-  data.tar.gz: 5ae35ee18b30eb7d6a496d1dbc50fa1d1d2883b2838a09516d3d8c9cb09ebe224eba47e3b02ec4b5dddd01247b523a2a765106ecf1853a84242b60dec0c10f6e
+  metadata.gz: 3c983fab72aae9b0c0da3684f30a15047d3b20a2e1a74dd903531e16ee8cf82802cb31f8db30df11c9a2034b69fdcc97ddab58ba364d729a24d4450862c8e44c
+  data.tar.gz: e6386197eb2b274e9e2a005ac1584b5bd6e6d9895ef5af82fe4187d2a4e5c74fec5d05fa5102f22996381d95eb999bdf553f4d2471a72fd4009fb3c391814470

data/hackety_sling.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://rvdh.de'
   s.summary     = %q{A simple blog engine based on Sinatra and document_mapper}
   s.description = %q{A simple blog engine based on Sinatra and document_mapper}
+  s.license     = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/sinatra/hackety_sling/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module HacketySling
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/sinatra/hackety_sling.rb

@@ -12,18 +12,18 @@ module Sinatra
 
       app.get '/' do
         limit = app.hackety_sling_posts_on_index
-        @posts = Post.order_by(:date => :desc).limit(limit).all
+        @posts = Post.order_by(date: :desc).limit(limit).all
         erb :index
       end
 
       app.get '/archive/?' do
-        @posts = Post.order_by(:date => :desc).all
+        @posts = Post.order_by(date: :desc).all
         erb :post_list
       end
 
       %w(tags author).each do |attribute|
         app.get "/#{attribute}/:value/?" do |value|
-          @posts = Post.order_by(:date => :desc)
+          @posts = Post.order_by(date: :desc)
           @posts = @posts.where(attribute.to_sym.include => value).all
           erb :posts
         end
@@ -46,24 +46,28 @@ module Sinatra
         params[:captures].each_with_index do |date_part, index|
           selector_hash[ymd[index]] = date_part.to_i unless date_part.nil?
         end
-        @posts = Post.order_by(:date => :desc).where(selector_hash).all
-        erb :posts
+        @posts = Post.order_by(date: :desc).where(selector_hash).all
+        if @posts.length == 1
+          redirect @posts.first.permalink, 301
+        else
+          erb :posts
+        end
       end
 
       app.get '/atom.xml' do
         feed = Atom::Feed.new do |f|
           f.title = app.hackety_sling_title ||= 'HacketySling Blog'
           blog_url = request.url.sub(request.fullpath, '/')
-          f.links << Atom::Link.new(:href => blog_url)
-          f.links << Atom::Link.new(:rel => 'self', :href => request.url)
+          f.links << Atom::Link.new(href: blog_url)
+          f.links << Atom::Link.new(rel: 'self', href: request.url)
           f.updated = Post.last.date.xmlschema + 'T00:00:00+00:00'
           author = app.hackety_sling_author ||= app.hackety_sling_title
-          f.authors << Atom::Person.new(:name => author)
+          f.authors << Atom::Person.new(name: author)
           f.id = blog_url
-          Post.order_by(:date => :desc).limit(10).all.each do |post|
+          Post.order_by(date: :desc).limit(10).all.each do |post|
             f.entries << Atom::Entry.new do |e|
               e.title = post.title
-              e.links << Atom::Link.new(:href => blog_url + post.permalink)
+              e.links << Atom::Link.new(href: blog_url + post.permalink)
               e.id = blog_url + post.permalink
               e.content = Atom::Content::Html.new post.to_html
               e.updated = post.date.xmlschema + 'T00:00:00+00:00'

data/test/hackety_sling_test.rb

@@ -17,22 +17,23 @@ describe TestApp do
   end
 
   before do
-    @post_titles = Sinatra::HacketySling::Post.order_by(:title => :asc).all.map(&:title)
+    @post_titles = Sinatra::HacketySling::Post.order_by(title: :asc).all.map(&:title)
   end
 
   describe 'when requesting the index path' do
     it 'displays the 2 most current posts by default' do
+      app.set :hackety_sling_posts_on_index, 2
       get '/'
       assert last_response.ok?
-      assert_equal ['Test post 4', 'Test post 3'], post_titles
+      assert_equal ['Test post 5', 'Test post 4'], post_titles
     end
 
     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?
-      assert_equal ['Test post 4', 'Test post 3', 'Test post 2'], post_titles
+      assert_equal ['Test post 5', 'Test post 4', 'Test post 2'], post_titles
+      app.set :hackety_sling_posts_on_index, 2 # set back to original value
     end
   end
 
@@ -40,32 +41,37 @@ describe TestApp do
     it 'shows all posts of one year' do
       get '/2010/'
       assert last_response.ok?
-      assert_equal ['Test post 3', 'Test post 2', 'Test post 1'], post_titles
+      assert_equal ['Test post 4', 'Test post 2', 'Test post 3', 'Test post 1'], post_titles
     end
 
     it 'shows all posts of one month' do
-      get '/2010/11/'
+      get '/2010/08/'
       assert last_response.ok?
-      assert_equal ['Test post 3'], post_titles
+      assert_equal ['Test post 2', 'Test post 3', 'Test post 1'], post_titles
     end
 
     it 'shows all posts of one day' do
       get '/2010/08/10/'
       assert last_response.ok?
-      assert_equal ['Test post 2'], post_titles
+      assert_equal ['Test post 2', 'Test post 3'], post_titles
+    end
+
+    it 'redirects to the post permalink if it is the only post' do
+      get '/2010/08/09/'
+      assert_redirected_to '/2010/08/09/test-post-1/', 301
     end
   end
 
   describe 'when requesting a certain blog post' do
     it 'shows the blog post' do
-      get '/2010/11/13/test-post-3/'
+      get '/2010/11/13/test-post-4/'
       assert last_response.ok?
-      assert_equal ['Test post 3'], post_titles
+      assert_equal ['Test post 4'], post_titles
     end
 
     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
+      get '/test-post-1/'
+      assert_redirected_to '/2010/08/09/test-post-1/', 301
     end
   end
 
@@ -81,7 +87,7 @@ describe TestApp do
     it 'shows all posts with a certain author' do
       get '/author/ralph/'
       assert last_response.ok?
-      assert_equal ['Test post 3'], post_titles
+      assert_equal ['Test post 4'], post_titles
     end
   end
 

data/test/test_posts/2010-08-10-test-post-3.textile

@@ -0,0 +1,7 @@
+---
+title: Test post 3
+tags: [lol]
+title_photo: 4894724000
+---
+
+photo. 4894724000

data/test/test_posts/{2011-02-28-test-post-4.textile → 2010-11-13-test-post-4.textile}

@@ -2,6 +2,7 @@
 title: Test post 4
 tags: [travel, leica, bw]
 title_photo: 4735071835
+author: ralph
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque commodo, erat convallis feugiat faucibus, dolor turpis faucibus sapien, eget fringilla arcu purus sit amet leo. Nulla iaculis bibendum elit, sollicitudin scelerisque arcu pulvinar ut. Nulla faucibus, eros nec lacinia placerat, dui elit pulvinar libero, ut vulputate massa lectus et augue. Nulla a mauris nulla. Suspendisse suscipit nisl volutpat augue condimentum dignissim. Pellentesque consequat fringilla dolor vitae aliquet. Aliquam non urna in urna commodo fermentum quis et mi. Proin sapien nunc, pretium nec commodo vel, aliquet vitae nisl. Cras interdum purus non nunc malesuada imperdiet. Praesent et metus risus, aliquam sollicitudin nunc. Nam at est ante. Nunc sed erat nulla, nec elementum sapien.

data/test/test_posts/{2010-11-13-test-post-3.textile → 2011-02-28-test-post-5.textile}

@@ -1,8 +1,7 @@
 ---
-title: Test post 3
+title: Test post 5
 tags: [travel, leica, bw]
 title_photo: 4735071835
-author: ralph
 ---
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque commodo, erat convallis feugiat faucibus, dolor turpis faucibus sapien, eget fringilla arcu purus sit amet leo. Nulla iaculis bibendum elit, sollicitudin scelerisque arcu pulvinar ut. Nulla faucibus, eros nec lacinia placerat, dui elit pulvinar libero, ut vulputate massa lectus et augue. Nulla a mauris nulla. Suspendisse suscipit nisl volutpat augue condimentum dignissim. Pellentesque consequat fringilla dolor vitae aliquet. Aliquam non urna in urna commodo fermentum quis et mi. Proin sapien nunc, pretium nec commodo vel, aliquet vitae nisl. Cras interdum purus non nunc malesuada imperdiet. Praesent et metus risus, aliquam sollicitudin nunc. Nam at est ante. Nunc sed erat nulla, nec elementum sapien.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackety_sling
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ralph von der Heyden
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: document_mapper
@@ -115,14 +115,16 @@ files:
 - test/test_app.rb
 - test/test_posts/2010-08-09-test-post-1.textile
 - test/test_posts/2010-08-10-test-post-2.textile
-- test/test_posts/2010-11-13-test-post-3.textile
-- test/test_posts/2011-02-28-test-post-4.textile
+- test/test_posts/2010-08-10-test-post-3.textile
+- test/test_posts/2010-11-13-test-post-4.textile
+- test/test_posts/2011-02-28-test-post-5.textile
 - views/index.erb
 - views/post.erb
 - views/post_list.erb
 - views/posts.erb
 homepage: http://rvdh.de
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -139,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A simple blog engine based on Sinatra and document_mapper
@@ -149,5 +151,6 @@ test_files:
 - test/test_app.rb
 - test/test_posts/2010-08-09-test-post-1.textile
 - test/test_posts/2010-08-10-test-post-2.textile
-- test/test_posts/2010-11-13-test-post-3.textile
-- test/test_posts/2011-02-28-test-post-4.textile
+- test/test_posts/2010-08-10-test-post-3.textile
+- test/test_posts/2010-11-13-test-post-4.textile
+- test/test_posts/2011-02-28-test-post-5.textile