rollin 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1f08424b6aa0754fe3ac1911e0e14325fb656c0
-  data.tar.gz: ec44591799d4d3d1754d33d3e88a783374312a42
+  metadata.gz: aed1e3b07b9118c3ef734f8e27bbefc779344735
+  data.tar.gz: 2cf1e9f7bb365927af183e2ca8bd027549a900ae
 SHA512:
-  metadata.gz: 35098a90e5468154cf7abcf2b33de1404485e0235a78c5baeb948c5450b5adc52f41ab7c4e6f8c97547e6b94b2fec0da8c24f4f26e463ecd01234b6d3cb5664b
-  data.tar.gz: 51f989a668f92fd7f0165b0dd06241641f524493ae3af83dd929d36da0fa01ccf5d38171661cf5d799fe9be84922914fdf577845a4be6c7ea79fdb5e2105bad7
+  metadata.gz: c50295fe5f6d471fc089d35df1c52c16c7ba1673711b27466406d28a142707b61a68489aa3fcbdfc5389c54780498967897b4a25978b1f19483e3b84dd221c76
+  data.tar.gz: 1f5e8c574977eefd769dd9ebe00d1980cd5aa9e5f8449f5b752875c94ac632b4ce2a4fafd5dccaa5e457a01defa23db65f3996db0e66c7d4527ad98c09804302

data/README.md

@@ -55,9 +55,10 @@ This is how you access the tag information.
 
 It is YAML snippet and follows a similar format to Jekyll's [yaml front matter](https://github.com/mojombo/jekyll/wiki/yaml-front-matter). Except that our special variables are different:
 
-| Metatag | Description |
-|:------- |:----------- |
-| title   | The article title. It overrides the on extracted from the file name. |
+| Metatag     | Description |
+|:----------- |:----------- |
+| title       | The article title. It overrides the extracted title from the file name.                       |
+| published   | If the article is published. Defaults to "yes". Set it to "no" or "false" to hide an article. |
 
 ### Inquiring metatags
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/rollin/article.rb

@@ -11,28 +11,31 @@ class Rollin::Article
     @day = filename[8, 2].to_i
   end
 
+  def published?
+    !metatags.has_key?('published') || metatags['published'] == 'true'
+  end
+
   def title
     metatags['title'] || @title_from_filename
   end
 
   def matches?(search)
-    return true if @id == search
-    return false if search.is_a? String
+    return @id == search if search.is_a? String
+
+    search = search.inject({}) { |hash, (k,v)| hash[k.to_s] = v; hash }
 
-    search = search.clone
+    return false unless published? || show_unpublished?(search)
 
-    if search.has_key?(:year)
-      return false if search.delete(:year) != @year
-      if search.has_key?(:month)
-        return false if search.delete(:month) != @month
-        if search.has_key?(:day)
-          return false if search.delete(:day) != @day
+    if search.has_key?('year')
+      return false if search.delete('year') != @year
+      if search.has_key?('month')
+        return false if search.delete('month') != @month
+        if search.has_key?('day')
+          return false if search.delete('day') != @day
         end
       end
     end
 
-    search = search.inject({}) { |memo, (k,v)| memo[k.to_s] = v; memo }
-
     if search.keys.empty?
       return true
     else
@@ -86,6 +89,10 @@ class Rollin::Article
       FileContent.new(nil, raw)
     end
   end
+
+  def show_unpublished?(search)
+    search.has_key?('published') && search['published'].to_s != 'true' && search['published'] != 'yes'
+  end
 end
 
 class FileContent

data/lib/rollin/blog.rb

@@ -3,25 +3,25 @@ class Rollin::Blog
     @articles_folder = options[:articles_folder] || 'articles'
   end
 
-  def article(search)
-    read_articles.find { |article| article.matches?(search) }
+  def article(search = {})
+    unfiltered_articles.find { |article| article.matches?(search) }
   end
 
-  def articles(search=nil)
-    if search.nil?
-      read_articles
-    else
-      read_articles.select { |article| article.matches?(search) }
-    end
+  def articles(search = {})
+    unfiltered_articles.select { |article| article.matches?(search) }
+  end
+
+  def unfiltered_articles
+    read_articles.reverse
   end
 
   def metatags
-    metatag_labels = articles.map do |article|
+    metatag_labels = unfiltered_articles.map do |article|
       article.metatags.keys
     end.flatten.uniq
 
     metatag_labels.map do |metatag_label|
-      values = articles.select { |article| article.metatags.has_key?(metatag_label) }.map do |article|
+      values = unfiltered_articles.select { |article| article.metatags.has_key?(metatag_label) }.map do |article|
         article.metatags[metatag_label]
       end.flatten.uniq.map do |metatag_content|
         Rollin::MetatagValue.new(metatag_content, articles(metatag_label => metatag_content))

data/spec/fixtures/2014_01_01_My_fifth_post.mk

@@ -0,0 +1,3 @@
+## This is my fourth post
+
+Really awesome!!

data/spec/rollin_spec.rb

@@ -6,23 +6,24 @@ require 'spec_helper'
 # 2013_05_02_My_second_post.mk
 # 2013_06_01_My_third_post.mk
 # 2014_01_01_My_fourth_post.mk
+# 2014_01_01_My_fifth_article.mk
 
 describe 'how rollin works' do
 
   subject (:blog) { Rollin::Blog.new(articles_folder: 'spec/fixtures') }
 
-  let (:first_article) { blog.articles.first }
-  let (:second_article) { blog.articles[1] }
-  let (:third_article) { blog.articles[2] }
-  let (:fourth_article) { blog.articles[3] }
+  let (:first_article) { blog.articles[3] }
+  let (:second_article) { blog.articles[2] }
+  let (:third_article) { blog.articles[1] }
+  let (:fifth_article) { blog.articles[0] }
 
-  let (:article_with_single_tag_metatag) { blog.articles[0] }
-  let (:article_with_title_metatag) { blog.articles[1] }
-  let (:article_with_multiple_tag_metatag) { blog.articles[2] }
-  let (:article_with_published_metatag) { blog.articles[3] }
+  let (:article_with_single_tag_metatag) { blog.articles[3] }
+  let (:article_with_title_metatag) { blog.articles[2] }
+  let (:article_with_multiple_tag_metatag) { blog.articles[1] }
+  let (:unpublished_article) { blog.article(:published => false) }
 
   context 'article content' do
-    let (:article) { blog.articles.first }
+    let (:article) { blog.articles.last }
 
     it 'exposes article information and content' do
       article.id.should == '2013_05_01_My_first_post'
@@ -31,6 +32,7 @@ describe 'how rollin works' do
       article.month.should == 5
       article.day.should == 1
       article.date.should == Date.new(2013, 5, 1)
+      article.published?.should be_true
       article.body.should == "<h2>This is my first post</h2>\n\n<p>And here we go!</p>\n"
       article.metatags.should == { 'tags' => [ 'manero' ] }
     end
@@ -41,7 +43,7 @@ describe 'how rollin works' do
 
     it 'exposes the list of defined metatags' do
       article_with_multiple_tag_metatag.metatags.should == { 'tags' => ['manero', 'massa', 'bacana'] }
-      article_with_published_metatag.metatags.should == { 'published' => false }
+      unpublished_article.metatags.should == { 'published' => false }
     end
   end
 
@@ -52,22 +54,22 @@ describe 'how rollin works' do
     end
 
     it 'searches by metatags' do
-      blog.article(:tags => 'manero').should == article_with_single_tag_metatag
-      blog.article('tags' => 'manero').should == article_with_single_tag_metatag
+      blog.article(:tags => 'manero').should == article_with_multiple_tag_metatag
+      blog.article('tags' => 'manero').should == article_with_multiple_tag_metatag
 
-      blog.articles(:tags => 'manero').should == [ article_with_single_tag_metatag, article_with_multiple_tag_metatag ]
-      blog.articles('tags' => 'manero').should == [ article_with_single_tag_metatag, article_with_multiple_tag_metatag ]
+      blog.articles(:tags => 'manero').should == [ article_with_multiple_tag_metatag, article_with_single_tag_metatag ]
+      blog.articles('tags' => 'manero').should == [ article_with_multiple_tag_metatag, article_with_single_tag_metatag ]
 
-      blog.article(:published => false).should == article_with_published_metatag
-      blog.article('published' => false).should == article_with_published_metatag
+      blog.article(:published => false).should == unpublished_article
+      blog.article('published' => false).should == unpublished_article
 
-      blog.articles(:published => false).should == [ article_with_published_metatag ]
-      blog.articles('published' => false).should == [ article_with_published_metatag ]
+      blog.articles(:published => false).should == [ unpublished_article ]
+      blog.articles('published' => false).should == [ unpublished_article ]
     end
 
     it 'searches by date' do
-      blog.articles(year: 2013).should == [ first_article, second_article, third_article ]
-      blog.articles(year: 2013, month: 5).should == [first_article, second_article ]
+      blog.articles(year: 2013).should == [ third_article, second_article, first_article ]
+      blog.articles(year: 2013, month: 5).should == [second_article, first_article ]
       blog.articles(year: 2013, month: 5, day: 1).should  == [ first_article ]
     end
 
@@ -81,24 +83,24 @@ describe 'how rollin works' do
     it 'shows a list of existent metatags' do
       blog.should have(3).metatags
 
-      blog.metatags[0].label.should == 'tags'
-      blog.metatags[0].should have(3).values
-      blog.metatags[0].values[0].content.should == 'manero'
-      blog.metatags[0].values[0].articles.should == [ article_with_single_tag_metatag, article_with_multiple_tag_metatag ]
-      blog.metatags[0].values[1].content.should == 'massa'
-      blog.metatags[0].values[1].articles.should == [ article_with_multiple_tag_metatag ]
-      blog.metatags[0].values[2].content.should == 'bacana'
-      blog.metatags[0].values[2].articles.should == [ article_with_multiple_tag_metatag ]
-
-      blog.metatags[1].label.should == 'title'
-      blog.metatags[1].should have(1).values
-      blog.metatags[1].values[0].content.should == 'This is a super post!'
-      blog.metatags[1].values[0].articles.should == [ article_with_title_metatag ]
-
-      blog.metatags[2].label.should == 'published'
+      blog.metatags[0].label.should == 'published'
+      blog.metatags[0].should have(1).values
+      blog.metatags[0].values[0].content.should == false
+      blog.metatags[0].values[0].articles.should == [ unpublished_article ]
+
+      blog.metatags[1].label.should == 'tags'
+      blog.metatags[1].should have(3).values
+      blog.metatags[1].values[2].content.should == 'bacana'
+      blog.metatags[1].values[2].articles.should == [ article_with_multiple_tag_metatag ]
+      blog.metatags[1].values[1].content.should == 'massa'
+      blog.metatags[1].values[1].articles.should == [ article_with_multiple_tag_metatag ]
+      blog.metatags[1].values[0].content.should == 'manero'
+      blog.metatags[1].values[0].articles.should == [ article_with_multiple_tag_metatag, article_with_single_tag_metatag ]
+
+      blog.metatags[2].label.should == 'title'
       blog.metatags[2].should have(1).values
-      blog.metatags[2].values[0].content.should == false
-      blog.metatags[2].values[0].articles.should == [ article_with_published_metatag ]
+      blog.metatags[2].values[0].content.should == 'This is a super post!'
+      blog.metatags[2].values[0].articles.should == [ article_with_title_metatag ]
     end
   end
 
@@ -106,15 +108,15 @@ describe 'how rollin works' do
     let (:first_article) { TestArticle.new(id: '2013_05_01_My_first_post', title: 'My first post', date: Date.new(2013, 5, 1)) }
     let (:second_article) { TestArticle.new(id: '2013_05_02_My_second_post', title: 'This is a super post!', date: Date.new(2013, 5, 2)) }
     let (:third_article) { TestArticle.new(id: '2013_06_01_My_third_post', title: 'My third post', date: Date.new(2013, 6, 1)) }
-    let (:fourth_article) { TestArticle.new(id: '2014_01_01_My_fourth_post', title: 'My fourth post', date: Date.new(2014, 1, 1)) }
+    let (:fifth_article) { TestArticle.new(id: '2014_01_01_My_fifth_post', title: 'My fifth post', date: Date.new(2014, 1, 1)) }
 
     it 'lists all articles' do
       blog.should have(4).articles
 
-      blog.articles[0].should == first_article
-      blog.articles[1].should == second_article
-      blog.articles[2].should == third_article
-      blog.articles[3].should == fourth_article
+      blog.articles[0].should == fifth_article
+      blog.articles[1].should == third_article
+      blog.articles[2].should == second_article
+      blog.articles[3].should == first_article
     end
   end
 
@@ -122,38 +124,39 @@ describe 'how rollin works' do
     it 'provides monthly archive' do
       blog.monthly_archive.should have(3).articles
 
-      blog.monthly_archive[0].year.should == 2013
-      blog.monthly_archive[0].month.should == 5
-      blog.monthly_archive[0].articles.should == [ first_article, second_article ]
+      blog.monthly_archive[0].year.should == 2014
+      blog.monthly_archive[0].month.should == 1
+      blog.monthly_archive[0].articles.should == [ fifth_article ]
 
       blog.monthly_archive[1].year.should == 2013
       blog.monthly_archive[1].month.should == 6
       blog.monthly_archive[1].articles.should == [ third_article ]
 
-      blog.monthly_archive[2].year.should == 2014
-      blog.monthly_archive[2].month.should == 1
-      blog.monthly_archive[2].articles.should == [ fourth_article ]
+      blog.monthly_archive[2].year.should == 2013
+      blog.monthly_archive[2].month.should == 5
+      blog.monthly_archive[2].articles.should == [ second_article, first_article ]
     end
 
     it 'provides annual archive' do
       blog.should have(2).annual_archive
 
-      blog.annual_archive[0].year.should == 2013
-      blog.annual_archive[0].articles.should == [ first_article, second_article, third_article ]
-      blog.annual_archive[0].should have(2).monthly_archive
-      blog.annual_archive[0].monthly_archive[0].year.should == 2013
-      blog.annual_archive[0].monthly_archive[0].month.should == 5
-      blog.annual_archive[0].monthly_archive[0].articles.should == [ first_article, second_article ]
-      blog.annual_archive[0].monthly_archive[1].year.should == 2013
-      blog.annual_archive[0].monthly_archive[1].month.should == 6
-      blog.annual_archive[0].monthly_archive[1].articles.should == [ third_article ]
-
-      blog.annual_archive[1].year.should == 2014
-      blog.annual_archive[1].articles.should == [ fourth_article ]
-      blog.annual_archive[1].should have(1).monthly_archive
-      blog.annual_archive[1].monthly_archive[0].year.should == 2014
-      blog.annual_archive[1].monthly_archive[0].month.should == 1
-      blog.annual_archive[1].monthly_archive[0].articles.should == [ fourth_article ]
+      blog.annual_archive[0].year.should == 2014
+      blog.annual_archive[0].articles.should == [ fifth_article ]
+      blog.annual_archive[0].should have(1).monthly_archive
+      blog.annual_archive[0].monthly_archive[0].year.should == 2014
+      blog.annual_archive[0].monthly_archive[0].month.should == 1
+      blog.annual_archive[0].monthly_archive[0].articles.should == [ fifth_article ]
+
+      blog.annual_archive[1].year.should == 2013
+      blog.annual_archive[1].articles.should == [ third_article, second_article, first_article ]
+      blog.annual_archive[1].should have(2).monthly_archive
+      blog.annual_archive[1].monthly_archive[0].year.should == 2013
+      blog.annual_archive[1].monthly_archive[0].month.should == 6
+      blog.annual_archive[1].monthly_archive[0].articles.should == [ third_article ]
+
+      blog.annual_archive[1].monthly_archive[1].year.should == 2013
+      blog.annual_archive[1].monthly_archive[1].month.should == 5
+      blog.annual_archive[1].monthly_archive[1].articles.should == [ second_article, first_article ]
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - marano
@@ -135,7 +135,8 @@ files:
 - spec/fixtures/2013_05_01_My_first_post.mk
 - spec/fixtures/2013_05_02_My_second_post.mk
 - spec/fixtures/2013_06_01_My_third_post.mk
-- spec/fixtures/2014_01_01_My_fourth_post.mk
+- spec/fixtures/2013_07_01_My_fourth_post.mk
+- spec/fixtures/2014_01_01_My_fifth_post.mk
 - spec/rollin_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/marano/rollin
@@ -158,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: A Ruby minimalistic blog engine ... WATTT!!?!??
@@ -166,6 +167,7 @@ test_files:
 - spec/fixtures/2013_05_01_My_first_post.mk
 - spec/fixtures/2013_05_02_My_second_post.mk
 - spec/fixtures/2013_06_01_My_third_post.mk
-- spec/fixtures/2014_01_01_My_fourth_post.mk
+- spec/fixtures/2013_07_01_My_fourth_post.mk
+- spec/fixtures/2014_01_01_My_fifth_post.mk
 - spec/rollin_spec.rb
 - spec/spec_helper.rb