ruby-slippers 0.0.13 → 0.0.25

data/README.md

@@ -6,11 +6,7 @@ RubySlippers, the smartest blogging engine in all of Oz!
 Introduction
 ------------
 
-
-For Developers
---------------
-
-#### To set up a new blog
+### To set up a new blog
 
     $ git clone git://github.com/dreamr/ruby-slippers.git myblog
     $ cd myblog
@@ -22,7 +18,7 @@ For Developers
     $ Blog installed!
     
     
-#### To create an article
+### To create an article
 
     $ rake new
     $ -> Title: My new blog post!

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.25

data/lib/ruby_slippers/article.rb

@@ -72,13 +72,18 @@ module RubySlippers
           "<a href=\"/tagged/#{tag.strip.slugize}\">#{tag.strip.humanize.downcase}</a>"
         end.join(@config[:tag_separator])
       end
+      
+      def full_image_path
+ self[:date].strftime("/img/articles/%Y/%B/#{self[:image]}").downcase
+      end
   
       def title()     self[:title] || "an article"                end
       def date()      @config[:date].call(self[:date])            end
       def author()    self[:author] || @config[:author]           end
-      def image_src() self[:image]                                end
+      def image_src() full_image_path                             end
       def to_html()   self.load; super(:article, @config)         end
       alias :to_s to_html
+      
     end
   end
 end

data/test/fixtures/articles/2011-05-18-ozma-of-oz.txt

@@ -1,7 +1,7 @@
 title: Ozma of Oz
 date: 18/05/2011
 tags: ozma, oz
-image: test/fixtures/images/ozma.png
+image: ozma.png
 
 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 

data/test/fixtures/pages/about.rhtml

@@ -1 +1 @@
-<span id="count"><%= @articles.length %></span>
+Fill me in with your about info!

data/test/fixtures/pages/archives.rhtml

@@ -1,5 +1,11 @@
 <h1><%= @path %></h1>
-<% for entry in archives %>
-  <li class="entry"><%= entry.title %></li>
-<% end %>
+<ul>
+  <% if archives.length > 0 %>
+    <% for article in archives %>
+      <li class="article">
+        <a href="<%= article.path %>"><%= article.title %></a>
+      </li>
+    <% end %>
+  <% end %>
+</ul>
 

data/test/fixtures/pages/article.rhtml

@@ -1,4 +1,28 @@
-<h2><%= title %></h2>
-<span><%= date %></h2>
-<p><%= body %></p>
+<article class="article">
+  <header>
+    <h1><%= title %></h1>
+    <span class="date"><%= date %></span>
+  </header>
+
+
+  <% if image_src %>
+  <figure>
+    <img src="<%= image_src || '/img/missing_thumb.png' %>" alt="Post thumbnail" class="thumbnail alignleft" />
+  </figure>
+  <% end %>
+
+  
+  <section class="content">
+    <%= body %>
+  </section>
+
+  <section class="comments">
+    <% if @config[:disqus] %>
+      <div id="disqus_thread"></div>
+      <script type="text/javascript" src="http://disqus.com/forums/<%= @config[:disqus] %>/embed.js"> </script>
+      <noscript><a href="http://<%= @config[:disqus] %>.disqus.com/?url=ref">View the discussion thread.</a></noscript>
+      <a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+    <% end %>
+  </section>
+</article>
 

data/test/fixtures/pages/index.rhtml

@@ -1,13 +1,27 @@
-<ul id="articles">
-  <% for article in articles[0...2] %>
-    <li><img src="<%= article.image_src %>" /><%= article %></li>
+<section id="articles">
+  <% for article in articles[0...3] %>
+    <article class="article">
+      <header>
+        <h1><a href="<%= article.path %>"><%= article.title %></a></h1>
+        <span class="date"><%= article.date %></span>
+      </header>
+      
+      <% if article.image_src %>
+      <figure>
+        <img src="<%= article.image_src || '/img/missing_thumb.png' %>" alt="Post thumbnail" class="thumbnail alignleft" />
+      </figure>
+      <% end %>
+      
+      <section class="content">
+        <%= article.summary %>
+      </section>
+      
+      <footer>
+        <div class="more-link"><a href="<%= article.path %>">read on &raquo;</a></div>
+        <span class="meta">
+          <p>Posted by <%= article.author %> in <%= article.tag_links %> on <%= article.date %></p>
+        </div>
+      </footer>
+    </article>
   <% end %>
-</ul>
-<div id="archives">
-  <%= archives[2...5] %>
-</div>
-<!-- testing env variable passing -->
-<p>env passed: <%= env != nil %><br/></p>
-<!-- testing get/post parameter passing -->
-<p>request method type: <%= env['REQUEST_METHOD'] %><br/></p>
-<p>request name value pair: <%= env['QUERY_STRING'] %><br/></p>
+</section>

data/test/fixtures/pages/tagged.rhtml

@@ -3,7 +3,7 @@
 <% unless articles.empty? %>
   <ul>
     <% for article in articles %>
-      <li class="entry"><a href="<%= article.url %>"><%= article.title %></a></li>
+      <li class="article"><a href="<%= article.url %>"><%= article.title %></a></li>
     <% end %>
   </ul>
 <% end %>

data/test/integration/article_test.rb

@@ -1,44 +1,51 @@
 require 'support/test_helper'
-context RubySlippers::Engine::Article do
-  setup do
-    @config = RubySlippers::Engine::Config.new(:markdown => true, :author => AUTHOR, :url => URL)
-    @ruby_slippers = Rack::MockRequest.new(RubySlippers::Engine::App.new(@config))
-    RubySlippers::Engine::Paths[:articles]  = "test/fixtures/articles"
-    RubySlippers::Engine::Paths[:pages]     = "test/fixtures/pages"
-    RubySlippers::Engine::Paths[:templates] = "test/fixtures/templates"
-  end
-
-  context "GET a single article" do
-    setup { @ruby_slippers.get("/2010/05/17/the-wonderful-wizard-of-oz") }
-    asserts("returns a 200")                { topic.status }.equals 200
-    asserts("content type is set properly") { topic.content_type }.equals "text/html"
-    should("contain the article")           { topic.body }.includes_html("p" => /Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum./)
-  end
 
-  context "GET to the archive" do
-    context "through a year" do
-      setup { @ruby_slippers.get('/2011') }
-      asserts("returns a 200")                     { topic.status }.equals 200
-      should("includes the entries for that year") { topic.body }.includes_elements("li.entry", 1)
+module RubySlippers::Engine
+  context Article do
+    setup do
+      @config = RubySlippers::Engine::Config.new(:markdown => true, :author => AUTHOR, :url => URL)
+      @ruby_slippers = Rack::MockRequest.new(RubySlippers::Engine::App.new(@config))
+      
+      RubySlippers::Engine::Paths[:articles]  = "test/fixtures/articles"
+      if File.expand_path("../../", __FILE__) =~ /engine/
+        RubySlippers::Engine::Paths[:templates] = "test/fixtures/templates"
+        RubySlippers::Engine::Paths[:pages]     = "test/fixtures/pages"
+      end
     end
 
-    context "through a year & month" do
-      setup { @ruby_slippers.get('/2011/05') }
-      asserts("returns a 200")                      { topic.status }.equals 200
-      should("includes the entries for that month") { topic.body }.includes_elements("li.entry", 1)
-      should("includes the year & month")           { topic.body }.includes_html("h1" => /2011\/05/)
+    context "GET a single article" do
+      setup { @ruby_slippers.get("/2010/05/17/the-wonderful-wizard-of-oz") }
+      asserts("returns a 200")                { topic.status }.equals 200
+      asserts("content type is set properly") { topic.content_type }.equals "text/html"
+      should("contain the article")           { topic.body }.includes_html("p" => /Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum./)
     end
 
-    context "through /archives" do
-      setup { @ruby_slippers.get('/archives') }
+    context "GET to the archive" do
+      context "through a year" do
+        setup { @ruby_slippers.get('/2011') }
+        asserts("returns a 200")                     { topic.status }.equals 200
+        should("includes the entries for that year") { topic.body }.includes_elements("li.article", 1)
+      end
+
+      context "through a year & month" do
+        setup { @ruby_slippers.get('/2011/05') }
+        asserts("returns a 200")                      { topic.status }.equals 200
+        should("includes the entries for that month") { topic.body }.includes_elements("li.article", 1)
+        should("includes the year & month")           { topic.body }.includes_html("h1" => /2011\/05/)
+      end
+
+      context "through /archives" do
+        setup { @ruby_slippers.get('/archives') }
+      end
     end
-  end
 
-  context "GET the tagged page" do 
-    setup { @ruby_slippers.get('/tagged/wizard') }
-    asserts("returns a 200")                         { topic.status }.equals 200 
-    asserts("body is not empty")                     { not topic.body.empty? }
-    should("includes only the entries for that tag") { topic.body }.includes_elements("li.entry", 1)
-    should("has access to @tag")                     { topic.body }.includes_html("h1" => /wizard/)
+    context "GET the tagged page" do 
+      setup { @ruby_slippers.get('/tagged/wizard') }
+      asserts("returns a 200")                         { topic.status }.equals 200 
+      asserts("body is not empty")                     { not topic.body.empty? }
+      should("includes only the entries for that tag") { topic.body }.includes_elements("li.article", 1)
+      should("has access to @tag")                     { topic.body }.includes_html("h1" => /wizard/)
+    end
   end
+  
 end

data/test/integration/atom_test.rb

@@ -1,19 +1,24 @@
 require 'support/test_helper'
 
-context RubySlippers::Engine::Article do
-  setup do
-    @config = RubySlippers::Engine::Config.new(:markdown => true, :author => AUTHOR, :url => URL)
-    @ruby_slippers = Rack::MockRequest.new(RubySlippers::Engine::App.new(@config))
-    RubySlippers::Engine::Paths[:articles] = "test/fixtures/articles"
-    RubySlippers::Engine::Paths[:pages] = "test/fixtures/pages"
-    RubySlippers::Engine::Paths[:templates] = "test/fixtures/templates"
-  end
-  
-  context "GET /index.xml (atom feed)" do
-    setup { @ruby_slippers.get('/index.xml') }
-    asserts("content type is set properly") { topic.content_type }.equals "application/xml"
-    asserts("body should be valid xml")     { topic.body }.includes_html("feed > entry" => /.+/)
-    asserts("summary shouldn't be empty")   { topic.body }.includes_html("summary" => /.{10,}/)
+module RubySlippers::Engine
+  context Article do
+    setup do
+      @config = RubySlippers::Engine::Config.new(:markdown => true, :author => AUTHOR, :url => URL)
+      @ruby_slippers = Rack::MockRequest.new(RubySlippers::Engine::App.new(@config))
+
+      RubySlippers::Engine::Paths[:articles]  = "test/fixtures/articles"
+      if File.expand_path("../../", __FILE__) =~ /engine/
+        RubySlippers::Engine::Paths[:templates] = "test/fixtures/templates"
+        RubySlippers::Engine::Paths[:pages]     = "test/fixtures/pages"
+      end
+    end
+
+    context "GET /index.xml (atom feed)" do
+      setup { @ruby_slippers.get('/index.xml') }
+      asserts("content type is set properly") { topic.content_type }.equals "application/xml"
+      asserts("body should be valid xml")     { topic.body }.includes_html("feed > entry" => /.+/)
+      asserts("summary shouldn't be empty")   { topic.body }.includes_html("summary" => /.{10,}/)
+    end
+
   end
-  
-end
+end

data/test/integration/ruby_slippers_test.rb

@@ -1,77 +1,70 @@
 require 'support/test_helper'
 require 'date'
 
-context RubySlippers::Engine do
-  setup do
-    @config = RubySlippers::Engine::Config.new(:markdown => true, :author => AUTHOR, :url => URL)
-    @ruby_slippers = Rack::MockRequest.new(RubySlippers::Engine::App.new(@config))
-    RubySlippers::Engine::Paths[:articles] = "test/fixtures/articles"
-    RubySlippers::Engine::Paths[:pages] = "test/fixtures/pages"
-    RubySlippers::Engine::Paths[:templates] = "test/fixtures/templates"
-  end
+module RubySlippers
+  context Engine do
+    setup do
+      @config = RubySlippers::Engine::Config.new(:markdown => true, :author => AUTHOR, :url => URL)
+      @ruby_slippers = Rack::MockRequest.new(RubySlippers::Engine::App.new(@config))  
+      
+      RubySlippers::Engine::Paths[:articles]  = "test/fixtures/articles"
+      if File.expand_path("../../", __FILE__) =~ /engine/
+        RubySlippers::Engine::Paths[:templates] = "test/fixtures/templates"
+        RubySlippers::Engine::Paths[:pages]     = "test/fixtures/pages"
+      end
+    end
   
-  context "GET /" do
-    setup { @ruby_slippers.get('/') }
+    context "GET /" do
+      setup { @ruby_slippers.get('/') }
 
-    asserts("returns a 200")                { topic.status }.equals 200
-    asserts("body is not empty")            { not topic.body.empty? }
-    asserts("content type is set properly") { topic.content_type }.equals "text/html"
-    should("include a couple of articles")   { topic.body }.includes_elements("#articles li", 2)
-    should("include an archive")            { topic.body }.includes_elements("#archives li", 2)
+      asserts("returns a 200")                { topic.status }.equals 200
+      asserts("body is not empty")            { not topic.body.empty? }
+      asserts("content type is set properly") { topic.content_type }.equals "text/html"
+      should("include 3 articles"){ topic.body }.includes_elements("article", 3)
 
-    context "with no articles" do
-      setup { Rack::MockRequest.new(RubySlippers::Engine::App.new(@config.merge(:ext => 'oxo'))).get('/') }
+      context "with no articles" do
+        setup { Rack::MockRequest.new(RubySlippers::Engine::App.new(@config.merge(:ext => 'oxo'))).get('/') }
 
-      asserts("body is not empty")          { not topic.body.empty? }
-      asserts("returns a 200")              { topic.status }.equals 200
-    end
+        asserts("body is not empty")          { not topic.body.empty? }
+        asserts("returns a 200")              { topic.status }.equals 200
+      end
 
