orthorings 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/orthorings.rb

@@ -44,6 +44,7 @@ class Orthorings
       Moneta.autoload(klass.to_sym, "moneta/#{file}")
       @cache = Moneta.const_get(klass).new(options)
       @cache_expiry = expiry
+      @cache_options = options.merge(:expires_in => @cache_expiry)
     end
 
     def setup(&block)
@@ -67,7 +68,7 @@ class Orthorings
 
     def get_cached_content(id, url)
       content = @cache[id]
-      if content.empty?
+      if content.nil? || content.empty?
         content = get_response(url)
         cache_content(id, content)
       end
@@ -75,7 +76,7 @@ class Orthorings
     end
 
     def cache_content(id, content)
-      @cache.store(id, content, :expires_in => @cache_expiry) unless content.empty?
+      @cache.store(id, content, @cache_options) unless content.empty?
     end
 
     def get_response(uri)
@@ -87,7 +88,7 @@ class Orthorings
 
     def render(type, id, template = nil)
       suffix = type == :feeds ? "rss" : "json"
-      resp = get_content(id, "http://content.orthor.com/#{@account_id}/#{type}/#{id}.#{suffix}")
+      resp = get_content("#{id}-#{type}", "http://content.orthor.com/#{@account_id}/#{type}/#{id}.#{suffix}")
 
       return resp unless suffix == "json"
 
@@ -114,7 +115,7 @@ class Orthorings
               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) }
+              html = val.inject(html) { |h, (k, v)| h = h.gsub("{{#{key}.#{k}}}", v.to_s) }
             else
               html = html.gsub("{{#{key}}}", val.to_s)
             end

data/orthorings.gemspec

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

metadata

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