geri 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d797e72361923ed11722b43b8b3d546d5b14bb3f
-  data.tar.gz: a88e4adad49a183ed1d987db3553d34fe2870a27
+  metadata.gz: 4bd21a0f527359b20935d17812b188c81a1e5039
+  data.tar.gz: c577ba2ef036e0f54f0b78e079cee048b4ef1759
 SHA512:
-  metadata.gz: 5aa76f5e159d1d5feccb4b5377f9880af863cc4f380ed1bed4d06ed9f48325870008617917b36136b493427a3d9befed1dfa024c13deb7f2670681035412dd90
-  data.tar.gz: 8dc30f7b9224ad0f25a147265286883da7e725c79aa3c587b6dced48d4d5de859eccdf27cc6e5b83f6698eebd90679928ed7dfc9ffefbacb3eda1e5de675ed74
+  metadata.gz: 5a354bff2653c2ee996060db23cce15fce4b7f797e513876715af2d291ab87436e72ad4f8b98543345abe4f3d6e2b3323a0dd2c9bd07bf7197e7002de77653f5
+  data.tar.gz: d8690125483c74f82ecf4190c478415e39867013369abe3ac1b1a41259dc8b2e6cc2b91c9d818929274d66cf33fb0f2af0845b838b0fad8fd7d5ea0f2dd375c0

data/app/assets/stylesheets/geri/admin/editor.css.less

@@ -1,7 +1,10 @@
 #geri-editor {
   @import 'twitter/bootstrap';
   @import './skin-blue';
-
+  z-index: 9999999;
+  .container {
+    border: none;
+  }
   .navbar, .navbar > .container, .navbar .navbar-brand {
     height: 32px;
     min-height: 32px;

data/app/controllers/geri/pages_controller.rb

@@ -1,26 +1,42 @@
 module Geri
   class PagesController < ApplicationController
     before_action :set_view_path
+    helper_method :current_site
 
     def show
-      page = Page.find(params[:path])
+      page      = Page.find(params[:path], current_site, lookup_context)
       @metadata = page.metadata
-      render(file: page.file, layout: 'layout.html.erb', locals: {foo: 'bar'})
+      render inline: page.content, layout: 'layout.html.erb'
     end
 
     private
 
+    def current_site
+      Geri::Config.sites[request.host] || Geri::Config.sites[:default]
+    end
+
 
     def _normalize_layout(name)
       name
     end
 
-    def page_root
-      Rails.root.join('app', 'site')
+    def site_root
+      current_site.root
     end
 
     def set_view_path
-      prepend_view_path(page_root.to_s)
+      prepend_view_path(Rails.root.join('app', 'site').to_s)
+      prepend_view_path(site_root.to_s) # base path
+      if params[:path]
+        parts = params[:path].split('/')
+        parts.each_index do |index|
+          if index == 0
+            prepend_view_path(site_root.join(parts[index]).to_s)
+          else
+            prepend_view_path(site_root.join(*parts[0..index]).to_s)
+          end
+        end
+      end
     end
 
   end

data/app/helpers/geri/pages_helper.rb

@@ -5,6 +5,14 @@ module Geri
       @metadata[:title]
     end
 
+    def site_name
+      current_site.name
+    end
+
+    def current_site
+      Geri::Config.sites[request.host] || Geri::Config.sites[:default]
+    end
+
     def link_to_with_active(name, options = {}, html_options = {}, &block)
       html_options[:class] = html_options[:class] ? html_options[:class] + ' active' : 'active' if current_page?(options)
       link_to name, options, html_options, &block
@@ -24,10 +32,6 @@ module Geri
       concat(content_tag(:meta, '', name: :robots,      content: @metadata[:robots]))             if @metadata[:robots]
     end
 
-    def site_name
-      Geri::Config.site_name
-    end
-
     def editable(name, &block)
       name    = "#{current_page}_#{name}"
       content = Content.find_by(name: name) && geri_sanitize(Content.find_by(name: name).body)

data/app/models/geri/page.rb

@@ -2,7 +2,10 @@ module Geri
 
   # Page encapsulates a site page and it's metadata
   class Page
-    attr_reader :page_index, :file
+
+    class PageNotFoundError < ActionController::RoutingError;
+    end
+    attr_reader :page_index
 
     META_CAPTURE = /\A---(.*)\n---\B/m
 
@@ -10,44 +13,57 @@ module Geri
     #
     # @param path[string|NilClass] the url path for which to look for the page
     # @return [Page] a page object
-    def self.find(path)
-      path = '/' unless path
-      new(path)
+    def self.find(path, current_site, lookup_context)
+      path = '' unless path
+      new(path, current_site, lookup_context)
     end
 
     # @private
-    def initialize(path)
-      @path       = path
-      @file       = index_or_name
+    def initialize(path, current_site, lookup_context)
+      @path           = path
+      @current_site   = current_site
+      @lookup_context = lookup_context
     end
 
     # Returns the metadata found in the metadata section of the page as a symbolized hash
     #
     # @return [Hash] the page metadata
     def metadata
-      unless @metadata && capture_metadata
-        @metadata ||= YAML.load(capture_metadata)
+      if !@metadata && captured_metadata
+        @metadata ||= YAML.load(captured_metadata)
+        @metadata.symbolize_keys!
       end
-      @metadata.symbolize_keys!
+      @metadata || {}
     end
 
-    private
+    def content
+      @content ||= raw.gsub(META_CAPTURE, '')
+    end
 
-    def capture_metadata
-      @captured_metadata ||= META_CAPTURE.match(raw)[1]
+    def file
+      @file ||=
+        (@lookup_context.find(@path + '.html.erb') rescue false) ||
+         (@lookup_context.find(@path + '/' + 'index.html.erb') rescue false)
+      raise PageNotFoundError.new "Page not found '/#{@path}'" unless @file
+      @file
     end
 
-    def raw
-      @raw ||= File.read(file)
+    private
+
+    def captured_metadata
+      unless @captured_metadata
+        capture            = META_CAPTURE.match(raw)
+        @captured_metadata = capture ? capture[1] : nil
+      end
+      @captured_metadata
     end
 
-    def index_or_name
-      return site_root + @path + '/index.html.erb' unless File.exists?(site_root + @path + '.html.erb')
-      site_root + @path + '.html.erb'
+    def raw
+      file.source
     end
 
     def site_root
-      Rails.root.join('site').to_s
+      @current_site.root
     end
 
   end

data/app/views/geri/admin/editor/template.html.erb

@@ -9,6 +9,8 @@
           <ul class="nav navbar-nav navbar-right">
             <li><a id="geri-editor-save" class="btn btn-success disabled navbar-btn editor-link" href="">Save Changes</a></li>
             <li><a id="geri-editor-revert" class="btn btn-danger disabled navbar-btn editor-link" href="">Revert</a></li>
+            <li><%= link_to 'Admin', '/admin', class: 'btn btn-warning navbar-btn editor-link', data: {
+                confirm: 'All unsaved progress will be lost. Are you sure?' } %></li>
           </ul>
         </div>
       </nav>

data/lib/generators/geri/install/install_generator.rb

@@ -9,7 +9,7 @@ class Geri::InstallGenerator < Rails::Generators::Base
     gsub_file('config/routes.rb', 'Rails.application.routes.draw do', <<-EOF
 Rails.application.routes.draw do
   # Sets the mounted location of the Geri CMS, if you wish to mount this elsewhere simply update this line.
-  mount Geri::Engine => /
+  mount Geri::Engine => '/'
     EOF
     )
   end
@@ -29,6 +29,7 @@ Rails.application.routes.draw do
   def create_assets_directory
     empty_directory('app/site/assets')
     empty_directory('app/site/assets/vendor')
+    empty_directory('app/site/assets/images')
   end
 
   def setup_bower

data/lib/generators/geri/install/templates/index.html.erb

@@ -7,8 +7,7 @@ keywords:
   - rails cms
   - ruby on rails cms
   - ruby cms
-description: GeriCMS is an estensible open source content managment system built from the ground up with developers and
-extensibility in mind.
+description: GeriCMS is an estensible open source content managment system built from the ground up with developers and extensibility in mind.
 ---
 <nav class="navbar navbar-default">
   <div class="container">

data/lib/generators/geri/install/templates/site.js

@@ -1 +1,2 @@
-//= require jquery/dist/jquery
+//= require jquery/dist/jquery
+//= require bootstrap/dist/js/bootstrap::

data/lib/geri/config.rb

@@ -1,15 +1,16 @@
 require_relative './config/menu_item'
+require_relative './config/site'
 module Geri
   module Config
     include ActiveSupport::Configurable
-    config_accessor :admin_path                         # route to the administrative backend
-    config_accessor :menu_items                         # menu item registry
-    config_accessor :site_name                          # name of the site
+    config_accessor :admin_path # route to the administrative backend
+    config_accessor :menu_items # menu item registry
+    config_accessor :sites
 
     # Defaults
     self.admin_path  = '/admin'
     self.menu_items  = []
-    self.site_name   = 'GeriCMS'
+    self.sites       = {}
 
     def self.register_menu_item(title, path_or_options=nil, options={})
       self.menu_items << item = MenuItem.new(title, path_or_options, options)
@@ -17,12 +18,27 @@ module Geri
       self.menu_items.sort! { |a,b| a.priority <=> b.priority }
     end
 
+    def self.register_site(domain, mount_point, &block)
+      site = Site.new(domain, mount_point)
+      yield site
+      sites[domain] = site
+    end
+
     # configure override
     def self.configure(&block)
+      register_default_site
       begin
         yield self
       end
     end
 
+    private
+
+    def self.register_default_site
+      register_site :default, '/' do |site|
+        site.name = 'GeriCMS'
+      end
+    end
+
   end
 end

data/lib/geri/config/site.rb

@@ -0,0 +1,19 @@
+module Geri
+  module Config
+    class Site
+      attr_reader :domain, :mount_point, :root
+      attr_accessor :name
+
+      def initialize(domain, mount_point)
+        @domain      = domain
+        @mount_point = mount_point
+        if @mount_point == '/'
+          @root = Rails.root.join('app', 'site')
+        else
+          @root = Rails.root.join('app', 'site', *@mount_point.split('/'))
+        end
+      end
+
+    end
+  end
+end

data/lib/geri/version.rb

@@ -1,3 +1,3 @@
 module Geri
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geri
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - fugufish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -419,6 +419,7 @@ files:
 - lib/geri/cli/extension.rb
 - lib/geri/config.rb
 - lib/geri/config/menu_item.rb
+- lib/geri/config/site.rb
 - lib/geri/engine.rb
 - lib/geri/tasks.rb
 - lib/geri/tasks/create_admin_user.rb