orthorings 0.3.1 → 0.4.0

data/spec/orthor/templates_spec.rb

@@ -0,0 +1,63 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Orthor::Templates do
+  before(:all) do
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/content_items/homepage.json",
+                         :body => File.join(SPEC_DIR, 'resources', 'homepage.json'))
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/queries/latest-news-items.json",
+                         :body => File.join(SPEC_DIR, 'resources', 'latest-news-items.json'))
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/categories/news.json",
+                         :body => File.join(SPEC_DIR, 'resources', 'news.json'))
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/content_items/missing.json",
+                         :body => "")
+
+    Orthorings.setup do
+      account_id "orthor"
+    end
+  end
+
+  describe "with no content returned" do
+    it "should return an empty string" do
+      Orthorings.content("missing").should be_empty
+    end
+  end
+
+  describe "should use custom {{}} replacement for rendering" do
+    before(:all) do
+      Orthor::Templates.define do
+        template :basic, %!<h2>{{title}}</h2><div class="content">{{Content}}</div>!
+        template :brief, %!<h2>{{title}}</h2>!
+        template :blurb, %!<div>{{Content.blurb}}</div>!
+      end
+    end
+
+    describe "a content item" do
+      it "should display content using the named template" do
+        Orthorings.content("homepage", :basic).should == %!<h2>What is Orthor</h2><div class="content"><h2>So what is Orthor really??</h2></div>!
+      end
+
+      it "should respect given template name" do
+        Orthorings.content("homepage", :brief).should == %!<h2>What is Orthor</h2>!
+      end
+
+      describe "blurb" do
+        it "should truncate some of the text, strip html and add ..." do
+          Orthorings.content("homepage", :blurb).should == "<div>So what is Orthor really??...</div>"
+        end
+      end
+    end
+
+    describe "a content query" do
+      it "should render the template for each item" do
+        Orthorings.query("latest-news-items", :brief).should == %!<h2>User Manual updated</h2><h2>Account event tracking</h2><h2>Tutorials have been updated</h2>!
+      end
+    end
+
+    describe "a category" do
+      it "should render the template for each item" do
+        Orthorings.category("news", :brief).should == %!<h2>User Manual updated</h2><h2>Account event tracking</h2><h2>Tutorials have been updated</h2><h2>Content Queries have landed in Orthor</h2>!
+      end
+    end
+  end
+end
+

data/spec/orthor_helper_spec.rb

@@ -2,59 +2,54 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe OrthorHelper do
   include OrthorHelper
-  
+
   describe 'default meta tag handling' do
     before(:all) do
       Orthor::Site.define do
         keywords "site keywords"
         description "site description"
-      end  
+      end
     end
-  
+
     it 'should return a meta tag for keywords' do
       keywords.should == %Q(<meta content="site keywords" name="keywords" />)
     end
-  
+
     it 'should return a meta tag for description' do
       description.should == %Q(<meta content="site description" name="description" />)
     end
-    
+
     it 'should use @meta_keywords when exists' do
       @meta_keywords = "asdf"
       keywords.should == %Q(<meta content="asdf" name="keywords" />)
     end
-    
+
     it 'should use @meta_description when exists' do
       @meta_description = "asdf"
       description.should == %Q(<meta content="asdf" name="description" />)
     end
   end
-  
+
   describe 'feed links' do
     before(:all) do
       Orthor::Site.define do
         keywords "site keywords"
         description "site description"
 
-        feed "/news.rss" do
-          name "News"
-        end
-
+        feed "/news.rss", :name => "News"
         category "/writings" do
-          feed "/writings.rss" do
-            id "our-writings"
-            name "Writings"
-          end
+          feed "/writings.rss", :id => "our-writings",
+                                :name => "Writings"
         end
-      end  
+      end
       @feed_2 = Orthor::Site.categories.first.feeds.first
       @feed = Orthor::Site.feeds.first
     end
-    
+
     it 'should generate a list of link tags rss feeds' do
       orthor_feed_tags.should == %Q(<link rel="alternate" type="application/rss+xml" title="News" href="/news.rss" />)
     end
-    
+
     it 'should generate additional links when @orthor_feeds is set' do
       @orthor_feeds = [ @feed_2 ]
       orthor_feed_tags.should == %Q(<link rel="alternate" type="application/rss+xml" title="News" href="/news.rss" /><link rel="alternate" type="application/rss+xml" title="Writings" href="/writings.rss" />)

data/spec/orthorings_spec.rb

@@ -3,27 +3,33 @@ require 'moneta/memory'
 
 describe Orthorings, "fetching content" do
   before(:all) do
-    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/content_items/homepage.html", :body => File.join(SPEC_DIR, 'resources', 'homepage.html'))
-    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/queries/latest-news-items.html", :body => File.join(SPEC_DIR, 'resources', 'latest-news-items.html'))
-    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/categories/news.html", :body => File.join(SPEC_DIR, 'resources', 'news.html'))
-    
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/content_items/homepage.json", :body => File.join(SPEC_DIR, 'resources', 'homepage.json'))
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/queries/latest-news-items.json", :body => File.join(SPEC_DIR, 'resources', 'latest-news-items.json'))
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/categories/news.json", :body => File.join(SPEC_DIR, 'resources', 'news.json'))
+
     Orthorings.setup do
       account_id "orthor"
     end
   end
-  
+
+  it "should parse the returned json into a hash/array" do
+    Orthorings.content("homepage").should be_a(Hash)
+    Orthorings.query("latest-news-items").should be_an(Array)
+    Orthorings.category("news").should be_a(Hash)
+  end
+
   it 'should be able to fetch content items' do
-    Orthorings.content("homepage").include?("<h2>So what is Orthor anyway?</h2>").should be_true
+    Orthorings.content("homepage").to_s.should include("<h2>So what is Orthor really??</h2>")
   end
-  
+
   it 'should be able to fetch queries' do
-    Orthorings.query("latest-news-items").include?("Comparisons to traditional Content Management").should be_true
+    Orthorings.query("latest-news-items").to_s.should include("big overhaul with increased documentation for lots of")
   end
-  
+
   it 'should be able to fetch categories' do
-    Orthorings.category("news").include?("<h2>Orthor's Features </h2>").should be_true
+    Orthorings.category("news").to_s.should include("The User Manual has recently had a big overhaul")
   end
-  
+
   it 'should not cache content if no config is given' do
     Orthorings.cache.should == false
   end
@@ -31,25 +37,25 @@ end
 
 describe Orthorings, "caching content" do
   before(:all) do
-    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/content_items/homepage.html", :body => File.join(SPEC_DIR, 'resources', 'homepage.html'))
-    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/queries/latest-news-items.html", :body => File.join(SPEC_DIR, 'resources', 'latest-news-items.html'))
-    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/categories/news.html", :body => File.join(SPEC_DIR, 'resources', 'news.html'))
-    
-    Orthorings.setup do 
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/content_items/homepage.json", :body => File.join(SPEC_DIR, 'resources', 'homepage.json'))
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/queries/latest-news-items.json", :body => File.join(SPEC_DIR, 'resources', 'latest-news-items.json'))
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/categories/news.json", :body => File.join(SPEC_DIR, 'resources', 'news.json'))
+
+    Orthorings.setup do
       account_id "orthor"
       caching :memory
     end
   end
-  
+
   it 'expiry should default to 300 seconds if none is given' do
     Orthorings.cache_expiry.should == 300
   end
-  
+
   it 'should add content to the cache after requests' do
     Orthorings.cache["homepage"].should be_empty
     Orthorings.content("homepage")
     Orthorings.cache["homepage"].should_not be_empty
-    
+
     Orthorings.should_not_receive(:cache_content)
     Orthorings.content("homepage")
   end

data/spec/resources/homepage.json

@@ -0,0 +1 @@
+{"type":"content","public_id":"what-is-orthor","category":{"public_id":"content-pages","link":"http://content.orthor.com/orthor-demo/categories/content-pages.json","title":"Content Pages"},"Content":"<h2>So what is Orthor really??</h2>","template":"Text Block","created_at":"April 06, 2010","updater":{"email":"demo@orthor.com","firstname":"demo","lastname":"demo"},"updated_at":"April 26, 2010","author":{"email":"demo@orthor.com","firstname":"demo","lastname":"demo"},"title":"What is Orthor"}

data/spec/resources/latest-news-items.json

@@ -0,0 +1 @@
+[{"type":"content","public_id":"user-manual-updated","Content":"The User Manual has recently had a big overhaul with increased documentation for lots of Orthor's great features, including Content Queries, RSS Feeds, Custom CSS and more!","url":"http://www.orthor.com/manual","created_at":"April 06, 2010","template":"Brief News Item","title":"User Manual updated","category":{"public_id":"news","link":"http://content.orthor.com/orthor-demo/categories/news.json","title":"News"},"updated_at":"April 06, 2010","author":{"firstname":"demo","lastname":"demo","email":"demo@orthor.com"}},{"type":"content","public_id":"account-event-tracking","Content":"All accounts now have access to event tracking, use this to gain a snapshot of what everyone in your account has been doing, for example, what were the latest items to get published, edited, created etc. Login to check it out.","url":"http://www.orthor.com/login","created_at":"April 06, 2010","template":"Brief News Item","title":"Account event tracking","category":{"public_id":"news","link":"http://content.orthor.com/orthor-demo/categories/news.json","title":"News"},"updated_at":"April 06, 2010","author":{"firstname":"demo","lastname":"demo","email":"demo@orthor.com"}},{"type":"content","public_id":"tutorials-have-been-updated","Content":"We've recently made the tutorials section of the site public, stay tuned for some more language examples + increased detail of the existing languages. ","url":"http://www.orthor.com/tutorials","created_at":"April 06, 2010","template":"Brief News Item","title":"Tutorials have been updated","category":{"public_id":"news","link":"http://content.orthor.com/orthor-demo/categories/news.json","title":"News"},"updated_at":"April 06, 2010","author":{"firstname":"demo","lastname":"demo","email":"demo@orthor.com"}}]

data/spec/resources/news.json

@@ -0,0 +1 @@
+{"type":"category","public_id":"news","children":[{"public_id":"media-releases","link":"http://content.orthor.com/orthor-demo/categories/media-releases.json","title":"Media Releases"},{"public_id":"quarterly-results","link":"http://content.orthor.com/orthor-demo/categories/quarterly-results.json","title":"Quarterly Results"}],"link":"http://content.orthor.com/orthor-demo/categories/news.json","title":"News","content":[{"type":"content","public_id":"user-manual-updated","Content":"The User Manual has recently had a big overhaul with increased documentation for lots of Orthor's great features, including Content Queries, RSS Feeds, Custom CSS and more!","url":"http://www.orthor.com/manual","created_at":"April 06, 2010","template":"Brief News Item","title":"User Manual updated","category":{"public_id":"news","link":"http://content.orthor.com/orthor-demo/categories/news.json","title":"News"},"updated_at":"April 06, 2010","author":{"firstname":"demo","lastname":"demo","email":"demo@orthor.com"}},{"type":"content","public_id":"account-event-tracking","Content":"All accounts now have access to event tracking, use this to gain a snapshot of what everyone in your account has been doing, for example, what were the latest items to get published, edited, created etc. Login to check it out.","url":"http://www.orthor.com/login","created_at":"April 06, 2010","template":"Brief News Item","title":"Account event tracking","category":{"public_id":"news","link":"http://content.orthor.com/orthor-demo/categories/news.json","title":"News"},"updated_at":"April 06, 2010","author":{"firstname":"demo","lastname":"demo","email":"demo@orthor.com"}},{"type":"content","public_id":"tutorials-have-been-updated","Content":"We've recently made the tutorials section of the site public, stay tuned for some more language examples + increased detail of the existing languages. ","url":"http://www.orthor.com/tutorials","created_at":"April 06, 2010","template":"Brief News Item","title":"Tutorials have been updated","category":{"public_id":"news","link":"http://content.orthor.com/orthor-demo/categories/news.json","title":"News"},"updated_at":"April 06, 2010","author":{"firstname":"demo","lastname":"demo","email":"demo@orthor.com"}},{"type":"content","public_id":"content-queries-have-landed-in-orthor","Content":"Content Queries are a powerful way to query all of your content at once. Some examples uses of content queries: Latest news items, Products on Sale or Featured Media releases.\r\n","url":"http://www.orthor.com/manual/content_queries","created_at":"April 04, 2010","template":"Brief News Item","title":"Content Queries have landed in Orthor","category":{"public_id":"news","link":"http://content.orthor.com/orthor-demo/categories/news.json","title":"News"},"updater":{"firstname":"demo","lastname":"demo","email":"demo@orthor.com"},"updated_at":"April 06, 2010","author":{"firstname":"demo","lastname":"demo","email":"demo@orthor.com"}}]}

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: orthorings
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Anthony Langhorne
@@ -9,19 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 +10:00
+date: 2010-06-06 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: moneta
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: anthony@orthor.com
 executables: []
@@ -51,16 +72,18 @@ files:
 - 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
@@ -77,23 +100,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Orthorings is a gem for displaying content from orthor.com
+summary: A gem for displaying content from orthor.com
 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

data/spec/resources/homepage.html

@@ -1,11 +0,0 @@
-<h2>So what is Orthor anyway?</h2>
-<p>Orthor is a web content management system that requires no additional software installation!. You can get up and running in a matter of minutes. Orthor is built to be reliable, priced to be affordable and above all - it's real easy to use. Designed from the ground up to fit the Software as a Service model, Orthor gives you all the tools you need to manage content on your new or existing site.</p>
-<p>With Orthor you dont have to install complicated software or buy any hardware</p>
-<p>&nbsp;</p>
-<h2>Comparisons to Traditional Content Management</h2>
-<p>Jarrod has recently written a great overview of how Orthor contrasts to existing Content management systems, its a great <a href="http://blog.orthor.com/2009/06/15/comparisons-to-traditional-content-management/" title="Orthor - Simple content management">overview</a>.</p>
-<p>With all the growth and change in this market many CMS products still follow the principle of &lsquo;complete ownership&lsquo;. This principle mandates that the CMS will control the life cycle of each page, asset, and content item presented on your site. This results in you having to define content types, presentation templates, navigational structures inside of the CMS. You may also need to force your development staff (or development agency) to build custom site functions using technologies that the CMS vendor tells you to. For me that is way too much control to hand over to someone else (but then again maybe Im just a control freak).</p>
-
-<p>It is on this point of &lsquo;complete control&lsquo; that Orthor strays from the pack. We do not attempt to own your site and we certainly don&rsquo;t dictate how you go about building your custom functions. Orthor focuses completely on only managing the content that is presented on your site. To put it more simply, you control the web pages and Orthor controls the content that is presented on those pages.</p>
-<p>Read the whole post <a href="http://blog.orthor.com/2009/06/15/comparisons-to-traditional-content-management/" title="Orthor - Simple content management">here</a></p>
-<p>&nbsp;</p>

data/spec/resources/latest-news-items.html

@@ -1 +0,0 @@
-<div><a href="http://blog.orthor.com/2009/06/15/comparisons-to-traditional-content-management/" title="Comparisons to traditional Content Management">Comparisons to traditional Content Management</a></div><div><a href="http://blog.orthor.com/2009/06/21/orthors-features/" title="Orthor's Features">Orthor's Features</a></div><div><a href="http://blog.orthor.com/2009/06/29/we-are-live/" title="Orthor is live and accepting signups!">Orthor is live and accepting signups!</a></div>

data/spec/resources/news.html

@@ -1,5 +0,0 @@
-<h2>Orthor's Features </h2><div><p>So today I thought we should take a quick tour of Orthor&rsquo;s features. In a series of upcoming posts I will explain each feature in more detail and present ideas and suggestions how each can be used to benefit you. If you have read previous posts you&rsquo;ll have picked up that Orthor is built with a single purpose, &lsquo;<em>to manage your content and not your site</em>&lsquo;. That means you wont find any fancy features to alter site navigation, add sub-sites, build custom forms etc. All Orthor&rsquo;s features are specific to creating, managing, publishing and retrieving content.</p>
-<p>Read the whole article <a href="http://blog.orthor.com/2009/06/21/orthors-features/">here</a>.</p>
- </div><h2>Orthor is live and accepting signups! </h2><div><p>Just a quick note to announce that we are now officially live. All our plans are now available <a href="https://orthor.com/pricing_signup" title="Orthor subscription plans">here</a>. This marks a small milestone for us in getting Orthor up and running. We can now move onto implementing some more great features that we have on our road map.</p> </div><h2>Comparisons to traditional Content Management </h2><div><p>Over the last five plus years it seems that a new CMS has popped into the scene on an almost daily basis. The CMS market is completely saturated with products and services, so much so that it is quite an ordeal to select one. I firmly believe that a saturated market is a good thing for the consumer, just look at the amount of choice you have. Regardless of what web technology underpins your organization, what your budget constraints are, what your in-house skills are there is bound to be a CMS out there for you</p>
-
-          <p>Read the whole article <a href="http://blog.orthor.com/2009/06/15/comparisons-to-traditional-content-management/">here</a>.</p> </div>