akki 0.0.4 → 0.0.5

data/features/archives.feature

@@ -19,11 +19,15 @@ Feature: Archives
     title: Article 1
     date:  2008/04/23
     """
-    And I have an archive template that shows the article title
+    And I have the page "archives.haml":
+    """
+    - articles.each do |article|
+      %p= article.title
+    """
     When I visit "/archives"
     Then I should see:
     """
-        <p>Article 1</p>
-        <p>Article 2</p>
-        <p>Article 3</p>
+    <p>Article 1</p>
+    <p>Article 2</p>
+    <p>Article 3</p>
     """

data/features/articles.feature

@@ -11,6 +11,10 @@ Feature: Article Page
 
     %p article content
     """
+    And the article view:
+    """
+    %div.article= article.render
+    """
     When I visit "/1983/05/23/simple-article"
     Then I should see:
     """

data/features/pages.feature

@@ -1,12 +1,19 @@
 Feature: Pages
   In order to display custom pages
-  As a user
+  As a blogger
   I want to display custom pages
 
-  Scenario: About page
-    Given I have the page "example-page"
+  Scenario: Page
+    Given I have the page "example-page.haml":
+    """
+    %p This is the example page
+    """
     When I visit "/example-page"
     Then I should see:
     """
     <p>This is the example page</p>
     """
+
+  Scenario: Page that doesn't exist
+    When I visit "/page-that-does-not-exist/"
+    Then I should see a 404 html status code

data/features/step_definitions/steps.rb

@@ -1,11 +1,16 @@
 Before do
   @articles_path = File.join(File.dirname(__FILE__), '..', '..', 'articles')
+  @views_path = File.join(File.dirname(__FILE__), '..', '..', 'views')
+  @pages_path = File.join(@views_path, 'pages')
   FileUtils.mkdir_p(@articles_path)
-  Akki::Application.set :views, "features/fixtures/views"
+  FileUtils.mkdir_p(@views_path)
+  FileUtils.mkdir_p(@pages_path)
+  Akki::Application.set :reload_templates, true
 end
 
 After do
-  FileUtils.rm_rf @articles_path if File.exist?(@articles_path)
+  FileUtils.rm_rf @articles_path
+  FileUtils.rm_rf @views_path
 end
 
 Given /^I have the article file "([^"]*)"$/ do |article_file, article_contents|
@@ -14,7 +19,18 @@ Given /^I have the article file "([^"]*)"$/ do |article_file, article_contents|
   end
 end
 
-Given /^I have the page "example-page"$/ do
+Given /^the article view:$/ do |contents|
+  File.open(File.join(@views_path, "article.haml"), 'w') do |file|
+    file.write(contents)
+  end
+end
+
+Given /^I have the page "([^"]*)":$/ do |page, contents|
+  File.open(File.join(@pages_path, page), 'w') do |file|
+    file.write(contents)
+  end
+  page_name = File.basename(page, File.extname(page))
+  Akki::Application.set :pages, [page_name.to_sym]
 end
 
 Given /^I visit "([^"]*)"$/ do |url|
@@ -25,5 +41,6 @@ Then /^I should see:$/ do |content|
   page.source.should include content
 end
 
-Given /^I have an archive template that shows the article title$/ do
+Then /^I should see a (\d+) html status code$/ do |status_code|
+  page.status_code.should == status_code.to_i
 end

data/lib/akki/application.rb

@@ -1,10 +1,15 @@
 require 'sinatra/base'
-require 'yaml'
-require 'ostruct'
 require 'akki/article'
 
 module Akki
   class Application < Sinatra::Base
+    set :root, File.join(File.dirname(__FILE__), '..', '..')
+
+    get '/:page_name/?' do
+      page_name = params[:page_name].to_sym
+      pass unless settings.pages.include? page_name
+      haml :"pages/#{page_name}", :locals => { :articles => Article.all }
+    end
 
     get "/:year/:month/:day/:slug/?" do
       year  = params[:year].to_i
@@ -14,9 +19,5 @@ module Akki
       article = Article::find(year, month, day, slug)
       haml :article, :locals => { :article => article }
     end
-
-    get "/:page/?" do
-      haml params[:page].to_sym, :locals => { :articles => Article.all }
-    end
   end
 end

data/lib/akki/version.rb

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

data/spec/application_spec.rb

@@ -12,11 +12,19 @@ module Akki
 
     before do
       @views_path = File.join(File.dirname(__FILE__), '..', 'views')
+      @public_path = File.join(File.dirname(__FILE__), '..', 'public')
+      @pages_path = File.join(@views_path, 'pages')
       FileUtils.mkdir_p @views_path
+      FileUtils.mkdir_p @public_path
+      FileUtils.mkdir_p @pages_path
+
+      @pages = mock :pages
+      @pages.stub!(:all).and_return []
     end
 
     after do
       FileUtils.rm_rf @views_path
+      FileUtils.rm_rf @public_path
     end
 
     def create_view name, contents
@@ -25,6 +33,18 @@ module Akki
       end
     end
 
+    def create_public name, contents
+      File.open(File.join(@public_path, name), 'w') do |file|
+        file.write(contents)
+      end
+    end
+
+    def create_page name, contents
+      File.open(File.join(@pages_path, name), 'w') do |file|
+        file.write(contents)
+      end
+    end
+
     describe "GET /23/10/2011/simple-article" do
       before do
         @article = mock :article
@@ -54,8 +74,9 @@ module Akki
 
     describe "GET /page_name" do
       it "renders a custom page" do
+        Application.set :pages, [:page_name]
         Article.stub!(:all).and_return []
-        create_view 'page_name.haml', 'this is my page!'
+        create_page 'page_name.haml', 'this is my page!'
         get '/page_name'
         last_response.body.should include 'this is my page!'
       end
@@ -67,11 +88,30 @@ module Akki
           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"
+
+        @pages.stub!(:all).and_return ["archives"]
+        Application.set :pages, [:archives]
+        create_page 'archives.haml', "- articles.each do |a|\n  %p= a.title"
+        Application.set :pages => [:archives]
         get '/archives'
         last_response.body.should include "article 1"
         last_response.body.should include "article 2"
       end
     end
+
+    describe "GET page-that-does-not-exist" do
+      it "404s" do
+        get '/page-that-does-not-exist'
+        last_response.should be_not_found
+      end
+    end
+
+    describe "GET file that exists in public folder" do
+      it "returns the file" do
+        create_public "main.css", "body { }"
+        get '/main.css'
+        last_response.body.should == "body { }"
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akki
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-17 00:00:00.000000000 +01:00
+date: 2011-08-20 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70144102831020 !ruby/object:Gem::Requirement
+  requirement: &70187564151800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144102831020
+  version_requirements: *70187564151800
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70144102830340 !ruby/object:Gem::Requirement
+  requirement: &70187564150840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144102830340
+  version_requirements: *70187564150840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70144102829540 !ruby/object:Gem::Requirement
+  requirement: &70187564149840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144102829540
+  version_requirements: *70187564149840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144102828720 !ruby/object:Gem::Requirement
+  requirement: &70187564148700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144102828720
+  version_requirements: *70187564148700
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70144102827700 !ruby/object:Gem::Requirement
+  requirement: &70187564147380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144102827700
+  version_requirements: *70187564147380
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70144102826640 !ruby/object:Gem::Requirement
+  requirement: &70187564146080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144102826640
+  version_requirements: *70187564146080
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -94,10 +94,6 @@ files:
 - 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
@@ -123,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3256136502332795362
+      hash: 4232723760955487062
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3256136502332795362
+      hash: 4232723760955487062
 requirements: []
 rubyforge_project: akki
 rubygems_version: 1.6.2
@@ -142,10 +138,6 @@ 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

data/features/fixtures/views/archives.haml

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

data/features/fixtures/views/article.haml

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

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

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

data/features/fixtures/views/layout.haml

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