exo_cms 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25fd006f9306db4a605eecad94ba1187c987b908
-  data.tar.gz: cf32bd802e57fc69b405972cdf1a6b4e1ea14cc3
+  metadata.gz: 47bc2bfafd7fb198d45ac0f39b22ca0999099183
+  data.tar.gz: 69e43b06a5f9106e252f6f12eed0799d8f3d5c50
 SHA512:
-  metadata.gz: 91462fc95b11b40114065435eebf4eaa4ec76000ac46135516c7269fecbe14a12b8bf3db3efda20e12956d8af45dc99ba6df5c6e1dbd0beab514c40c6b68c99c
-  data.tar.gz: 581aa1aa494c4ade6f38c0d48959bdb01efe656b2f104837d5000b3b998c9dae4669d0e27a4df6c7268701a2ab793c5fa27558e50292069cbf7ac2e6c64c32ef
+  metadata.gz: 00728e26ddd82deacd6aac4e0d6784209c56cb35af5c9250396661d71c20b7937e1b0e79d8b6c730ea0e08007c08a85320d7989f5740932ef94988a103223f37
+  data.tar.gz: cda6363e2f76ea2109c91817bfc340d77dc900e8e84cf7ec72a68a760f98353d1cabda7f78e3ad439f13fa7cc79de72c7bbacd1d2e06c19071f2718d70fcf124

data/Rakefile

@@ -14,19 +14,17 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << 'spec'
+  t.pattern = 'spec/**/*_spec.rb'
   t.verbose = false
 end
 

data/app/controllers/concerns/exo/admin/{site_slug_id_filter.rb → site_restriction.rb}

@@ -1,13 +1,13 @@
 module Exo::Admin
-  module SiteSlugIdFilter
+  module SiteRestriction
     extend ActiveSupport::Concern
 
     included do
-      include ::Exo::HostFilter
+      include ::Exo::HostRestriction
       extend ClassMethods
       
       before_filter do
-        redirect_to exo.admin_root_url unless allowed_sites.include? tick.site.slug_id
+        redirect_to exo.admin_root_url unless allowed_sites.include? exo_site.slug_id
       end
     end
 

data/app/controllers/concerns/exo/host_restriction.rb

@@ -0,0 +1,32 @@
+class Exo
+  module HostRestriction
+    extend ActiveSupport::Concern
+
+    included do
+      before_filter :exo_host_acceptance!
+      before_filter :exo_host_redirection!
+
+      expose(:exo_site) { exo_router.site }
+
+      rescue_from ::Exo::Site::UnknowHostError do |e|
+        render e, status: 503
+      end
+    end
+
+    protected
+    def exo_router
+      @exo_router
+    end
+
+    def exo_host_acceptance!
+      @exo_router = Router.for_host! request.host
+    end
+
+    def exo_host_redirection!
+      if exo_router.domain_redirection?(request.host)
+        redirect_to exo_router.host_url(request.path)
+      end
+    end
+  end
+end
+  

data/app/controllers/concerns/exo/{route_filter.rb → request_restriction.rb}

@@ -1,18 +1,20 @@
 class Exo
-  module RouteFilter
+  module RequestRestriction
     extend ActiveSupport::Concern
 
     included do
-      before_filter :route_ticking!
-      
+      before_filter :exo_request_routing!
+
+      expose(:exo_route) { exo_router.route }
+
       rescue_from Exo::Route::UnknowPathError do |e|
         render e, status: 404
       end
     end
-    
+
     protected
-    def route_ticking!
-      tick.route! request
+    def exo_request_routing!
+      exo_router.for_request! request
     end
   end
 end

data/app/controllers/exo/admin/assets_controller.rb

@@ -1,17 +1,17 @@
 module Exo::Admin
-  class AssetsController < ApplicationController
+  class AssetsController < Exo::AdminController
     MODEL = Exo::Asset
