rollin 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6ef7f3be9c83a460825f763d4c06d1b2b0ac1a6
-  data.tar.gz: ab3c26c1af266bb7ca8caf4ef57e9e6c15b02548
+  metadata.gz: 049730c65afc7a862413afa2d4cb68e79ce28adb
+  data.tar.gz: 3dd7bd4326661904a43a8ad20c544fa4c738ffb3
 SHA512:
-  metadata.gz: 5b52239b44ea70fd8e6d887f36958600aaa4183ee42bb34a2b3212a1cbb73919f1ba111b26f19ca688877d23c0bdc36d83e844189c6770ba48a18c7a78d37b37
-  data.tar.gz: e4c68146f52c7edce5aad218527fcf0e06b4011cc4569ff36a47fe1615c5eee9ab5e1239b1defce396f71df57bb0e2655a208051e67718b010d79c0d26de7f2e
+  metadata.gz: d7d53f585e4e0493a00f526def30670eb2b95fff27d5c21479e5986965510009dd52341eb4c1d5f4ff249cbf648d433a25bb4ba0ddc5b042a26dbcf1fe567bce
+  data.tar.gz: 88612276e7ffe27f8e84f546bd99aa7e6e3eed8cc8b5dd90fc53fd9f5ce3a7411bb6886aa21c0a4e9e8c361de201cad0e1243656408106e73d80360ebde7a18f

data/README.md

@@ -21,7 +21,7 @@ First you will need to have the following structure in your filesystem.
     ├── my_posts
         └── 2013_05_01_My_first_post.mk
 
-### Getting articles
+### Getting the articles
 
 In your code.
     
@@ -29,12 +29,14 @@ In your code.
     
     anArticle = blog.articles.first
 
+    anArticle.id     # => "2013_05_01_My_first_post"
+    anArticle.title  # => "My first post"
+    anArticle.body   # => "<h3>My first post!</h3>\n<p>blah blah blah</p>"
+
     anArticle.date   # => #<Date: 2013-05-01 ((2456414j,0s,0n),+0s,2299161j)>
     anArticle.year   # => 2013
     anArticle.month  # => 05
     anArticle.day    # => 01
-    anArticle.title  # => "My first post"
-    anArticle.body   # => "<h3>My first post!</h3>\n<p>blah blah blah</p>"
 
 ### Getting the archive
 
@@ -44,6 +46,10 @@ In your code.
     a_monthly_archive.month     # => 5
     a_monthly_archive.articles  # => [ Rollin::Article(:title => "My first post" ...) ]
 
+### Finding an article
+
+    blog.find_article_by_id('2013_05_01_My_first_post')  # => #Rollin::Article(:title => "My first post" ...)
+
 ## Build status
 
 [![Build Status](https://travis-ci.org/marano/rollin.png)](https://travis-ci.org/marano/rollin)

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/rollin/blog.rb

@@ -13,27 +13,18 @@ class Rollin::Blog
     end
   end
 
-  def monthly_archive
-    years = {}
-    articles.each do |article|
-      if years.has_key?(article.year)
-        year = years[article.year]
-        if year.has_key?(article.month)
-          year[article.month] << article
-        else
-          year[article.month] = [ article ]
-        end
-      else
-        years[article.year] = { article.month => [ article ] }
-      end
+  def annually_archive
+    monthly_archive.map { |month_archive| month_archive.year }.uniq.map do |year|
+      Rollin::YearArchive.new(year, monthly_archive.map { |aMonth| aMonth.year == year })
     end
-    archives_list = []
-    years.each do |year, months|
-      months.each do |month|
-        month_articles = articles.map { |article| article.year == year && article.month == month }
-        archives_list << Rollin::MonthArchive.new(year, month, month_articles)
-      end
+  end
+
+  def monthly_archive
+    articles.map { |article| [article.year, article.month] }.uniq.map do |year_and_month|
+      year = year_and_month[0]
+      month = year_and_month[1]
+      articles_for_month = articles.map { |anArticle| anArticle.year == year && anArticle.month }
+      Rollin::MonthArchive.new(year, month, articles_for_month)
     end
-    return archives_list
   end
 end

data/lib/rollin/year_archive.rb

@@ -0,0 +1,11 @@
+class Rollin::YearArchive
+  attr_reader :year, :monthly_archive
+
+  def initialize(year, monthly_archive)
+    @year, @monthly_archive = year, monthly_archive
+  end
+
+  def articles
+    monthly_archive.map { |month_archive| month_archive.articles }.flatten
+  end
+end

data/lib/rollin.rb

@@ -5,6 +5,7 @@ require "rollin/version"
 require "rollin/blog"
 require "rollin/article"
 require "rollin/month_archive"
+require "rollin/year_archive"
 
 module Rollin
 end

data/spec/blog_spec.rb

@@ -5,11 +5,15 @@ describe Rollin::Blog do
     subject (:blog) { Rollin::Blog.new(articles_folder: 'spec/fixtures/articles') }
 
     it 'has the right amount of articles' do
-      blog.articles.size.should == 3
+      blog.articles.size.should == 4
     end
 
     it 'has the right amount of monthly archives' do
-      blog.monthly_archive.size.should == 2
+      blog.monthly_archive.size.should == 3
+    end
+
+    it 'has the right amount of yearly archives' do
+      blog.annually_archive.size.should == 2
     end
 
     it 'finds article by its id' do

data/spec/fixtures/articles/2014_01_01_My_fourth_post.mk

@@ -0,0 +1 @@
+ 

data/spec/year_archive_spec.rb

@@ -0,0 +1,17 @@
+describe Rollin::YearArchive do
+  let (:article) { Rollin::Article.new('spec/fixtures/2013_05_01_My_first_post.mk') }
+  subject (:month_archive) { Rollin::MonthArchive.new(2013, 05, [ article ]) }
+  subject (:year_archive) { Rollin::YearArchive.new(2013, [ month_archive ]) }
+
+  it 'tells the year' do
+    year_archive.year.should == 2013
+  end
+
+  it 'has monthly archives' do
+    year_archive.monthly_archive.size.should == 1
+  end
+
+  it 'has a list of articles' do
+    year_archive.articles.first.should == article
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rollin
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - marano
@@ -100,14 +100,17 @@ files:
 - lib/rollin/blog.rb
 - lib/rollin/month_archive.rb
 - lib/rollin/version.rb
+- lib/rollin/year_archive.rb
 - rollin.gemspec
 - spec/article_spec.rb
 - spec/blog_spec.rb
 - spec/fixtures/articles/2013_05_01_My_first_post.mk
 - spec/fixtures/articles/2013_05_02_My_second_post.mk
 - spec/fixtures/articles/2013_06_01_My_third_post.mk
+- spec/fixtures/articles/2014_01_01_My_fourth_post.mk
 - spec/month_archive_spec.rb
 - spec/spec_helper.rb
+- spec/year_archive_spec.rb
 homepage: http://github.com/marano/rollin
 licenses:
 - MIT
@@ -138,5 +141,7 @@ test_files:
 - spec/fixtures/articles/2013_05_01_My_first_post.mk
 - spec/fixtures/articles/2013_05_02_My_second_post.mk
 - spec/fixtures/articles/2013_06_01_My_third_post.mk
+- spec/fixtures/articles/2014_01_01_My_fourth_post.mk
 - spec/month_archive_spec.rb
 - spec/spec_helper.rb
+- spec/year_archive_spec.rb