RubyGems - akki - Versions diffs - 0.0.3 → 0.0.4 - Mend

akki 0.0.3 → 0.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

data/.gitignore +2 -0
data/.travis.yml +1 -0
data/Rakefile +10 -0
data/akki.gemspec +1 -0
data/features/archives.feature +29 -0
data/features/articles.feature +7 -27
data/features/fixtures/views/archives.haml +2 -0
data/features/fixtures/views/article.haml +1 -0
data/features/fixtures/views/example-page.haml +1 -0
data/features/fixtures/views/layout.haml +5 -0
data/features/pages.feature +12 -0
data/features/step_definitions/env.rb +3 -0
data/features/step_definitions/steps.rb +17 -19
data/lib/akki.rb +4 -0
data/lib/akki/application.rb +8 -13
data/lib/akki/article.rb +26 -10
data/lib/akki/version.rb +1 -1
data/spec/application_spec.rb +47 -13
data/spec/article_spec.rb +35 -28
metadata +42 -12

data/.gitignore CHANGED

@@ -4,3 +4,5 @@ Gemfile.lock
 pkg/*
 articles/*
 templates/*
+views/*
+*.swp

data/.travis.yml ADDED

	@@ -0,0 +1 @@
1	+ rvm: 1.9.2

data/Rakefile CHANGED

@@ -1 +1,11 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
+task :default => [:spec, :cucumber]
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.rspec_opts = ["--color"]
+end
+Cucumber::Rake::Task.new(:cucumber)

data/akki.gemspec CHANGED

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.add_dependency 'sinatra'
   s.add_dependency 'haml'
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'cucumber'
   s.add_development_dependency 'capybara'

data/features/archives.feature ADDED

@@ -0,0 +1,29 @@
+Feature: Archives
+  In order to list all current articles
+  As a developer
+  I need a list of all articles
+  Scenario: View articles sorted by date
+    Given I have the article file "1991-04-23-article.txt"
+    """
+    title: Article 3
+    date:  2008/04/23
+    """
+    And I have the article file "1993-04-23-article.txt"
+    """
+    title: Article 2
+    date:  2008/04/23
+    """
+    And I have the article file "2008-04-23-article.txt"
+    """
+    title: Article 1
+    date:  2008/04/23
+    """
+    And I have an archive template that shows the article title
+    When I visit "/archives"
+    Then I should see:
+    """
+        <p>Article 1</p>
+        <p>Article 2</p>
+        <p>Article 3</p>
+    """

data/features/articles.feature CHANGED

@@ -1,38 +1,18 @@
-Feature: Article
-  In order to display articles on
+Feature: Article Page
+  In order to display articles
   As a user
-  I want to be render blog pages
+  I want to be able to view an article
   Scenario: Simple Article
-    Given I have the article file "1983-10-23-simple-article.txt"
+    Given I have the article file "1983-05-23-simple-article.txt"
     """
     title: Simple Article
-    date:  23/10/1983
+    date:  1983/05/23
     %p article content
     """
-    And the layout template:
-    """
-    %html
-      %head
-        %title= article.title
-      %body
-        = yield
-    """
-    And the article template:
-    """
-    %div.article= article.render
-    """
-    When I visit "1983/10/23/simple-article"
+    When I visit "/1983/05/23/simple-article"
     Then I should see:
     """
-    <html>
-      <head>
-        <title>Simple Article</title>
-      </head>
-      <body>
-        <div class='article'><p>article content</p></div>
-      </body>
-    </html>
+    <div class='article'><p>article content</p></div>
     """

data/features/fixtures/views/archives.haml ADDED

	@@ -0,0 +1,2 @@
1	+ - articles.each do \|article\|
2	+ %p= article.title

data/features/fixtures/views/article.haml ADDED

	@@ -0,0 +1 @@
1	+ %div.article= article.render

data/features/fixtures/views/example-page.haml ADDED

	@@ -0,0 +1 @@
1	+ %p This is the example page

data/features/fixtures/views/layout.haml ADDED

@@ -0,0 +1,5 @@
+%html
+  %head
+    %title= article.title if defined? article
+  %body
+    = yield

data/features/pages.feature ADDED

@@ -0,0 +1,12 @@
+Feature: Pages
+  In order to display custom pages
+  As a user
+  I want to display custom pages
+  Scenario: About page
+    Given I have the page "example-page"
+    When I visit "/example-page"
+    Then I should see:
+    """
+    <p>This is the example page</p>
+    """

data/features/step_definitions/env.rb CHANGED

@@ -1,7 +1,10 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+ENV['RACK_ENV'] = 'test'
 require 'capybara/cucumber'
 require 'akki'
+require 'fileutils'
 Capybara.app = Akki::Application
 Akki::Application.set :environment, :test

data/features/step_definitions/steps.rb CHANGED

@@ -1,31 +1,29 @@
-Given /^I have the article file "([^"]*)"$/ do |article_file, article_contents|
-  articles_path = File.join(File.dirname(__FILE__), '..', '..', 'articles')
-  FileUtils.mkdir_p(articles_path)
-  File.open(File.join(articles_path, article_file), 'w') do |file|
-    file.write(article_contents)
-  end
+Before do
+  @articles_path = File.join(File.dirname(__FILE__), '..', '..', 'articles')
+  FileUtils.mkdir_p(@articles_path)
+  Akki::Application.set :views, "features/fixtures/views"
 end
-Given /^the layout template:$/ do |contents|
-  templates_path = File.join(File.dirname(__FILE__), '..', '..', 'templates')
-  FileUtils.mkdir_p(templates_path)
-  File.open(File.join(templates_path, 'layout.haml'), 'w') do |file|
-    file.write(contents)
-  end
+After do
+  FileUtils.rm_rf @articles_path if File.exist?(@articles_path)
 end
-Given /^the article template:$/ do |contents|
-  templates_path = File.join(File.dirname(__FILE__), '..', '..', 'templates')
-  FileUtils.mkdir_p(templates_path)
-  File.open(File.join(templates_path, 'article.haml'), 'w') do |file|
-    file.write(contents)
+Given /^I have the article file "([^"]*)"$/ do |article_file, article_contents|
+  File.open(File.join(@articles_path, article_file), 'w') do |file|
+    file.write(article_contents)
   end
 end
+Given /^I have the page "example-page"$/ do
+end
 Given /^I visit "([^"]*)"$/ do |url|
-  visit "/#{url}"
+  visit url
 end
 Then /^I should see:$/ do |content|
-  page.source.should == content
+  page.source.should include content
+end
+Given /^I have an archive template that shows the article title$/ do
 end

data/lib/akki.rb CHANGED

@@ -1,3 +1,7 @@
 $:.unshift(File.dirname(__FILE__))
+require "rubygems"
+require "bundler/setup"
 require "akki/version"
 require "akki/application"

data/lib/akki/application.rb CHANGED

@@ -5,23 +5,18 @@ require 'akki/article'
 module Akki
   class Application < Sinatra::Base
     get "/:year/:month/:day/:slug/?" do
-      year  = params[:year]
-      month = params[:month]
-      day   = params[:day]
+      year  = params[:year].to_i
+      month = params[:month].to_i
+      day   = params[:day].to_i
       slug  = params[:slug]
-      render(Article::from_file(year, month, day, slug))
+      article = Article::find(year, month, day, slug)
+      haml :article, :locals => { :article => article }
     end
-    def render article
-      scope = OpenStruct.new
-      scope.article = article
-      layout = File.read('templates/layout.haml')
-      article_layout = File.read('templates/article.haml')
-      Haml::Engine.new(layout).render(scope) do
-        Haml::Engine.new(article_layout).render(binding)
-      end
+    get "/:page/?" do
+      haml params[:page].to_sym, :locals => { :articles => Article.all }
     end
   end
 end

data/lib/akki/article.rb CHANGED

@@ -2,22 +2,38 @@ require 'haml'
 module Akki
   class Article
-    attr_accessor :title, :date, :content
+    attr_accessor :title, :slug, :date, :content
-    def initialize(title, date, content)
+    def initialize(title, date, content, slug)
       @title   = title
       @date    = date
       @content = content
+      @slug = slug
     end
-    def self.from_file year, month, day, slug
-      path = "articles/#{year}-#{month}-#{day}-#{slug}.txt"
-      parts = File.read(path).split("\n\n", 2)
-      yaml = YAML.parse(parts[0])
-      content = parts[1]
-      title = yaml['title'].value
-      date  = Date.strptime(yaml['date'].value, '%Y/%m/%d')
-      Article.new(title, date, content)
+    def self.find year, month, day, slug
+      article = all.select { |article|
+        article.date.year  == year &&
+        article.date.month == month &&
+        article.date.day   == day &&
+        article.slug  == slug
+      }.first
+    end
+    def self.all
+      articles = Dir.glob("articles/*").map do |path|
+        parts = File.read(path).split("\n\n", 2)
+        yaml = YAML.load(parts[0])
+        content = parts[1]
+        title = yaml['title']
+        date  = Date.strptime(yaml['date'], '%Y/%m/%d')
+        slug = File.basename(path).split("-", 4).last.gsub(".txt", "")
+        Article.new(title, date, content, slug)
+      end
+      articles = articles.sort do |a, b|
+        a.date <=> b.date
+      end.reverse
     end
     def render

data/lib/akki/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Akki
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/application_spec.rb CHANGED

@@ -1,5 +1,7 @@
 require 'spec_helper'
+Akki::Application.set :reload_templates, true
 module Akki
   describe Application do
     include Rack::Test::Methods
@@ -8,35 +10,67 @@ module Akki
       Application
     end
+    before do
+      @views_path = File.join(File.dirname(__FILE__), '..', 'views')
+      FileUtils.mkdir_p @views_path
+    end
+    after do
+      FileUtils.rm_rf @views_path
+    end
+    def create_view name, contents
+      File.open(File.join(@views_path, name), 'w') do |file|
+        file.write(contents)
+      end
+    end
     describe "GET /23/10/2011/simple-article" do
       before do
         @article = mock :article
         @article.stub!(:render).and_return 'article content'
         @article.stub!(:title).and_return 'article title'
-        File.stub!(:read).with('templates/layout.haml').and_return '%div= yield'
-        File.stub!(:read).with('templates/article.haml').and_return '%p= article.render'
-        Article.stub!(:from_file).and_return @article
+        Article.stub!(:find).and_return @article
       end
-      it "is successful" do
+      it "loads an article" do
+        create_view "article.haml", ""
+        Article.should_receive(:find).with(2011, 10, 23, "simple-article")
         get '/2011/10/23/simple-article'
-        last_response.should be_ok
       end
-      it "loads an article" do
-        Article.should_receive(:from_file).with("2011", "10", "23", 'simple-article')
+      it "passes the article through to the view" do
+        create_view "article.haml", "= article.render"
         get '/2011/10/23/simple-article'
+        last_response.body.should include "article content"
       end
-      it "renders the article inside an article template" do
+      it "renders the article" do
+        create_view 'article.haml', '= article.render'
         get '/2011/10/23/simple-article'
-        last_response.body.should include '<div><p>article content</p></div>'
+        last_response.body.should include "article content"
       end
+    end
-      it "passes the article through through to the layout when rendering" do
-        File.stub!(:read).with('templates/layout.haml').and_return '= article.title'
-        get '/2011/10/23/simple-article'
-        last_response.body.should include 'article title'
+    describe "GET /page_name" do
+      it "renders a custom page" do
+        Article.stub!(:all).and_return []
+        create_view 'page_name.haml', 'this is my page!'
+        get '/page_name'
+        last_response.body.should include 'this is my page!'
+      end
+    end
+    describe "GET a page that lists articles" do
+      it "lists all articles" do
+        Article.stub!(:all).and_return([
+          Article.new("article 1", nil, "article 1 content", "article1"),
+          Article.new("article 2", nil, "article 2 content", "article2")
+        ])
+        create_view 'archives.haml', "- articles.each do |a|\n  %p= a.title"
+        get '/archives'
+        last_response.body.should include "article 1"
+        last_response.body.should include "article 2"
       end
     end
   end

data/spec/article_spec.rb CHANGED

@@ -3,43 +3,50 @@ require 'akki/article'
 module Akki
   describe Article do
-    before do
-      File.stub!(:read).and_return <<-ARTICLE
-      title: the article title
-      date: 1983/10/23
-      article content
-      ARTICLE
+    it "renders the content" do
+      article = Article.new("an article", Date.new(2011, 10, 10), "%p article content", "an-article")
+      article.render.should include '<p>article content</p>'
     end
-    it "reads article content from a file" do
-      File.should_receive(:read).with('articles/2011-10-23-article-slug.txt')
-      Article.from_file(2011, 10, 23, 'article-slug')
+    def article_should_match article, title, date, content, slug
+      article.title.should    == title
+      article.date.should     == date
+      article.content.should  == content
+      article.slug.should     == slug
     end
-    it "loads the title" do
-      article = Article.from_file(2011, 10, 23, 'article-slug')
-      article.title.should == 'the article title'
-    end
+    it "loads all articles" do
+      articles = [
+        "articles/2012-10-23-article1.txt",
+        "articles/2011-11-25-article2.txt"
+      ]
+      Dir.stub!(:glob).with("articles/*").and_return(articles)
+      File.stub!(:read).with(articles.first).and_return("title: article 1\ndate: 2012/10/23\n\narticle 1 content")
+      File.stub!(:read).with(articles.last).and_return("title: article 2\ndate: 2011/11/25\n\narticle 2 content")
-    it "loads the date" do
-      article = Article.from_file(2011, 10, 23, 'article-slug')
-      article.date.year.should  == 1983
-      article.date.month.should == 10
-      article.date.day.should   == 23
+      article_should_match(Article.all.first, "article 1", Date.new(2012, 10, 23), "article 1 content", "article1")
+      article_should_match(Article.all.last, "article 2", Date.new(2011, 11, 25), "article 2 content", "article2")
     end
-    it "loads the article content" do
-      article = Article.from_file(2011, 10, 23, 'article-slug')
-      article.content.should include 'article content'
+    it "sorts articles by date" do
+      articles = [
+        "articles/2009-10-23-article1.txt",
+        "articles/2011-11-25-article2.txt"
+      ]
+      Dir.stub!(:glob).with("articles/*").and_return(articles)
+      File.stub!(:read).with(articles.first).and_return("title: article 1\ndate: 2009/10/23\n\narticle 1 content")
+      File.stub!(:read).with(articles.last).and_return("title: article 2\ndate: 2011/11/25\n\narticle 2 content")
+      Article.all.first.title.should == "article 2"
+      Article.all.last.title.should == "article 1"
     end
-    it "renders the content" do
-      engine = mock :engine
-      engine.stub!(:render).and_return 'rendered content'
-      Haml::Engine.stub!(:new).and_return(engine)
-      article = Article.from_file(2011, 10, 23, 'article-slug')
-      article.render.should == 'rendered content'
+    it "finds an article" do
+      articles = [
+        Article.new("an article", Date.new(2011, 10, 10), "article 1 content", "an-article"),
+        Article.new("Some Article", Date.new(2033, 4, 3), "article 2 content", "some-article")
+      ]
+      Article.stub!(:all).and_return(articles)
+      Article.find(2033, 4, 3, "some-article").should == articles.last
     end
   end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akki
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease:
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000 +01:00
+date: 2011-08-17 00:00:00.000000000 +01:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70103560445100 !ruby/object:Gem::Requirement
+  requirement: &70144102831020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70103560445100
+  version_requirements: *70144102831020
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70103560444680 !ruby/object:Gem::Requirement
+  requirement: &70144102830340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70103560444680
+  version_requirements: *70144102830340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70144102829540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70144102829540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70103560444260 !ruby/object:Gem::Requirement
+  requirement: &70144102828720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103560444260
+  version_requirements: *70144102828720
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70103560443840 !ruby/object:Gem::Requirement
+  requirement: &70144102827700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103560443840
+  version_requirements: *70144102827700
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70103560443420 !ruby/object:Gem::Requirement
+  requirement: &70144102826640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70103560443420
+  version_requirements: *70144102826640
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -76,11 +87,18 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Rakefile
 - akki.gemspec
 - config.ru
+- features/archives.feature
 - features/articles.feature
+- features/fixtures/views/archives.haml
+- features/fixtures/views/article.haml
+- features/fixtures/views/example-page.haml
+- features/fixtures/views/layout.haml
+- features/pages.feature
 - features/step_definitions/env.rb
 - features/step_definitions/steps.rb
 - lib/akki.rb
@@ -103,12 +121,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3256136502332795362
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3256136502332795362
 requirements: []
 rubyforge_project: akki
 rubygems_version: 1.6.2
@@ -116,7 +140,13 @@ signing_key:
 specification_version: 3
 summary: ''
 test_files:
+- features/archives.feature
 - features/articles.feature
+- features/fixtures/views/archives.haml
+- features/fixtures/views/article.haml
+- features/fixtures/views/example-page.haml
+- features/fixtures/views/layout.haml
+- features/pages.feature
 - features/step_definitions/env.rb
 - features/step_definitions/steps.rb
 - spec/application_spec.rb