orthorings 0.1.4 → 0.1.5

data/README.markdown

@@ -42,10 +42,15 @@ Here is some example usage (more docs to come, this is still a WIP and some aspe
       feed "/blog.rss", "Blog" do
         id "our-blog"
       end
+      
+      static_page "/about-us", "About Us" do
+        view "public/about_us"
+      end
   
       category "/writings" do
         keywords "lets, do, some, seo"
         description "a more apt description for this section of the site"
+        view "writings/index"
         
         page "/writings/why", "Why we write"
         page_path "/writings/:id" 
@@ -56,6 +61,7 @@ Here is some example usage (more docs to come, this is still a WIP and some aspe
         end
 
         category "/writings/announcements" do
+          view "writings/announcements"
           page_path "/writings/announcements/:id"
         end
       end

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/app/controllers/orthor_content_controller.rb

@@ -18,7 +18,7 @@ class OrthorContentController < ApplicationController
       @meta_description = resource.description
       @orthor_feeds = resource.respond_to?(:feeds) ? resource.feeds : []
       
-      render :action => "orthor_content", :layout => Orthor::Site.layout.to_s
+      render :action => (resource.view || "orthor_content"), :layout => Orthor::Site.layout.to_s
     end
   end
 end

data/config/routes.rb

@@ -4,7 +4,7 @@ ActionController::Routing::Routes.draw do |map|
       map.send("#{resource.path_name}_pages", resource.page_path, :controller => "orthor_content", :action => "orthor_content")
     end
     if resource.is_a?(::Orthor::StaticPage)
-      map.send(resource.path_name, resource.path, :controller => resource.controller.to_s, :action => resource.action.to_s)
+      map.send(resource.path_name, resource.path, :controller => resource.controller.to_s, :action => "orthor_content")
     else
       map.send(resource.path_name, resource.path, :controller => "orthor_content", :action => "orthor_content")
     end

data/lib/orthor/object.rb

@@ -4,7 +4,7 @@ module Orthor
     include Orthor::MetaData
 
     attr_accessor :path
-    dsl_accessor :name, :id
+    dsl_accessor :name, :id, :view
 
     def initialize(path, object_name = nil, &block)
       @path = path

data/lib/orthor/static_page.rb

@@ -4,7 +4,7 @@ module Orthor
     include Orthor::MetaData
 
     attr_accessor :path
-    dsl_accessor :name, :action, :controller
+    dsl_accessor :name, :view, :controller
 
     def initialize(path, page_name, &block)
       @path = path

data/lib/sinatra/orthor.rb

@@ -22,7 +22,7 @@ module Sinatra
           get resource.page_path do |id|
             @orthor_content = orthor_content(id)
             handle_request(resource)
-            erb :orthor_content, { :layout => ::Orthor::Site.layout }
+            erb (resource.view || "orthor_content").to_sym, { :layout => ::Orthor::Site.layout }
           end
         end
         
@@ -32,11 +32,11 @@ module Sinatra
             resource.content
           elsif resource.is_a?(::Orthor::StaticPage)
             handle_request(resource)
-            erb resource.action.to_sym, { :layout => ::Orthor::Site.layout }
+            erb resource.view.to_sym, { :layout => ::Orthor::Site.layout }
           else
             @orthor_content = resource.content
             handle_request(resource)
-            erb :orthor_content, { :layout => ::Orthor::Site.layout }
+            erb (resource.view || "orthor_content").to_sym, { :layout => ::Orthor::Site.layout }
           end
         end
       end

data/orthorings.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{orthorings}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Langhorne"]
-  s.date = %q{2010-01-31}
+  s.date = %q{2010-02-02}
   s.email = %q{anthony@orthor.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/spec/orthor/dsl_spec.rb

@@ -85,6 +85,7 @@ describe Orthor::Site, "orthor site dsl" do
           name "Writings"
           id "blog-writings"
           cache_for 900
+          view "writings/index"
 
           page "/writings/why" do
             name "Why we write"
@@ -110,11 +111,15 @@ describe Orthor::Site, "orthor site dsl" do
       @category_2 = Orthor::Site.categories.first.categories.first
     end
   
-    it "should have one categories" do
+    it "should have one category at the top level" do
       Orthor::Site.categories.length.should == 1
       @category.name.should == "Writings"
     end
     
+    it "should allow you to set a custom view file" do
+      @category.view.should == "writings/index"
+    end
+    
     it "should support categories in categories" do
       @category.categories.length.should == 1
       @category_2.name.should == "Announcements"
@@ -162,6 +167,7 @@ describe Orthor::Site, "orthor site dsl" do
           name "Home"
           cache_for 3600
           id "homepage"
+          view "public/home"
         end
       end
       @page_1 = Orthor::Site.pages[0]
@@ -181,6 +187,11 @@ describe Orthor::Site, "orthor site dsl" do
       @page_3.path.should == "/"
     end
     
+    it "should be able to specify a view to render" do
+      @page_3.view.should == "public/home"
+      @page_1.view.should be_nil
+    end
+    
     it "id should be inferred from the path if none is given" do
       @page_1.id.should == "about-us"
       @page_2.id.should == "contact"
@@ -244,7 +255,7 @@ describe Orthor::Site, "orthor site dsl" do
         static_page "/" do
           name "Home"
           cache_for 3600
-          action :blah
+          view :blah
           controller :asdf
         end
       end
@@ -258,7 +269,7 @@ describe Orthor::Site, "orthor site dsl" do
     end
 
     it 'should support setting action' do
-      @page_3.action.should == :blah
+      @page_3.view.should == :blah
     end
 
     it 'should support setting controller' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orthorings
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Anthony Langhorne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-31 00:00:00 +11:00
+date: 2010-02-02 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency