xhive 1.5.0.pre → 1.5.1.pre

data/app/models/xhive/mapper.rb

@@ -43,7 +43,7 @@ module Xhive
 
       mapper = find_exact_map(site, resource, action, key, policy)
       mapper = new(:site_id => site.id, :resource => resource,
-                   :action => action, :policy => policy,
+                   :action => action, :policy => policy.present? ? policy : nil,
                    :key => key.present? ? key : nil) unless mapper.present?
       mapper.page = page
       mapper.save

data/app/presenters/xhive/base_presenter.rb

@@ -16,6 +16,10 @@ module Xhive
       @object.id
     end
 
+    def safe_user
+      controller.try(:safe_user).try(:presenter)
+    end
+
   private
 
     def controller

data/app/presenters/xhive/page_presenter.rb

@@ -12,19 +12,12 @@ module Xhive
     # Returns: the rendered page content.
     #
     def render_content(options={})
-      liquified = LiquidWrapper.liquify_objects(options)
       layout = ::Liquid::Template.parse("{{content}}").render({"content" => page.content})
-      text = ::Liquid::Template.parse(layout).render(
-        {'page' => self, 'user' => controller.try(:safe_user).try(:presenter)}.merge(liquified.stringify_keys),
-        :registers => {:controller => controller}
-      )
-      result = text.html_safe
+      result = ::Liquid::Template.parse(layout).render(optional_data(options), :registers => {:controller => controller}).html_safe
     rescue => e
-      logger.error "#{e.class.name}: #{e.message}"
-      logger.error e.backtrace.join("/n")
-      result = ''
+      log_error(e)
     ensure
-      return result
+      return result.to_s
     end
 
     # Public: renders the page title.
@@ -34,14 +27,25 @@ module Xhive
     # Returns: the rendered page title.
     #
     def render_title(options={})
-      liquified = LiquidWrapper.liquify_objects(options)
-      result = ::Liquid::Template.parse(title).render(liquified.stringify_keys)
+      result = ::Liquid::Template.parse(title).render(optional_data(options))
     rescue => e
+      log_error(e)
+    ensure
+      return result.to_s
+    end
+
+  private
+
+    def optional_data(options)
+      # wrap the options data to use it from liquid
+      liquified = LiquidWrapper.liquify_objects(options)
+      # build the optional data hash
+      {'page' => self, 'user' => safe_user}.merge(liquified.stringify_keys)
+    end
+
+    def log_error(e)
       logger.error "#{e.class.name}: #{e.message}"
       logger.error e.backtrace.join("/n")
-      result = ''
-    ensure
-      return result
     end
   end
 end

data/lib/xhive/version.rb

@@ -1,3 +1,3 @@
 module Xhive
-  VERSION = "1.5.0.pre"
+  VERSION = "1.5.1.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhive
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre
+  version: 1.5.1.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -283,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2539444549338109190
+      hash: 987173346002263411
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: