xhive 1.0.1.pre → 1.0.3.pre

data/app/helpers/xhive/application_helper.rb

@@ -5,12 +5,15 @@ module Xhive
     end
 
     def include_custom_stylesheets
-      "<link href='#{stylesheets_path}' media='all' rel='stylesheet' type='text/css'/>".html_safe
+      # TODO: merge engine routes with Rails application routes
+      "<link href='/stylesheets/custom.css' media='all' rel='stylesheet' type='text/css'/>".html_safe
     end
 
-    def render_page_for(resource, action, options={})
-      page = current_site.mappers.page_for(resource, action)
-      render :text => page.presenter.render_content(options)
+    def render_page_with(options={})
+      page = current_site.mappers.page_for(controller_name, action_name)
+      render :inline => page.presenter.render_content(options), :layout => true
+    rescue
+      render
     end
 
     def current_site

data/app/models/xhive/mapper.rb

@@ -1,6 +1,6 @@
 module Xhive
   class Mapper < ActiveRecord::Base
-    attr_accessible :action, :page, :site, :resource
+    attr_accessible :action, :page_id, :site_id, :resource
 
     belongs_to :site
     belongs_to :page

data/app/models/xhive/page.rb

@@ -7,7 +7,7 @@ module Xhive
 
     include Xhive::Presentable
 
-    attr_accessible :content, :meta_description, :meta_keywords, :name, :slug, :title, :site
+    attr_accessible :content, :meta_description, :meta_keywords, :name, :slug, :title, :site_id
 
     belongs_to :site
 

data/app/models/xhive/site.rb

@@ -1,6 +1,6 @@
 module Xhive
   class Site < ActiveRecord::Base
-    attr_accessible :domain, :name, :home_page
+    attr_accessible :domain, :name, :home_page_id
 
     has_many :pages
     has_many :mappers

data/app/models/xhive/stylesheet.rb

@@ -8,7 +8,7 @@ module Xhive
 
     include Xhive::Presentable
 
-    attr_accessible :content, :name, :slug, :site
+    attr_accessible :content, :name, :slug, :site_id
 
     belongs_to :site
 

data/lib/xhive/engine.rb

@@ -11,13 +11,13 @@ module Xhive
 
         include Xhive::ApplicationHelper
 
-        helper_method :initialize_widgets_loader
+        helper_method :initialize_widgets_loader, :include_custom_stylesheets
       end
     end
-    initializer "xhive.load_all_controller_classes" do
+    initializer "xhive.load_all_controller_classes", :after=> :disable_dependency_loading do
       ActiveSupport.on_load(:action_controller) do
-        Rails.application.reload_routes!
         Dir[Rails.root.join("app/controllers/**/*.rb")].each {|f| require f}
+        Xhive::Router::Cells.process_routes
       end
     end
   end

data/lib/xhive/router/cells.rb

@@ -10,7 +10,7 @@ module Xhive
       #   end
       #
       def self.draw
-        Rails.application.reload_routes!
+        class_variable_set("@@routes", [])
         yield self
       end
 
@@ -21,15 +21,28 @@ module Xhive
       #
       # Example: mount 'my_widget', :to => 'my_cell#action'
       #
+      # It stores the route in internal storage for later processing
+      #
       def self.mount(route, options)
-        cell, action = options[:to].split('#')
-        widgets_base_route = Base.route_for('widgets', 'show').gsub(/\/\*\w*$/, '')
-        widget_route = "#{widgets_base_route}/#{route}"
-        tag_class_name = "#{cell}_#{action}".classify
+        @@routes << { :path => route, :options => options }
+      end
+
+      # Public: process the previously stored routes
+      #
+      def self.process_routes
+        @@routes.each do |route|
+          path = route[:path]
+          options = route[:options]
+
+          cell, action = options[:to].split('#')
+          widgets_base_route = Base.route_for('widgets', 'show').gsub(/\/\*\w*$/, '')
+          widget_route = "#{widgets_base_route}/#{path}"
+          tag_class_name = "#{cell}_#{action}".camelize
 
-        Route.add(widget_route, cell.classify, action)
+          Route.add(widget_route, cell.camelize, action)
 
-        Xhive::TagFactory.create_class(tag_class_name, widget_route)
+          Xhive::TagFactory.create_class(tag_class_name, widget_route)
+        end
       end
     end
   end

data/lib/xhive/version.rb

@@ -1,3 +1,3 @@
 module Xhive
-  VERSION = "1.0.1.pre"
+  VERSION = "1.0.3.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhive
 version: !ruby/object:Gem::Version
-  version: 1.0.1.pre
+  version: 1.0.3.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,64 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cells
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.8.5
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.8.5
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: friendly_id
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: liquid
+  name: cells
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.5
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,39 +74,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: liquid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 3.2.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -223,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1032218936541057101
+      hash: -3877875978952443496
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: