xhive 1.6.0 → 1.6.1

data/README.md

@@ -245,7 +245,7 @@ mapper = Xhive::Mapper.map_resource(site, posts_page, 'posts', 'index')
 If you want to map the page to a specific post
 
 ```ruby
-mapper = Xhive::Mapper.map_resource(site, posts_page, 'posts', 'index', post.id)
+mapper = Xhive::Mapper.map_resource(site, posts_page, 'posts', 'show', post.id)
 ```
 
 From your posts controller, render the posts page
@@ -279,7 +279,7 @@ class MyPolicyClass
   end
 end
 
-mapper = Xhive::Mapper.map_resource(site, posts_page, 'posts', 'index', post.id, 'MyPolicyClass')
+mapper = Xhive::Mapper.map_resource(site, posts_page, 'posts', 'show', post.id, 'MyPolicyClass')
 
 # It will only use the page if the user is an adult from the US
 render_page_with @post.id, :post => @post, :user => @user
@@ -371,6 +371,7 @@ Then you can add your inline page into your email page using the corresponding t
 
 ## TODO
 
+* Transform inline stylesheet images URLs to absolute URLs to use with ActionMailer
 * Remove as many dependencies as possible
 * Improve test coverage
 

data/app/presenters/xhive/base_presenter.rb

@@ -7,6 +7,7 @@ module Xhive
     include Rails.application.routes.url_helpers
 
     default_url_options[:host] = (Rails.application.config.action_mailer.default_url_options || {}).fetch(:host, 'localhost')
+    default_url_options[:port] = (Rails.application.config.action_mailer.default_url_options || {}).fetch(:port, '3000')
 
     def initialize(object)
       @object = object
@@ -31,5 +32,23 @@ module Xhive
         @object
       end
     end
+
+    # Private: returns the xhive url for the requested resource
+    #
+    def url_for(resource, params = {}, options = {})
+      Xhive.railtie_routes_url_helpers.send("#{resource}_url", params, options.merge(default_url_options))
+    end
+
+    # Private: returns the xhive url for the requested resource
+    #
+    def path_for(resource, params = {})
+      url_for(resource, params, :only_path => true)
+    end
+
+    # Private: returns the base images path
+    #
+    def base_images_path
+      path_for('image', 'sample.png').gsub('/sample.png', '')
+    end
   end
 end

data/app/presenters/xhive/page_presenter.rb

@@ -17,7 +17,7 @@ module Xhive
     rescue => e
       log_error(e)
     ensure
-      return result.to_s
+      return filter_images_urls(result.to_s)
     end
 
     # Public: renders the page title.
@@ -43,6 +43,12 @@ module Xhive
       {'page' => self, 'user' => safe_user}.merge(liquified.stringify_keys)
     end
 
+    def filter_images_urls(content)
+      images_path = base_images_path
+      # This only works if string is interpolated o_O
+      "#{content}".gsub(/src\=['"]?#{images_path}\/([^\'^\"]+)['"]?/) {|| "src='#{url_for('image', $1)}'"}
+    end
+
     def log_error(e)
       logger.error "#{e.class.name}: #{e.message}"
       logger.error e.backtrace.join("/n")

data/app/presenters/xhive/stylesheet_presenter.rb

@@ -1,17 +1,21 @@
 module Xhive
   class StylesheetPresenter < Xhive::BasePresenter
     presents :stylesheet
-    delegate :name, :content, :to => :stylesheet
+    delegate :name, :to => :stylesheet
 
     liquid_methods :name, :content, :compressed
 
+    def content
+      filter_images_urls(stylesheet.content)
+    end
+
     def compressed
-      self.class.compress(stylesheet.content)
+      self.class.compress(content)
     end
 
     def self.all_compressed(stylesheets)
       stylesheets.inject('') do |result, stylesheet|
-        result << compress(stylesheet.content)
+        result << compress(content)
       end
     end
 
@@ -27,5 +31,10 @@ module Xhive
       engine = Sass::Engine.new(content, :syntax => :scss, :style => :compressed)
       engine.render
     end
+
+    def filter_images_urls(content)
+      images_path = base_images_path
+      content.gsub(/url\(['"]?#{images_path}\/([^\'^\"]+)['"]?\)/) {|| "url('#{url_for('image', $1)}')"}
+    end
   end
 end

data/lib/xhive/engine.rb

@@ -16,7 +16,7 @@ module Xhive
         self.class_variable_set('@@current_controller', nil)
       end
     end
-    initializer "xhive.load_all_controller_classes", :after=> :disable_dependency_loading do
+    initializer "xhive.load_all_controller_classes", :after => :disable_dependency_loading do
       ActiveSupport.on_load(:action_controller) do
         Dir[Rails.root.join("app/controllers/**/*.rb")].each {|f| require f}
         Xhive::Router::Cells.process_routes

data/lib/xhive/version.rb

@@ -1,3 +1,3 @@
 module Xhive
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhive
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -284,7 +284,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 31275926893044133
+      hash: 4096513419802856694
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 31275926893044133
+      hash: 4096513419802856694
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21