orthor 0.1.2 → 0.1.3

data/README.md

@@ -11,11 +11,11 @@ The Orthor gem is used to fetch and display your content from orthor.com
 Add the below to a file and require it:
 
     Orthor.setup do
-      account "orthor"     # your orthor account id
+      site "orthor"                             # your orthor site/account id
       caching :basic_file, 300, :path => "tmp/" # cache content in tmp/ for 5 mins
     end
 
-You can specify any Moneta cache store you like, e.g. basic_file, memcache etc. The (optional) second argument is cache expiry in seconds, you can provide any initialize options required by your cache store as the 3rd arg.
+You can specify any Moneta cache store you like, e.g. basic_file, memory, memcache etc. The (optional) second argument is cache expiry in seconds, you can provide any initialize options required by your cache store as the 3rd arg.
 
 ## Usage
 

data/lib/orthor.rb

@@ -63,6 +63,10 @@ class Orthor
     self.account_id = id
   end
 
+  def self.site(id)
+    self.account_id = id
+  end
+
   def self.setup(&block)
     raise ArgumentError unless block_given?
     self.cache = false # default

data/lib/orthor/templates.rb

@@ -35,6 +35,8 @@ class Orthor
 
   private
     def self.parse(item, template_name_or_mapping)
+      return "" if item == ""
+
       # ensure we're dealing with an array
       unless item.is_a?(Array)
         if item["type"] == "category"
@@ -61,8 +63,9 @@ class Orthor
           end
         end
       end.join("")
+    rescue Orthor::Templates::Unknown => e
+      raise e
     rescue => e
-      raise e if e.is_a?(Orthor::Templates::Unknown)
       return ""
     end
 

data/spec/orthor/templates_spec.rb

@@ -75,6 +75,12 @@ describe Orthor::Templates do
     end
   end
 
+  describe "parsing an empty result" do
+    it "should return an empty string" do
+      Orthor.render("", :blurb).should == ""
+    end
+  end
+
   describe "a content query" do
     it "should render the template for each item" do
       Orthor.query("query", :brief).should == %!<h2>User Manual updated</h2><h2>Account event tracking</h2><h2>Tutorials have been updated</h2>!

data/spec/orthor_spec.rb

@@ -38,6 +38,18 @@ describe Orthor do
     end
   end
 
+  describe "site config" do
+    before(:all) do
+      Orthor.setup do
+        site "bob"
+      end
+    end
+
+    it "should use the site id as the account id" do
+      Orthor.account_id.should == "bob"
+    end
+  end
+
   describe "getting" do
     before(:all) do
       Orthor.setup do

metadata

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