-    context "with a user-defined to_html" do
-      setup do
-        @config[:to_html] = lambda do |path, page, binding|
-          ERB.new(File.read("#{path}/#{page}.rhtml")).result(binding)
+      context "with a user-defined to_html" do
+        setup do
+          @config[:to_html] = lambda do |path, page, binding|
+            ERB.new(File.read("#{path}/#{page}.rhtml")).result(binding)
+          end
+          @ruby_slippers.get('/')
         end
-        @ruby_slippers.get('/')
+
+        asserts("returns a 200")                { topic.status }.equals 200
+        asserts("body is not empty")            { not topic.body.empty? }
+        asserts("content type is set properly") { topic.content_type }.equals "text/html"
+        should("include 3 articles"){ topic.body }.includes_elements("article", 3)
+        asserts("Etag header present")          { topic.headers.include? "ETag" }
+        asserts("Etag header has a value")      { not topic.headers["ETag"].empty? }
       end
+    end
 
+    context "GET /about" do
+      setup { @ruby_slippers.get('/about') }
       asserts("returns a 200")                { topic.status }.equals 200
       asserts("body is not empty")            { not topic.body.empty? }
-      asserts("content type is set properly") { topic.content_type }.equals "text/html"
-      should("include a couple of article")   { topic.body }.includes_elements("#articles li", 2)
-      should("include an archive")            { topic.body }.includes_elements("#archives li", 2)
-      asserts("Etag header present")          { topic.headers.include? "ETag" }
-      asserts("Etag header has a value")      { not topic.headers["ETag"].empty? }
     end
-  end
 
-  context "GET /about" do
-    setup { @ruby_slippers.get('/about') }
-    asserts("returns a 200")                { topic.status }.equals 200
-    asserts("body is not empty")            { not topic.body.empty? }
-    should("have access to @articles")      { topic.body }.includes_html("#count" => /4/)
-  end
+    context "GET to an unknown route with a custom error" do
+      setup do
+        @config[:error] = lambda {|code| "error: #{code}" }
+        @ruby_slippers.get('/unknown')
+      end
 
-  context "GET to an unknown route with a custom error" do
-    setup do
-      @config[:error] = lambda {|code| "error: #{code}" }
-      @ruby_slippers.get('/unknown')
+      should("returns a 404") { topic.status }.equals 404
+      should("return the custom error") { topic.body }.equals "error: 404"
     end
 
-    should("returns a 404") { topic.status }.equals 404
-    should("return the custom error") { topic.body }.equals "error: 404"
-  end
-
-  context "Request is invalid" do
-    setup { @ruby_slippers.delete('/invalid') }
-    should("returns a 400") { topic.status }.equals 400
-  end
-
-  context "GET /index?param=testparam (get parameter)" do
-    setup { @ruby_slippers.get('/index?param=testparam')   }
-    asserts("returns a 200")                { topic.status }.equals 200
-    asserts("content type is set properly") { topic.content_type }.equals "text/html"
-    asserts("contain the env variable")           { topic.body }.includes_html("p" => /env passed: true/)
-    asserts("access the http get parameter")           { topic.body }.includes_html("p" => /request method type: GET/)
-    asserts("access the http parameter name value pair")           { topic.body }.includes_html("p" => /request name value pair: param=testparam/)
+    context "Request is invalid" do
+      setup { @ruby_slippers.delete('/invalid') }
+      should("returns a 400") { topic.status }.equals 400
+    end
   end
 end

data/test/unit/article_test.rb

@@ -48,7 +48,7 @@ context RubySlippers::Engine::Article do
         :slug   => "wizard-of-oz",
         :author => "toetoe",
         :tags   => "wizards, oz",
-        :image  => "img/articles/2011/may/ozma.png"
+        :image  => "ozma.png"
       }, @config)
     end
 
@@ -57,7 +57,7 @@ context RubySlippers::Engine::Article do
     should("use the author")  { topic.author }.equals "toetoe"
     should("have tags")       { topic.tags }.equals "wizards, oz"
     should("have tag links")  { topic.tag_links }.equals "<a href=\"/tagged/wizards\">wizards</a>, <a href=\"/tagged/oz\">oz</a>"
-    should("have an image")   { topic.image_src }.equals "img/articles/2011/may/ozma.png"
+    should("have an image")   { topic.image_src }.equals "/img/articles/1976/october/ozma.png"
 
     context "and long first paragraph" do
       should("create a valid summary") { topic.summary }.equals "<p>" + ("a little bit of text." * 5).chop + "&hellip;</p>\n"

metadata

@@ -2,7 +2,7 @@
 name: ruby-slippers
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.13
+  version: 0.0.25
 platform: ruby
 authors: 
 - dreamr
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 Z
+date: 2011-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake