orthor 0.1.1 → 0.1.2

data/README.md

@@ -44,25 +44,25 @@ If you do not provide a template_name to render your content with, you will get
 Orthor returns all of your content in JSON so to make the job of translating JSON -> HTML easier, we provide some templating help:
 
     Orthor::Templates.define do
-      template :basic_content, %(<div>{{Content}}</div>)
+      template :basic_content, %(<div>{{content}}</div>)
 
       template :blog_entry, %(
         <div class="blog-entry">
-          <h2>{{Title}}</h2>
-          <div class="blog-content">{{Wysiwyg}}</div>
+          <h2>{{title}}</h2>
+          <div class="blog-content">{{wysiwyg}}</div>
         </div>)
       template :blog_entry_brief, %(
         <div class="blog-entry">
-          <h2><a href="{{URL}}">{{Title}}</a></h2>
-          <p>{{Published on}}</p>
-          <div class="blog-content">{{Wysiwyg.blurb}}</div>
+          <h2><a href="{{url}}">{{title}}</a></h2>
+          <p>{{published_on}}</p>
+          <div class="blog-content">{{wysiwyg.blurb}}</div>
         </div>)
 
       template :user_manual, %(
         <div class="user-manual-entry">
-          <h2>{{Title}}</h2>
-          <p class="last-updated">Last updated: {{Updated on}}</p>
-          <div class="content">{{Wysiwyg}}</div>
+          <h2>{{title}}</h2>
+          <p class="last-updated">Last updated: {{updated_on}}</p>
+          <div class="content">{{wysiwyg}}</div>
         </div>)
 
       mapping :detail_templates, {
@@ -91,22 +91,22 @@ A call to Orthor.category("blog", :blog_types) means that any content item using
 These tags are available to all content:
 
     {{id}}           - the orthor id of your content item
-    {{Title}}        - your content title
-    {{Created on}}   - the date your content was created
-    {{Updated on}}   - the date your content was last updated
-    {{Author}}       - a hash of the original authors details
-    {{Updater}}      - a hash of the updater details
-    {{Published on}} - the date your content was published
-    {{URL}}          - the URL for your content as defined in Orthor, or auto generated as /:template-prefix/category-id/content-id
+    {{title}}        - your content title
+    {{created_on}}   - the date your content was created
+    {{updated_on}}   - the date your content was last updated
+    {{author}}       - a hash of the original authors details
+    {{updater}}      - a hash of the updater details
+    {{published_on}} - the date your content was published
+    {{url}}          - the URL for your content as defined in Orthor, or auto generated as /:template-prefix/category-id/content-id
     {{template}}     - the name of the template this content was created from
     {{category}}     - a hash of this items category details
 
 Other attributes that will be present on a per item specific basis are are the names of your template elements, e.g.
 
-    {{Content}}
-    {{Featured News Item}}
-    {{Supporting Image}}
-    {{Markdown body}}
+    {{content}}             # Template field name in Orthor: Content
+    {{featured_news_item}}  # Template field name in Orthor: Featured News Item
+    {{supporting_image}}    # Template field name in Orthor: Supporting Image
+    {{markdown_body}}       # Template field name in Orthor: Markdown Body
 
 ## Questions? Comments?
 

data/lib/orthor.rb

@@ -3,6 +3,7 @@ $KCODE = 'u' if RUBY_VERSION < '1.9'
 
 require 'moneta'
 require 'json'
+require 'net/http'
 
 require 'orthor/templates'
 
@@ -11,6 +12,24 @@ class Orthor
     attr_accessor :cache, :cache_expiry, :account_id
   end
 
+  def self.load_content
+    raise "No point loading content when you don't have a cache setup" unless cache
+
+    load_category = lambda do |id|
+      cat = category(id)
+      cat["children"].each { |child| load_category[child["id"]] } if cat["children"]
+      cat["content"].each  { |item| content(item["id"]) } if cat["content"]
+    end
+
+    JSON.parse(get_response("/#{account_id}.json")).each do |item|
+      if item["type"] == "category"
+        load_category[item["id"]]
+      else
+        content(item["id"])
+      end
+    end
+  end
+
   def self.content(id, template = nil)
     Templates.render(get(:content_items, id), template)
   end
@@ -58,9 +77,9 @@ private
     begin
       suffix = type == :feeds ? "rss" : "json"
       key = "#{id}-#{type}"
-      url = "http://content.orthor.com/#{account_id}/#{type}/#{id}.#{suffix}"
+      path = "/#{account_id}/#{type}/#{id}.#{suffix}"
 
-      resp = cache ? get_cached_content(key, url) : get_response(url)
+      resp = cache ? get_cached_content(key, path) : get_response(path)
 
       return resp unless suffix == "json"
 
@@ -70,24 +89,40 @@ private
     end
   end
 
-  def self.get_cached_content(id, url)
-    content = cache[id]
+  def self.get_cached_content(key, path)
+    content = cache[key]
     if content.nil? || content.empty?
-      content = get_response(url)
-
-      options = {}
-      options[:expires_in] = cache_expiry if cache_expiry
-      cache.store(id, content, options) unless content.empty?
+      content = get_response(path)
+      cache_content(key, content)
     end
     content
   end
 
-  def self.get_response(uri)
-    r = Net::HTTP.get_response(URI.parse(uri))
-    r.code.to_i == 200 ? r.body : ""
-  rescue => e
-    ""
+  def self.cache_content(key, content)
+    return if content.empty?
+
+    options = {}
+    options[:expires_in] = cache_expiry if cache_expiry
+    cache.store(key, content, options)
   end
 
+  def self.get_response(path)
+    # default to content.orthor.com, if thats down, try www.orthor.com
+    uris = [ "http://content.orthor.com#{path}", "http://www.orthor.com#{path}" ]
+    response_content = ""
+
+    uris.each do |uri|
+      begin
+        r = Net::HTTP.get_response(URI.parse(uri))
+        if r.code.to_i == 200
+          response_content = r.body
+          break
+        end
+      rescue => e
+        break
+      end
+    end
+    response_content
+  end
   private_class_method :get, :get_cached_content, :get_response
 end

data/spec/orthor_spec.rb

@@ -8,8 +8,22 @@ describe Orthor do
                          :body => File.join(SPEC_DIR, 'resources', 'query.json'))
     FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/categories/category.json",
                          :body => File.join(SPEC_DIR, 'resources', 'category.json'))
+
+    # account and cache loading resources
+    [ "top-level", "second-level" ].each do |name|
+      FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/categories/#{name}.json",
+                           :body => File.join(SPEC_DIR, 'resources', "#{name}.json"))
+    end
+
     FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/feeds/feed.rss",
                          :body => File.join(SPEC_DIR, 'resources', 'feed.rss'))
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor.json",
+                         :body => File.join(SPEC_DIR, 'resources', 'account.json'))
+
+    FakeWeb.register_uri(:get, "http://content.orthor.com/orthor/content_items/missing.json",
+                         :body => "", :status => 500)
+    FakeWeb.register_uri(:get, "http://www.orthor.com/orthor/content_items/missing.json",
+                         :body => File.join(SPEC_DIR, 'resources', 'content.json'))
   end
 
   describe "setup" do
@@ -60,6 +74,33 @@ describe Orthor do
     end
   end
 
+  describe "loading cache" do
+    describe "without cache setting" do
+      before do
+        Orthor.setup { account "orthor" }
+      end
+
+      it "should raise an error" do
+        lambda { Orthor.load_content }.should raise_error
+      end
+    end
+
+    describe "with cache setting" do
+      before do
+        Orthor.setup do
+          account "orthor"
+          caching :memory, 20
+        end
+      end
+
+      it "should load all items into the cache" do
+        Orthor.load_content
+        Orthor.cache["news-categories"].should_not be_nil
+        Orthor.cache["content-content_items"].should_not be_nil
+      end
+    end
+  end
+
   describe "caching" do
     describe "no config" do
       before(:all) do
@@ -127,4 +168,17 @@ describe Orthor do
       end
     end
   end
+
+  describe "failover" do
+    before(:all) do
+      Orthor.setup do
+        account "orthor"
+      end
+    end
+
+    it "should use www.orthor.com if content.orthor.com is down" do
+      # initial request will go to content.orthor.com and return an empty string
+      Orthor.content("missing").should_not == ""
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Anthony Langhorne