geri 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe4c3c38c97222fc7f0ad758241d3686dee8ee1
-  data.tar.gz: 43935f0a966279c52f547458b93e44c762bbeb7b
+  metadata.gz: 25a454f644b7531546f5812327df98695da4ad51
+  data.tar.gz: 89ca8936b4d0140ab659849b5185c0c45ab22854
 SHA512:
-  metadata.gz: ca6bb66b6ecb6032a9bb02be772f00b577887a53fa53c2d2d033c8833e4965c8993be518c2693182f8b02a959e2a29f43876efb88ed0c78974502b2224294b50
-  data.tar.gz: b32ed03c47f5b9ca47218fdff083be047022e0c942ab5ba6b450ff6d01544ac5b1229f467198c1174c02bde367e346317ef86fe02c05650c25c56cf0a5fcbf94
+  metadata.gz: ecb4a4bb6c4b4ca7f6bebae8fa965e781ce1e20fc3b5003a308ababe3a09835f3f592928d57a639a16dcb4330668afca98c7f5cdba7dce5e9126720620b96bc3
+  data.tar.gz: 41d8425317b99fee0b023a2428d3fe1d2c9b98e3c0c5d0a155792cf8655c6c53c1ccf3657d38de777b9d5a6198d6f16a42f2a727b053bcf6667c6403b61193d4

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

@@ -13,6 +13,7 @@
  *= require twitter/bootstrap
  *= require ./admin/app
  *= require ./admin/skin-blue
+ *= require rails_bootstrap_forms
  *= require_self
  */
 

data/app/controllers/geri/admin/editor_controller.rb

@@ -2,7 +2,7 @@ require_dependency "geri/application_controller"
 
 module Geri
   class Admin::EditorController < ApplicationController
-    include Geri::Admin::PagesHelper
+    include Geri::PagesHelper
     skip_before_action :verify_authenticity_token, only: [:update_contents]
 
 

data/app/controllers/geri/pages_controller.rb

@@ -3,19 +3,13 @@ module Geri
     before_action :set_view_path
 
     def show
-      render render_options_for_path(params[:path])
+      page = Page.find(params[:path])
+      @metadata = page.metadata
+      render(file: page.file, layout: 'layout.html.erb', locals: {foo: 'bar'})
     end
 
     private
 
-    def render_options_for_path(path)
-      return { file: 'index.html.erb', layout: 'layout.html.erb' } unless path
-      if File.exists?(page_root.join("#{path.underscore}.html.erb"))
-        { file: path.underscore, layout: 'layout.html.erb' }
-      else
-        { file: "#{path.underscore}/index", layout: 'layout.html.erb' }
-      end
-    end
 
     def _normalize_layout(name)
       name

data/app/helpers/geri/{admin/pages_helper.rb → pages_helper.rb}

@@ -1,5 +1,14 @@
 module Geri
-  module Admin::PagesHelper
+  module PagesHelper
+
+    def title
+      @metadata[:title]
+    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
+    end
 
     def geri_sanitize(content)
       ActionController::Base.helpers.sanitize(content, {
@@ -8,6 +17,17 @@ module Geri
       })
     end
 
+    def meta_tags
+      concat(content_tag(:meta, '', name: :copyright,   content: @metadata[:copyright]))          if @metadata[:copyright]
+      concat(content_tag(:meta, '', name: :description, content: @metadata[:description]))        if @metadata[:description]
+      concat(content_tag(:meta, '', name: :keywords,    content: @metadata[:keywords].join(','))) if @metadata[:keywords]
+      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

@@ -0,0 +1,54 @@
+module Geri
+
+  # Page encapsulates a site page and it's metadata
+  class Page
+    attr_reader :page_index, :file
+
+    META_CAPTURE = /\A---(.*)\n---\B/m
+
+    # Finds a page within the site and returns a new Page instance
+    #
+    # @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)
+    end
+
+    # @private
+    def initialize(path)
+      @path       = path
+      @file       = index_or_name
+    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)
+      end
+      @metadata.symbolize_keys!
+    end
+
+    private
+
+    def capture_metadata
+      @captured_metadata ||= META_CAPTURE.match(raw)[1]
+    end
+
+    def raw
+      @raw ||= File.read(file)
+    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'
+    end
+
+    def site_root
+      Rails.root.join('site').to_s
+    end
+
+  end
+end

data/app/views/geri/admin/shared/_aside.html.erb

@@ -9,7 +9,7 @@
     </div>
     <ul class="sidebar-menu">
       <li class="header"><%= t('admin.aside.main_navigation') %></li>
-      <%= render @menu_items %>
+      <%= render partial: 'geri/admin/shared/menu_item', collection: @menu_items %>
     </ul>
   </section>
   <!-- /.sidebar -->

data/config/initializers/geri_template_handler.rb

@@ -0,0 +1,14 @@
+class GeriTemplateHandler
+  def self.call(template)
+    options = {
+      locals:       template.locals,
+      virtual_path: template.virtual_path,
+      updated_at:   template.updated_at
+    }
+    source = template.source.gsub(Geri::Page::META_CAPTURE, '')
+    template = ActionView::Template.new(source, template.identifier, template.handler, options)
+    ActionView::Template::Handlers::ERB.call(template)
+  end
+end
+
+ActionView::Template.register_template_handler(:erb, GeriTemplateHandler)

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

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

@@ -1,9 +1,15 @@
-<%# METADATA %>
-<% title       'GeriCMS' %>
-<% keywords    'cms', 'gericms', 'rails cms', 'ruby cms' %>
-<% description 'GeriCMS is a powerful Rails based CMS designed from the ground up for developers.' %>
-
-<%# CONTENT %>
+---
+title: GeriCMS
+keywords:
+  - cms
+  - geri cms
+  - geri digital
+  - 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.
+---
 <nav class="navbar navbar-default">
   <div class="container">
     <div class="navbar-header">

data/lib/generators/geri/install/templates/initializer.rb

@@ -4,9 +4,7 @@ Geri::Config.configure do |c|
   # c.admin_path = 'admin'
 
   #Set the website name
-  c.site_name = 'GeriCMS'
+  # c.site_name = 'GeriCMS'
 
-  # Sets the mount point for the engine
-  # c.mount_point =
 
 end

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

@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>GeriCMS | <%= page_title %></title>
+    <title>GeriCMS | <%= title %></title>
     <%= meta_tags %>
     <%= stylesheet_link_tag 'site', media: 'all' %>
   </head>

data/lib/geri/config.rb

@@ -3,14 +3,13 @@ module Geri
   module Config
     include ActiveSupport::Configurable
     config_accessor :admin_path                         # route to the administrative backend
-    config_accessor :menu_items, instance_reader: false # menu item registry
+    config_accessor :menu_items                         # menu item registry
     config_accessor :site_name                          # name of the site
-    config_accessor :mount_point                        # sets the mount point for the Geri::Engine
 
     # Defaults
     self.admin_path  = '/admin'
     self.menu_items  = []
-    self.mount_point = '/'
+    self.site_name   = 'GeriCMS'
 
     def self.register_menu_item(title, path_or_options=nil, options={})
       self.menu_items << item = MenuItem.new(title, path_or_options, options)

data/lib/geri/engine.rb

@@ -29,6 +29,12 @@ module Geri
         %w{ geri/admin/editor.css geri/admin/editor.js }
     end
 
+    initializer :add_all_site_images_to_assets do
+      Dir.glob(Rails.root.join('app', 'site', 'assets', 'images', '**').to_s).each do |asset|
+        config.assets.precompile << File.basename(asset)
+      end
+    end
 
   end
+
 end

data/lib/geri/version.rb

@@ -1,3 +1,3 @@
 module Geri
-  VERSION = "0.0.1"
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geri
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - fugufish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -366,18 +366,18 @@ files:
 - app/controllers/geri/pages_controller.rb
 - app/helpers/geri/admin/dashboard_helper.rb
 - app/helpers/geri/admin/editor_helper.rb
-- app/helpers/geri/admin/pages_helper.rb
 - app/helpers/geri/admin/partials_helper.rb
 - app/helpers/geri/admin/password_resets_helper.rb
 - app/helpers/geri/admin/sessions_helper.rb
 - app/helpers/geri/admin_helper.rb
 - app/helpers/geri/admin_users_helper.rb
 - app/helpers/geri/application_helper.rb
-- app/helpers/geri/meta_helper.rb
+- app/helpers/geri/pages_helper.rb
 - app/mailers/application_mailer.rb
 - app/mailers/geri/admin_user_mailer.rb
 - app/models/geri/admin_user.rb
 - app/models/geri/content.rb
+- app/models/geri/page.rb
 - app/models/geri/password_reset.rb
 - app/models/geri/session.rb
 - app/views/geri/admin/admin_users/_form.html.erb
@@ -397,6 +397,7 @@ files:
 - app/views/layouts/mailer.html.erb
 - app/views/layouts/mailer.text.erb
 - config/initializers/geri.rb
+- config/initializers/geri_template_handler.rb
 - config/initializers/sorcery.rb
 - config/locales/devise.en.yml
 - config/locales/en.yml

data/app/helpers/geri/meta_helper.rb

@@ -1,32 +0,0 @@
-module Geri
-  module MetaHelper
-    attr_reader :page_title
-
-    def title(text)
-      @page_title = text
-    end
-
-    def description(text)
-      meta description: text
-    end
-
-    def keywords(*keywords)
-      meta keywords: keywords
-    end
-
-    def meta(options=nil)
-      @meta ||= {}
-      @meta.reverse_merge!(options) if options
-      @meta
-    end
-
-    def meta_tags
-      html = ''.html_safe
-      meta.each do |name, content|
-        html << content_tag(:meta, '', name: name, content: (content.is_a?(Array) ? content.join(', ') : content))
-      end
-      html
-    end
-
-  end
-end