-    expose(:assets) { current_site.slug_scope(MODEL).asc(:created_at) }
+    expose(:assets) { exo_site.slug_scope(MODEL).asc(:created_at) }
     expose(:current_asset) do
       if [:new, :create].include? params[:action].to_sym
         MODEL.new asset_params
       else
-        current_site.slug_scope(MODEL).find params[:id]
+        exo_site.slug_scope(MODEL).find params[:id]
       end
     end
 
     def create
-      current_asset.site = current_site
+      current_asset.site = exo_site
       #current_asset.content = params[:upload]
       if current_asset.save
         redirect_to admin_assets_url

data/app/controllers/exo/admin/ckeditor_assets_controller.rb

@@ -1,5 +1,5 @@
 module Exo::Admin
-  class CkeditorAssetsController < ApplicationController
+  class CkeditorAssetsController < Exo::AdminController
     skip_before_filter :verify_authenticity_token
     before_filter :expose_ckeditor_stuff
 
@@ -10,7 +10,7 @@ module Exo::Admin
     expose(:ckeditor_function_num) { params[:CKEditorFuncNum] }
     expose(:asset) do
       MODEL.new.tap do |a|
-        a.site = current_site
+        a.site = exo_site
         a.content = params[:upload]
       end
     end

data/app/controllers/exo/admin/ckeditor_blocks_controller.rb

@@ -1,9 +1,9 @@
 module Exo::Admin
-  class CkeditorBlocksController < ApplicationController
+  class CkeditorBlocksController < Exo::AdminController
     expose(:targeted_page) do
       _route = nil
-      Exo::PathMatcher.route_for(current_site.routes, params) do |route|
-        _route = Exo::RoutePresenter.new route
+      Exo::PathMatcher.route_for(exo_site.routes, params) do |route|
+        _route = Exo::RouteDecorator.new route
       end
       _route
     end

data/app/controllers/exo/admin/contributors_controller.rb

@@ -1,5 +1,5 @@
 module Exo::Admin
-  class ContributorsController < ApplicationController
-    expose(:contributor) { current_site.contributors.find params[:id] }
+  class ContributorsController < Exo::AdminController
+    expose(:contributor) { exo_site.contributors.find params[:id] }
   end
 end

data/app/controllers/exo/admin/items_controller.rb

@@ -1,8 +1,8 @@
 module Exo::Admin
-  class ItemsController < Exo::Admin::ApplicationController
+  class ItemsController < Exo::AdminController
     MODEL = Exo::Resource::Item
 
-    expose(:current_resource) { tick.site.site.resources.find params[:resource_id] }
+    expose(:current_resource) { exo_site.site.resources.find params[:resource_id] }
     expose(:current_item) do
       if [:new, :create].include? params[:action].to_sym
         MODEL.new item_params
@@ -12,7 +12,7 @@ module Exo::Admin
     end
 
     def create
-      current_item.site = current_site
+      current_item.site = exo_site
       current_item.resource = current_resource
 
       update

data/app/controllers/exo/admin/pages_controller.rb

@@ -1,10 +1,10 @@
 module Exo::Admin
-  class PagesController < ::Exo::Admin::ApplicationController
+  class PagesController < Exo::AdminController
     REMOVAL_REGEXP = /\Ahttps?:\/\/([a-z0-9.-:]+)\//i
     expose(:mercury_path) do
       File.join '/', params[:url].gsub(REMOVAL_REGEXP, '')
     end
-    expose(:current_page) { current_site.routes.find_by path: mercury_path }
+    expose(:current_page) { exo_site.routes.find_by path: mercury_path }
 
     def mercury_update
       params[:content].each do |slug, mercure|

data/app/controllers/exo/admin/resources_controller.rb

@@ -1,5 +1,5 @@
 module Exo::Admin
-  class ResourcesController < Exo::Admin::ApplicationController
-    expose(:current_resource) { current_site.resources.find params[:id] }
+  class ResourcesController < Exo::AdminController
+    expose(:current_resource) { exo_site.resources.find params[:id] }
   end
 end

data/app/controllers/exo/admin/routes_controller.rb

@@ -1,7 +1,7 @@
 module Exo::Admin
-  class RoutesController < Exo::Admin::ApplicationController
+  class RoutesController < Exo::AdminController
     expose(:current_route) do
-      current_site.routes.find params[:id]
+      exo_site.routes.find params[:id]
     end
 
     def edit

data/app/controllers/exo/admin/sessions_controller.rb

@@ -1,4 +1,6 @@
 class Exo::Admin::SessionsController < Devise::SessionsController
+  layout 'devise'
+
   protected
   def after_sign_in_path_for(resource)
     '/admin'

data/app/controllers/exo/admin/settings_controller.rb

@@ -1,5 +1,5 @@
 module Exo::Admin
-  class SettingsController < Exo::Admin::ApplicationController
+  class SettingsController < Exo::AdminController
     skip_before_filter :verify_authenticity_token, only: :create
 
     MODEL = Exo::Setting
@@ -7,21 +7,21 @@ module Exo::Admin
     before_filter :current_route, if: :for_route?
     helper_method :for_route?
 
-    expose(:settings) { current_site.settings }
+    expose(:settings) { exo_site.settings }
     expose(:current_setting) do
       if [:new, :create].include? params[:action].to_sym
         MODEL.new new_setting_params
       else
-        parent = for_route? ? current_route : current_site
+        parent = for_route? ? current_route : exo_site
         parent.settings.find params[:id]
       end
     end
     expose(:current_route) do
-      current_site.routes.find params[:route_id]
+      exo_site.routes.find params[:route_id]
     end
 
     def create
-      current_setting.setting_container = for_route? ? current_route : current_site
+      current_setting.setting_container = for_route? ? current_route : exo_site
       if current_setting.save
         redirect_to_parent
       else

data/app/controllers/exo/admin/site_controller.rb

@@ -1,4 +1,4 @@
 module Exo::Admin
-  class SiteController < Exo::Admin::ApplicationController
+  class SiteController < Exo::AdminController
   end
 end

data/app/controllers/exo/{admin/application_controller.rb → admin_controller.rb}

@@ -1,8 +1,8 @@
-module Exo::Admin
-  class ApplicationController < ::Exo::ApplicationController
+class Exo
+  class AdminController < ExoController
     layout 'exo/admin/application'
+
     before_filter :authenticate_contributor!
-    expose(:current_site) { tick.site.site }
 
     protected
     def allow_params key, fields

data/app/controllers/exo/gridfs_controller.rb

@@ -1,13 +1,13 @@
 class Exo
-  class GridfsController < ApplicationController
+  class GridfsController < ExoController
     def item_asset
-      item = tick.site.resource(params[:resource_slug_id]).items.find_by slug_id: params[:item_slug_id]
+      item = exo_site.resource(params[:resource_slug_id]).items.find_by slug_id: params[:item_slug_id]
       asset = item.send params[:field_slug_id].to_sym
       respond_with_asset asset
     end
 
     def asset
-      asset = tick.site.slug_scope(Exo::Asset).find_by _id: params[:id]
+      asset = exo_site.slug_scope(Exo::Asset).find_by _id: params[:id]
       if asset
         respond_with_asset asset
       else

data/app/controllers/exo/pages_controller.rb

@@ -1,23 +1,22 @@
 class Exo
-  class PagesController < ::Exo::ApplicationController
+  class PagesController < ExoController
     before_filter :fix_lookup_context
-    include RouteFilter
+    include RequestRestriction
+    helper Exo::BlockHelper
 
     def serve_page
-      if tick.route.redirection?
-        redirect_to tick.route.to_url
+      if exo_router.route.redirection?
+        redirect_to exo_router.route.to_url
       else
-        render tick.route.view_path, layout: tick.route.layout_path
+        render exo_router.route.view_path, layout: exo_router.route.layout_path
       end
     end
 
     protected
-
     def fix_lookup_context
-      # /!\ this is evil
       lookup_context.prefixes = [
-        tick.site.theme_path,
-        tick.site.nest_path('application')
+        exo_site.theme_path,
+        exo_site.nest_path('application')
       ]
     end
   end

data/app/controllers/exo_controller.rb

@@ -0,0 +1,4 @@
+class ExoController < ActionController::Base
+  protect_from_forgery with: :exception
+  include ::Exo::HostRestriction
+end

data/app/helpers/exo/block_helper.rb

@@ -4,7 +4,7 @@ module Exo::BlockHelper
     options['contenteditable'] = "true" if params[:preview]
     options[:id] = id
     options[:class] = "#{options[:class]} _block"
-    block = tick.route.block id
+    block = exo_route.block_name(id)
 
     if block
       content_tag 'div', options do

data/app/helpers/exo/resources_helper.rb

@@ -46,7 +46,7 @@ module Exo::ResourcesHelper
           hash[:value] = value.form_value
         end
       when Exo::Resource::MetaRelation
-        _resource = current_site.resource_name field.resource_slug_id
+        _resource = exo_site.resource_name field.resource_slug_id
         options[:selected] = item.value_for(field).form_value
         options[:include_blank] = false
         options[:collection] = _resource.items.asc(:name).collect {|i| [i.name, i.id.to_s]}

data/app/models/exo/app_service.rb

@@ -0,0 +1,3 @@
+class Exo::AppService < Struct.new(:name, :path)
+  
+end

data/app/models/exo/block.rb

@@ -1,13 +1,11 @@
-class Exo
-  class Block
-    include Exo::Document
-    
-    embedded_in :page, class_name: 'Exo::Route::Page'
-    
-    field :slug_id
-    field :content
+class Exo::Block
+  include Exo::Document
+  
+  embedded_in :page, class_name: 'Exo::Route::Page'
+  
+  field :slug_id
+  field :content
 
-    validates_presence_of :slug_id
-    validates_presence_of :content
-  end
+  validates_presence_of :slug_id
+  validates_presence_of :content
 end

data/app/presenters/exo/item_decorator.rb

@@ -0,0 +1,23 @@
+class Exo
+  class ItemDecorator < Draper::Decorator
+    delegate_all
+
+    def decorated_resource
+      @decorated_resource ||= wrap_resource item.resource
+    end
+
+    alias :resource :decorated_resource
+
+    def method_missing method, *params, &block
+      if meta_field = resource.meta_field method
+        item.value_for meta_field
+      else
+        item.send method, *params, &block
+      end
+    end
+
+    def wrap_resource resource
+      ResourceDecorator.new resource if resource
+    end
+  end
+end

data/app/presenters/exo/resource_decorator.rb

@@ -0,0 +1,21 @@
+class Exo
+  class ResourceDecorator < Draper::Decorator
+    delegate_all
+
+    def items
+      ScopeWraper.new resource.items, self
+    end
+    
+    def item_name slug_id
+      wrap_item items.find_by(slug_id: slug_id)
+    end
+
+    def meta_field_name name
+      resource.meta_fields.where(slug_id: name.to_s).first
+    end
+
+    def wrap_item item
+      ItemDecorator.new item if item
+    end
+  end
+end

data/app/presenters/exo/route_decorator.rb

@@ -0,0 +1,23 @@
+class Exo
+  class RouteDecorator < Draper::Decorator
+    DEFAULT_LAYOUT = '/application'
+
+    delegate_all
+
+    def redirection?
+      object.class == Exo::Route::Redirection
+    end
+
+    def view_path
+      object.site.nest_path object.view_path
+    end
+
+    def layout_path
+      object.site.nest_path(object.layout_path || DEFAULT_LAYOUT)
+    end
+
+    def block_name slug_id
+      object.blocks.where(slug_id: slug_id.to_s).first
+    end
+  end
+end