honey-cms 0.3.4 → 0.3.5

data/app/controllers/cms/pages_controller.rb

@@ -1,6 +1,6 @@
 class CMS::PagesController < ApplicationController
   def show
-    @page = params[:page]
+    @page = CMS::Configuration.pages.find{|p| p.name == params[:page]}
   end
 
   def static_page

data/app/views/cms/pages/show.html.haml

@@ -1,3 +1,3 @@
-.cms-page{class: "cms-#{@page}-page"}
-  = cms_page_area :"cms_#{@page}_page" do
-    %h1= @page.capitalize
+.cms-page{class: "cms-#{@page.name}-page"}
+  = cms_page_area :"cms_#{@page.name}_page", @page.options do
+    %h1= @page.name.capitalize

data/lib/cms/helper.rb

@@ -1,6 +1,10 @@
 # encoding: UTF-8
 
 module CMS::Helper
+  def markdown text
+    Markdown.render(text).html_safe
+  end
+
   def cms_file name, size = false
     if file = CMS::FileUpload.find_by_name(name) then return file end
     opts = {name: name}
@@ -24,15 +28,16 @@ module CMS::Helper
   end
 
 
-  def cms_page_area name, &block
+  def cms_page_area name, options = {}, &block
     page_area = if area = CMS::PageArea.find_by_name(name) then area else CMS::PageArea.new({name: name}, without_protection: true) end
+    options[:editable] = true unless options.key?(:editable)
 
-    if admin?
+    if admin? && options[:editable]
       content_tag :div, role: 'html-editor' do
         out = content_tag(:div, class: 'cms-page-area', role: 'display') do
           display  = ''.html_safe
           display << cms_page_area_edit_link if admin?
-          display << render_cms_page_area_content(page_area, &block)
+          display << render_cms_page_area_content(page_area, options, &block)
         end
 
         out << content_tag(:div, role: 'editor') do
@@ -45,14 +50,14 @@ module CMS::Helper
       end
     else
       content_tag :div, class: 'cms-page-area' do
-        render_cms_page_area_content(page_area, &block)
+        render_cms_page_area_content(page_area, options, &block)
       end
     end
   rescue Exception => e
     if Rails.env.production? then '' else raise e end
   end
 
-  def render_cms_page_area_content page_area, &block
+  def render_cms_page_area_content page_area, options = {}, &block
     if page_area.content.present? && !page_area.default
       content = page_area.content
     elsif block_given?
@@ -61,6 +66,10 @@ module CMS::Helper
       page_area.save!
     end
 
+    if options[:format].try(:to_s) == 'markdown'
+      content = markdown(content)
+    end
+
     content_tag(:div, class: 'content') do
       cms_content_parse(content) if content.present?
     end

data/lib/cms/page.rb

@@ -1,8 +1,11 @@
 class CMS::Page
-  attr_reader :route, :options
+  attr_reader :name, :route, :options
 
   def initialize route, options
-    @options = options
+    @options = options.reverse_merge({
+      editable: true
+    })
+    @name = route
     @route = (options[:route] || route).dup
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honey-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors: