orthorings 0.3.1 → 0.4.0

data/lib/sinatra/orthor.rb

@@ -8,24 +8,24 @@ module Sinatra
       @name = resource.name
       @meta_keywords = resource.keywords
       @meta_description = resource.description
-      @orthor_feeds = resource.respond_to?(:feeds) ? resource.feeds : [] 
+      @orthor_feeds = resource.respond_to?(:feeds) ? resource.feeds : []
     end
   end
-  
+
   module Orthor
     def self.registered(app)
       app.helpers ::OrthorHelper
       app.helpers Sinatra::OrthorRequestHelpers
-      
+
       ::Orthor::Site.resources.each do |resource|
         if resource.is_a?(::Orthor::Category) && !resource.page_path.nil?
           get resource.page_path do |id|
-            @orthor_content = orthor_content(id)
+            @orthor_content = orthor_content(id, (resource.page_template || resource.template))
             handle_request(resource)
             erb (resource.view || "orthor_content").to_sym, { :layout => ::Orthor::Site.layout }
           end
         end
-        
+
         get resource.path do
           if resource.is_a?(::Orthor::Feed)
             headers['Cache-Control'] = "public, max-age=#{resource.cache_for}"
@@ -41,7 +41,7 @@ module Sinatra
         end
       end
     end
-  end  
+  end
   register Orthor
 end
 

data/orthorings.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{orthorings}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anthony Langhorne"]
-  s.date = %q{2010-04-25}
+  s.date = %q{2010-06-06}
   s.email = %q{anthony@orthor.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -35,16 +35,18 @@ Gem::Specification.new do |s|
      "lib/orthor/query.rb",
      "lib/orthor/site.rb",
      "lib/orthor/static_page.rb",
+     "lib/orthor/templates.rb",
      "lib/orthor_helper.rb",
      "lib/orthorings.rb",
      "lib/sinatra/orthor.rb",
      "orthorings.gemspec",
      "spec/orthor/dsl_spec.rb",
+     "spec/orthor/templates_spec.rb",
      "spec/orthor_helper_spec.rb",
      "spec/orthorings_spec.rb",
-     "spec/resources/homepage.html",
-     "spec/resources/latest-news-items.html",
-     "spec/resources/news.html",
+     "spec/resources/homepage.json",
+     "spec/resources/latest-news-items.json",
+     "spec/resources/news.json",
      "spec/sinatra/orthor_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -52,10 +54,11 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/anthony/orthorings}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Orthorings is a gem for displaying content from orthor.com}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{A gem for displaying content from orthor.com}
   s.test_files = [
     "spec/orthor/dsl_spec.rb",
+     "spec/orthor/templates_spec.rb",
      "spec/orthor_helper_spec.rb",
      "spec/orthorings_spec.rb",
      "spec/sinatra/orthor_spec.rb",
@@ -68,10 +71,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<moneta>, ["= 0.6.0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
       s.add_dependency(%q<moneta>, ["= 0.6.0"])
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
     s.add_dependency(%q<moneta>, ["= 0.6.0"])
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end
+

data/spec/orthor/dsl_spec.rb

@@ -8,63 +8,54 @@ describe Orthor::Site, "orthor site dsl" do
         layout :application
       end
     end
-    
+
     it 'should allow a http cache time to be set' do
       Orthor::Site.cache_for.should == 7200
     end
-    
+
     it 'should allow setting of a layout' do
       Orthor::Site.layout.should == :application
     end
-    
+
     [ :categories, :feeds, :pages, :static_pages, :queries ].each do |collection|
       it "should have a #{collection} array" do
         Orthor::Site.send(collection).should == []
       end
     end
   end
-  
+
   describe "default values" do
     before(:all) do
       Orthor::Site.define do
       end
     end
-    
+
     it 'should set a default cache for time' do
       Orthor::Site.cache_for.should == 0
     end
-    
+
     it 'should set a default layout' do
       Orthor::Site.layout.should == :orthor_layout
     end
   end
-  
+
   describe "children" do
     before(:all) do
       Orthor::Site.define do
-        page "/", "Home"
+        page "/", :id => "home"
 
-        query "/news" do
-          id "latest-news"
-        end
-        
-        category "/writings" do
-          page "/writings/why", "Why we write"
+        query "/news", :id => "latest-news"
 
-          feed "/writings.rss" do
-            id "our-writings"
-            name "Our Writings"
-          end
-        
-          query "/latest" do
-            id "latest-article"
-          end
+        category "/writings" do
+          page "/writings/why"
+          feed "/writings.rss", :id => "our-writings"
+          query "/latest", :id => "latest-article"
 
           category "/writings/announcements" do
-            page "/3rd-level", "3rd level"
+            page "/3rd-level"
           end
         end
-      end  
+      end
       @category_1 = Orthor::Site.categories.first
       @category_2 = @category_1.categories.first
       @feed = @category_1.feeds.first
@@ -74,163 +65,146 @@ describe Orthor::Site, "orthor site dsl" do
       @query = Orthor::Site.queries.first
       @query_1 = @category_1.queries.first
     end
-    
+
     it 'should return all resources defined in the dsl' do
       Orthor::Site.resources.length.should == 8
-      
+
       Orthor::Site.resources.should include(@category_1)
       Orthor::Site.resources.should include(@category_2)
       Orthor::Site.resources.should include(@feed)
       Orthor::Site.resources.should include(@page_1)
       Orthor::Site.resources.should include(@page_2)
-      Orthor::Site.resources.should include(@page_3)  
+      Orthor::Site.resources.should include(@page_3)
       Orthor::Site.resources.should include(@query)
       Orthor::Site.resources.should include(@query_1)
     end
   end
-  
+
   describe "categories" do
     before(:all) do
       Orthor::Site.define do
-        category "/writings" do
-          page_path "/writings/:id"
-          name "Writings"
-          id "blog-writings"
-          cache_for 900
-          view "writings/index"
-
-          page "/writings/why" do
-            name "Why we write"
-          end
+        category "/writings", :id => "blog-writings",
+                              :template => :writing,
+                              :cache_for => 900,
+                              :view => "writings/index",
+                              :page_path => "/writings/:id" do
+          page "/writings/why"
+          feed "/writings.rss", :id => "our-writings", :name => "Our Writings"
 
-          feed "/writings.rss" do
-            id "our-writings"
-            name "Our Writings"
-          end
-
-          category "/writings/announcements" do
-            page_path "/writings/announcements/:id"
-            name "Announcements"
-            cache_for 300
-            
-            page "/3rd-level" do
-              name "3rd level"
-            end
+          category "/writings/announcements", :page_path => "/writings/announcements/:id",
+                                              :cache_for => 300,
+                                              :template => :announcement do
+            page "/3rd-level"
           end
         end
       end
       @category = Orthor::Site.categories.first
       @category_2 = Orthor::Site.categories.first.categories.first
     end
-  
+
     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 allow setting of a template" do
+      @category.template.should == :writing
+      @category_2.template.should == :announcement
+    end
+
     it "should support categories in categories" do
       @category.categories.length.should == 1
-      @category_2.name.should == "Announcements"
     end
-    
+
     it "should support pages in categories" do
       @category.pages.length.should == 1
-      @category.pages.first.name.should == "Why we write"
     end
-    
+
     it "id should be inferred from the path if none is given" do
       @category_2.id.should == "announcements"
     end
-    
+
     it "should support pages in categories in categories" do
       @category_2.pages.length.should == 1
-      @category_2.pages.first.name.should == "3rd level"
     end
-    
+
     it "should support a child page path attribute" do
       @category.page_path.should == "/writings/:id"
     end
-    
+
     it "should support setting the orthor id" do
       @category.id.should == "blog-writings"
     end
-    
+
     it "should support specifying http cache time" do
       @category.cache_for.should == 900
       @category_2.cache_for.should == 300
     end
-    
+
     it "should support feeds specific to categories" do
       @category.feeds.length.should == 1
-      @category.feeds.first.name.should == "Our Writings"
     end
   end
-  
+
   describe "pages" do
     before(:all) do
       Orthor::Site.define do
-        page "/about-us", "about" do
-          name "About us"
-        end
+        page "/about-us", :id => "about"
+        page "/history", :id => "our-history", :template => :basic
         page "/contact"
-        page "/" do
-          name "Home"
-          cache_for 3600
-          id "homepage"
-          view "public/home"
-        end
+        page "/", :cache_for => 3600, :id => "homepage",
+                  :view => "public/home", :template => :brief
       end
       @page_1 = Orthor::Site.pages[0]
       @page_2 = Orthor::Site.pages[1]
       @page_3 = Orthor::Site.pages[2]
+      @page_4 = Orthor::Site.pages[3]
     end
-      
+
     it 'should support multiple pages' do
-      Orthor::Site.pages.length.should == 3
+      Orthor::Site.pages.length.should == 4
     end
-    
-    it 'should support specifying pages with or without a block' do
-      @page_1.name.should == "About us"
+
+    it 'should support storing a page path' do
       @page_1.path.should == "/about-us"
-      
-      @page_3.name.should == "Home"
-      @page_3.path.should == "/"
+      @page_4.path.should == "/"
     end
-    
+
+    it "should allow setting of template" do
+      @page_2.template.should == :basic
+      @page_4.template.should == :brief
+    end
+
     it "should be able to specify a view to render" do
-      @page_3.view.should == "public/home"
+      @page_4.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_2.id.should == "contact"
+      @page_3.id.should == "contact"
     end
 
     it "id should be 2nd argument if any is given" do
       @page_1.id.should == "about"
     end
-    
+
     it 'should allow setting specific http cache lengths' do
       @page_1.cache_for.should == 0 # sites default
-      @page_3.cache_for.should == 3600
+      @page_4.cache_for.should == 3600
     end
-    
+
     it 'should support setting an id' do
-      @page_3.id.should == "homepage"
+      @page_4.id.should == "homepage"
     end
   end
 
   describe "queries" do
     before(:all) do
       Orthor::Site.define do
-        query "/news" do
-          id "news"
-        end
-
+        query "/news", :id => "news", :template => :query
         query "/latest-release"
       end
       @query_1 = Orthor::Site.queries.first
@@ -241,6 +215,10 @@ describe Orthor::Site, "orthor site dsl" do
       Orthor::Site.queries.length.should == 2
     end
 
+    it "should support setting a template" do
+      @query_1.template.should == :query
+    end
+
     it "should support setting a query id" do
       @query_1.id.should == "news"
     end
@@ -249,64 +227,86 @@ describe Orthor::Site, "orthor site dsl" do
       @query_2.id.should == "latest-release"
     end
   end
-  
-  describe "feeds" do
+
+  describe "with layout" do
     before(:all) do
       Orthor::Site.define do
-        feed "/blog.rss" do
-          id "orthor-blog"
-          name "Our blag"
+        with_template :spike do
+          page "/"
+          category "/news" do
+            template :spike_v2
+          end
         end
-        
-        feed "/bookmarks.rss" do
-          name "Our bookmarks"
+
+        with_template :jet do
+          query "/latest-news"
+          page "/about"
         end
       end
-      
+      @page_1 = Orthor::Site.pages[0]
+      @page_2 = Orthor::Site.pages[1]
+      @query = Orthor::Site.queries[0]
+      @category = Orthor::Site.categories[0]
+    end
+
+    it "should respect with_template" do
+      @page_1.template.should == :spike
+      @page_2.template.should == :jet
+      @query.template.should == :jet
+    end
+
+    it "should allow with_template to be overriden" do
+      @category.template.should == :spike_v2
+    end
+  end
+
+  describe "feeds" do
+    before(:all) do
+      Orthor::Site.define do
+        feed "/blog.rss", :id => "orthor-blog",
+                           :name => "Our blag"
+        feed "/bookmarks.rss", :name => "Our bookmarks"
+      end
+
       @feed_1 = Orthor::Site.feeds.first
       @feed_2 = Orthor::Site.feeds.last
     end
-    
+
     it "should support multiple feeds" do
       Orthor::Site.feeds.length.should == 2
     end
-    
+
     it "should support setting a feeds id" do
       @feed_1.id.should == "orthor-blog"
     end
-    
+
     it "id should be inferred from the path if none is given" do
       @feed_2.id.should == "bookmarks.rss"
     end
-    
+
     it 'should support setting a feeds name' do
       @feed_1.name.should == "Our blag"
       @feed_2.name.should == "Our bookmarks"
     end
-    
+
     it 'should store the given path' do
       @feed_1.path.should == "/blog.rss"
       @feed_2.path.should == "/bookmarks.rss"
     end
   end
-  
+
   describe 'static pages' do
     before(:all) do
       Orthor::Site.define do
-        static_page "/about-us", "About us"
-        static_page "/contact", "Contact Us"
-        static_page "/" do
-          name "Home"
-          cache_for 3600
-          view :blah
-          controller :asdf
-        end
+        static_page "/about-us"
+        static_page "/contact"
+        static_page "/", :cache_for => 3600, :view => :blah, :controller => :asdf
       end
       @page_1 = Orthor::Site.static_pages[0]
       @page_2 = Orthor::Site.static_pages[1]
       @page_3 = Orthor::Site.static_pages[2]
     end
-      
+
     it 'should support multiple pages' do
       Orthor::Site.static_pages.length.should == 3
     end
@@ -318,37 +318,29 @@ describe Orthor::Site, "orthor site dsl" do
     it 'should support setting controller' do
       @page_3.controller.should == :asdf
     end
-    
-    it 'should support specifying pages with or without a block' do
-      @page_1.name.should == "About us"
+
+    it 'should support storing page path' do
       @page_1.path.should == "/about-us"
-      
-      @page_3.name.should == "Home"
       @page_3.path.should == "/"
     end
-    
+
     it 'should allow setting specific http cache lengths' do
       @page_3.cache_for.should == 3600
     end
   end
-  
+
   describe 'finding by path' do
     before(:all) do
       Orthor::Site.define do
-        page "/", "Home"
-        
-        category "/writings" do
-          page_path "/writings/:id"
-          page "/writings/why", "Why we write"
+        page "/"
 
-          feed "/writings.rss" do
-            id "our-writings"
-            name "Our Writings"
-          end
+        category "/writings", :page_path => "/writings/:id" do
+          page "/writings/why"
+          feed "/writings.rss", :id => "our-writings",
+                                :name => "Our Writings"
 
-          category "/writings/announcements" do
-            page_path "/writings/announcements/:id"
-            page "/3rd-level", "3rd level"
+          category "/writings/announcements", :page_path => "/writings/announcements/:id" do
+            page "/3rd-level"
           end
         end
       end
@@ -358,66 +350,60 @@ describe Orthor::Site, "orthor site dsl" do
       @announcements = @writings.categories.first
       @third_level = @announcements.pages.first
     end
-    
+
     it 'should be able to find pages by path' do
       Orthor::Site.find_resource_by_path("/").should == @home
       Orthor::Site.find_resource_by_path("/3rd-level").should == @third_level
     end
-    
+
     it 'should be able to find feeds by path' do
       Orthor::Site.find_resource_by_path("/writings.rss").should == @feed
     end
-    
+
     it 'should be able to find categories by path' do
       Orthor::Site.find_resource_by_path("/writings").should == @writings
       Orthor::Site.find_resource_by_path("/writings/announcements").should == @announcements
     end
-    
+
     it 'should find the parent category by page path' do
       Orthor::Site.find_resource_by_page_path("/writings/announcements/first-entry", "first-entry").should == @announcements
       Orthor::Site.find_resource_by_page_path("/writings/first-writing", "first-writing").should == @writings
     end
   end
-  
+
   describe 'meta data' do
     before(:all) do
       Orthor::Site.define do
         keywords "asdf, bob, frank"
         description "a site being defined"
-        
-        page "/features", "Features" do
-          keywords "features"
-          description "feature page description"
-        end
-        
-        category "/news", "News" do
-          keywords "category"
-          description "category description"
-        end
-        
+
+        page "/features", :keywords => "features",
+                          :description => "feature page description"
+        category "/news", :keywords => "category",
+                          :description => "category description"
         page "/ihavenothing"
       end
-      
+
       @page_with_meta = Orthor::Site.pages.first
       @category = Orthor::Site.categories.first
       @page_no_meta = Orthor::Site.pages.last
     end
-    
+
     it 'should allow setting of meta data at a site level' do
       Orthor::Site.keywords.should == "asdf, bob, frank"
       Orthor::Site.description.should == "a site being defined"
     end
-    
+
     it 'should allow setting of meta data at a page level' do
       @page_with_meta.keywords.should == "features"
       @page_with_meta.description.should == "feature page description"
     end
-    
+
     it 'should allow setting of meta data at a category level' do
       @category.keywords.should == "category"
       @category.description.should == "category description"
     end
-    
+
     it 'should default to sites meta data if none given' do
       @page_no_meta.keywords.should == "asdf, bob, frank"
       @page_no_meta.description.should == "a site being defined"