xhive 1.3.0.pre → 1.4.0.pre

data/README.md

@@ -39,10 +39,10 @@ rake xhive:install:migrations
 rake db:migrate
 ```
 
-Include the xhive javascript in your head tag.
+Include the xhive javascript loader in your head tag.
 
 ```erb
-<%= javascript_include_tag "xhive/application" %>
+<%= javascript_include_tag "xhive/loader" %>
 ```
 
 Include the custom stylesheets in your head tag.
@@ -332,6 +332,20 @@ Then you can add your stylesheet into your email page using the corresponding ta
 
 This will create a `<style>` tag inside your email page and inject all the style rules.
 
+### Inline pages for your emails
+
+If you add the inline widget to your cell routes you can use inline pages within your email pages:
+
+```ruby
+Xhive::Router::Cells.draw do |router|
+  router.mount 'page/:id', :to => 'xhive/page#inline', :inline => true, :as => :inline_page
+end
+```
+
+Then you can add your inline page into your email page using the corresponding tag:
+
+`{% inline_page id:email_header %}`
+
 TODO
 ====
 

data/app/models/xhive/page.rb

@@ -19,5 +19,9 @@ module Xhive
     def present_content(opts={})
       presenter.render_content(opts)
     end
+
+    def present_title(opts={})
+      presenter.render_title(opts)
+    end
   end
 end

data/app/presenters/xhive/page_presenter.rb

@@ -5,6 +5,12 @@ module Xhive
 
     liquid_methods :name, :title, :content, :meta_keywords, :meta_description
 
+    # Public: renders the page content.
+    #
+    # options - The Hash containing the values to use inside the template.
+    #
+    # Returns: the rendered page content.
+    #
     def render_content(options={})
       liquified = LiquidWrapper.liquify_objects(options)
       layout = ::Liquid::Template.parse("{{content}}").render({"content" => page.content})
@@ -20,5 +26,22 @@ module Xhive
     ensure
       return result
     end
+
+    # Public: renders the page title.
+    #
+    # options - The Hash containing the values to use inside the template.
+    #
+    # Returns: the rendered page title.
+    #
+    def render_title(options={})
+      liquified = LiquidWrapper.liquify_objects(options)
+      result = ::Liquid::Template.parse(title).render(liquified.stringify_keys)
+    rescue => e
+      logger.error "#{e.class.name}: #{e.message}"
+      logger.error e.backtrace.join("/n")
+      result = ''
+    ensure
+      return result
+    end
   end
 end

data/lib/xhive/mailer.rb

@@ -1,6 +1,6 @@
 module Xhive
   class Mailer
-    attr :site, :resource, :action, :key, :mailer, :content
+    attr :site, :resource, :action, :key, :mailer, :content, :page
 
     def initialize(site, mailer, key = nil)
       @site = site
@@ -8,6 +8,7 @@ module Xhive
       @mailer = mailer
       @action = mailer.action_name
       @key = key
+      @page = Xhive::Mapper.page_for(@site, @resource, @action, @key)
     end
 
     # Public: sends the email to the specified recipients.
@@ -17,13 +18,13 @@ module Xhive
     #         :from
     #         :to
     #         :reply_to
-    #         :subject
+    #         :subject (uses page title if mapper is found)
     #
     # block - The block for customizing the email sending.
     #
     def send(opts = {}, &block)
       unless block_given?
-        mailer.send(:mail, opts) do |format|
+        mailer.send(:mail, opts.merge(:subject => subject || opts[:subject])) do |format|
           format.html { mailer.render :text => content }
         end
       else
@@ -37,10 +38,17 @@ module Xhive
     #
     def content
       return @content if @content.present?
-      page = Xhive::Mapper.page_for(site, resource, action, key)
       @content = page.present? ? page.present_content(mailer_instance_variables(mailer)) : mailer.render
     end
 
+    # Public: returns the email subject.
+    #
+    # Returns: the rendered template or the mapped page content body.
+    #
+    def subject
+      @subject = page.present? ? page.present_title(mailer_instance_variables(mailer)) : nil
+    end
+
   private
 
     # Private: extracts the instance variables from the mailer object.

data/lib/xhive/version.rb

@@ -1,3 +1,3 @@
 module Xhive
-  VERSION = "1.3.0.pre"
+  VERSION = "1.4.0.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhive
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre
+  version: 1.4.0.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -298,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 392995254434772394
+      hash: 679411744217455480
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: