orthorings 0.4.0 → 0.4.1

data/README.markdown

@@ -9,8 +9,6 @@ The 2 main things you can do with Orthorings are:
 
 ## Installation
 
-As a gem
-
     gem install orthorings
 
 ## Configuration
@@ -125,7 +123,7 @@ Other attributes that will be present on a per item specific basis are the names
     {{Markdown body}}
 
 
-## Example Usage (as provided by the OrthorHelper module, defined as class methods of Orthorings)
+## Example Usage
 
 In all the methods below, if you don't provide a template name, you will get the parsed JSON array/hash back.
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/app/controllers/orthor_content_controller.rb

@@ -5,6 +5,7 @@ class OrthorContentController < ApplicationController
     if params[:id]
       resource = Orthor::Site.find_resource_by_page_path(request.request_uri, params[:id])
       @orthor_content = Orthorings.content(params[:id], (resource.page_template || resource.template))
+      @orthor_page_title = Orthorings.content(id)["Title"]
     else
       resource = Orthor::Site.find_resource_by_path(request.request_uri)
       @orthor_content = resource.content
@@ -17,6 +18,7 @@ class OrthorContentController < ApplicationController
       @meta_keywords = resource.keywords
       @meta_description = resource.description
       @orthor_feeds = resource.respond_to?(:feeds) ? resource.feeds : []
+      @orthor_page_title ||= resource.title
 
       render :action => (resource.view || "orthor_content"), :layout => Orthor::Site.layout.to_s
     end

data/lib/orthor/category.rb

@@ -15,5 +15,9 @@ module Orthor
     def fetch_content
       Orthorings.category(@id, @template)
     end
+
+    def title
+      Orthorings.category(@id)["Title"]
+    end
   end
 end

data/lib/orthor/object.rb

@@ -19,6 +19,10 @@ module Orthor
       fetch_content
     end
 
+    def title
+      ""
+    end
+
     def path_name
       @id.gsub(/[^a-z0-9]+/i, '_')
     end

data/lib/orthor/page.rb

@@ -3,5 +3,9 @@ module Orthor
     def fetch_content
       Orthorings.content(@id, @template)
     end
+
+    def title
+      Orthorings.content(@id)["Title"]
+    end
   end
 end

data/lib/orthor/static_page.rb

@@ -4,7 +4,7 @@ module Orthor
     include Orthor::MetaData
 
     attr_accessor :path
-    dsl_accessor :view, :controller
+    dsl_accessor :view, :name, :controller
 
     def initialize(path, options = {})
       @path = path
@@ -13,6 +13,10 @@ module Orthor
       options.each { |key, val| send(key, val) }
     end
 
+    def title
+      name
+    end
+
     def path_name
       @path.gsub("/", " ").strip.gsub(/[^a-z0-9]+/i, '_')
     end

data/lib/orthor_helper.rb

@@ -32,4 +32,8 @@ module OrthorHelper
       html += %Q(<link rel="alternate" type="application/rss+xml" title="#{feed.name || "RSS"}" href="#{feed.path}" />)
     end
   end
+
+  def orthor_page_title
+    @orthor_page_title
+  end
 end

data/lib/orthorings.rb

@@ -107,13 +107,17 @@ class Orthorings
         end
         json.collect do |c|
           c.inject(template) do |html, (key, val)|
-            # if val.is_a?(Hash)
-            if html.include?("{{#{key}.blurb}}")
+            if val.is_a?(String) && html.include?("{{#{key}.blurb}}")
               val = "#{val.to_s.gsub(/<\/?[^>]*>/, "")[0..150]}..."
               key = "#{key}.blurb"
-            end
 
-            html = html.gsub("{{#{key}}}", val.to_s)
+              html = html.gsub("{{#{key}}}", val.to_s)
+            elsif val.is_a?(Hash) && html.include?("{{#{key}.")
+              # we've got something like Author.Email
+              html = val.inject(html) { |h, (k, v)| h = h.gsub("{{#{key}.#{k}}}", v) }
+            else
+              html = html.gsub("{{#{key}}}", val.to_s)
+            end
           end
         end.join("")
       rescue => e
@@ -123,4 +127,3 @@ class Orthorings
   end
 end
 
-

data/lib/sinatra/orthor.rb

@@ -9,6 +9,7 @@ module Sinatra
       @meta_keywords = resource.keywords
       @meta_description = resource.description
       @orthor_feeds = resource.respond_to?(:feeds) ? resource.feeds : []
+      @orthor_page_title = resource.title
     end
   end
 
@@ -20,8 +21,9 @@ module Sinatra
       ::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, (resource.page_template || resource.template))
             handle_request(resource)
+            @orthor_content = orthor_content(id, (resource.page_template || resource.template))
+            @orthor_page_title = orthor_content(id)["Title"]
             erb (resource.view || "orthor_content").to_sym, { :layout => ::Orthor::Site.layout }
           end
         end

data/orthorings.gemspec

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

data/spec/orthor/templates_spec.rb

@@ -25,9 +25,16 @@ describe Orthor::Templates do
   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 :basic, %!<h2>{{Title}}</h2><div class="content">{{Content}}</div>!
+        template :brief, %!<h2>{{Title}}</h2>!
         template :blurb, %!<div>{{Content.blurb}}</div>!
+        template :user, %!<div>{{Creator.Email}}</div><div>{{Creator.First name}} {{Creator.Last name}}</div>!
+      end
+    end
+
+    describe "users" do
+      it "should replace user.email" do
+        Orthorings.content("homepage", :user).should == "<div>demo@orthor.com</div><div>Bob Demo</div>"
       end
     end
 

data/spec/resources/homepage.json

@@ -1 +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"}
+{"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":"Bob","lastname":"Demo"},"updated_at":"April 26, 2010","Creator":{"Email":"demo@orthor.com","First name":"Bob","Last name":"Demo"},"Title":"What is Orthor"}

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

@@ -1 +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"}}]
+[{"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

@@ -1 +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"}}]}
+{"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

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Anthony Langhorne
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 +10:00
+date: 2010-06-09 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency