puffer_pages 0.0.14 → 0.0.15

data/app/assets/stylesheets/codemirror.css

@@ -0,0 +1,135 @@
+html {
+  cursor: text;
+}
+
+.editbox {
+  margin: .4em;
+  padding: 0;
+  font-family: monospace;
+  font-size: 10pt;
+  color: black;
+}
+
+pre.code, .editbox {
+  color: #666;
+}
+
+.editbox p {
+  margin: 0;
+}
+
+span.css-at {
+  color: #708;
+}
+
+span.css-unit {
+  color: #281;
+}
+
+span.css-value {
+  color: #708;
+}
+
+span.css-identifier {
+  color: black;
+}
+
+span.css-selector {
+  color: #11B;
+}
+
+span.css-important {
+  color: #00F;
+}
+
+span.css-colorcode {
+  color: #299;
+}
+
+span.css-comment {
+  color: #A70;
+}
+
+span.css-string {
+  color: #A22;
+}
+
+span.js-punctuation {
+  color: #666666;
+}
+
+span.js-operator {
+  color: #666666;
+}
+
+span.js-keyword {
+  color: #770088;
+}
+
+span.js-atom {
+  color: #228811;
+}
+
+span.js-variable {
+  color: black;
+}
+
+span.js-variabledef {
+  color: #0000FF;
+}
+
+span.js-localvariable {
+  color: #004499;
+}
+
+span.js-property {
+  color: black;
+}
+
+span.js-comment {
+  color: #AA7700;
+}
+
+span.js-string {
+  color: #AA2222;
+}
+
+span.xml-tagname {
+  color: #A0B;
+}
+
+span.xml-attribute {
+  color: #281;
+}
+
+span.xml-punctuation {
+  color: black;
+}
+
+span.xml-attname {
+  color: #00F;
+}
+
+span.xml-comment {
+  color: #A70;
+}
+
+span.xml-cdata {
+  color: #48A;
+}
+
+span.xml-processing {
+  color: #999;
+}
+
+span.xml-entity {
+  color: #A22;
+}
+
+span.xml-error {
+ color: #F00 !important;
+}
+
+span.xml-text {
+  color: black;
+}

data/app/assets/stylesheets/puffer_pages.css

@@ -0,0 +1,12 @@
+.rui-tabs li
+{
+    margin-bottom: 0;
+}
+
+.CodeMirror-wrapping
+{
+    border: #ccc solid 1px;
+    font-size: 10pt;
+    padding: 3px 0;
+    border-radius: 3px;
+}

data/app/controllers/pages_controller.rb

@@ -9,8 +9,8 @@ class PagesController < ApplicationController
 
   def drops
     {
-      :self => PufferPages::Liquid::PageDrop.new(@page, @page, request),
-      :root => PufferPages::Liquid::PageDrop.new(@page.root, @page, request)
+      :self => PufferPages::Liquid::PageDrop.new(@page, @page, self),
+      :root => PufferPages::Liquid::PageDrop.new(@page.root, @page, self)
     }.stringify_keys
   end
 

data/app/controllers/puffer_pages/layouts_controller.rb

@@ -2,7 +2,7 @@ class PufferPages::LayoutsController < Puffer::Base
   unloadable
 
   setup do
-    group :cms
+    group :pages
   end
 
   index do
@@ -11,7 +11,7 @@ class PufferPages::LayoutsController < Puffer::Base
 
   form do
     field :name
-    field :body
+    field :body, :html => {:codemirror => true}
   end
 
 end

data/app/controllers/puffer_pages/pages_controller.rb

@@ -1,11 +1,10 @@
 class PufferPages::PagesController < Puffer::TreeBase
   unloadable
 
-  view_paths_fallbacks_prepend :puffer_pages
   helper :puffer_pages
 
   setup do
-    group :cms
+    group :pages
   end
 
   tree do

data/app/controllers/puffer_pages/snippets_controller.rb

@@ -2,7 +2,7 @@ class PufferPages::SnippetsController < Puffer::Base
   unloadable
 
   setup do
-    group :cms
+    group :pages
   end
 
   index do
@@ -11,7 +11,7 @@ class PufferPages::SnippetsController < Puffer::Base
 
   form do
     field :name
-    field :body
+    field :body, :html => {:codemirror => true}
   end
 
 end

data/app/helpers/puffer_pages_helper.rb

@@ -14,7 +14,7 @@ module PufferPagesHelper
   end
 
   def inherited_layout
-    record.inherited_layout_name && !record.root? ? [[t('puffer.inherited_layout', :name => record.inherited_layout_name), '']] : []
+    record.inherited_layout_name && !record.root? ? [[t('puffer_pages.inherited_layout', :name => record.inherited_layout_name), '']] : []
   end
 
   def possible_statuses

data/app/models/layout.rb

@@ -1,6 +1,2 @@
-class Layout < ActiveRecord::Base
-  validates_presence_of :name
-  validates_uniqueness_of :name
-
-  has_many :pages
+class Layout < PufferPages::Layout
 end

data/app/models/page.rb

@@ -1,106 +1,2 @@
-class Page < ActiveRecord::Base
-
-  acts_as_nested_set
-
-  scope :published, where(:status => 'published')
-
-  def self.statuses
-    %w(draft hidden published)
-  end
-
-  def self.find_page location
-    page = PufferPages.single_section_page_path ?
-      Page.find_by_slug(location) : Page.find_by_location(location)
-    raise ActiveRecord::RecordNotFound if page.nil? || page.draft?
-    page
-  end
-
-  has_many :page_parts, :order => "name = '#{PufferPages.primary_page_part_name}' desc, name", :dependent => :destroy
-  accepts_nested_attributes_for :page_parts, :allow_destroy => true
-  belongs_to :layout, :primary_key => :name, :foreign_key => :layout_name
-
-  validates_presence_of :name
-  validates_uniqueness_of :slug, :scope => (:parent_id unless PufferPages.single_section_page_path)
-  validates_inclusion_of :status, :in => Page.statuses
-  validates_format_of :slug,
-    :with => /\A([\w]+[\w-]*(\.[\w]+)?|\*)\Z/,
-    :message => :slug_format,
-    :unless => :root?
-  validate do |page|
-    page.errors.add(:layout_name, :blank) unless page.inherited_layout_name.present?
-    page.errors.add(:slug, :root_slug_format) if page.root? && !page.slug.nil?
-  end
-
-  attr_protected :location
-
-  before_validation :defaultize_attributes
-  def defaultize_attributes
-    self.status ||= 'draft'
-    self.slug = slug.presence
-    self.location = [swallow_nil{parent.location}, slug].compact.join('/').presence
-  end
-
-  before_update :update_locations
-  def update_locations
-    Page.update_all "location = replace(location, '#{location_was}', '#{location}')", ["location like ?", location_was + '%'] if location_changed?
-  end
-
-  after_save :create_main_part
-  def create_main_part
-    page_parts.create(:name => PufferPages.primary_page_part_name) if root?
-  end
-
-  statuses.each do |status_name|
-    define_method "#{status_name}?" do status == status_name end
-  end
-
-  def to_location
-    PufferPages.single_section_page_path ? slug : location
-  end
-
-  def render(drops_or_context)
-    if inherited_layout
-      @template = Liquid::Template.parse(inherited_layout.body)
-      tracker.cleanup @template.render(drops_or_context, :registers => {:tracker => tracker, :page => self, :file_system => PufferPages::Liquid::FileSystem.new})
-    else
-      inherited_page_parts.map{|part| part.render(drops_or_context, self)}.join
-    end
-  end
-
-  def tracker
-    @tracker ||= PufferPages::Liquid::Tracker.new
-  end
-
-  def inherited_layout_page
-    @inherited_layout_page ||= layout_name? ? self : swallow_nil{parent.inherited_layout_page}
-  end
-
-  def inherited_layout_name
-    @inherited_layout_name ||= swallow_nil{inherited_layout_page.layout_name}
-  end
-
-  def inherited_layout
-    @inherited_layout ||= swallow_nil{inherited_layout_page.layout}
-  end
-
-  def render_layout
-    inherited_layout ? false : inherited_layout_name
-  end
-
-  def inherited_page_parts
-    PagePart.where(:page_parts => {:page_id => self_and_ancestors.map(&:id)}).joins(:page).order("page_parts.name = '#{PufferPages.primary_page_part_name}' desc, page_parts.name, pages.lft desc").uniq_by &:name
-  end
-
-  def part name
-    inherited_page_parts.detect {|part| part.name == name}
-  end
-
-  def is_layout?
-    self.location.include?('*')
-  end
-
-  def content_type
-    Rack::Mime.mime_type(File.extname(slug.to_s), 'text/html')
-  end
-
+class Page < PufferPages::Page
 end

data/app/models/page_part.rb

@@ -1,21 +1,2 @@
-class PagePart < ActiveRecord::Base
-  belongs_to :page
-
-  validates_presence_of :name
-  validates_uniqueness_of :name, :scope => :page_id
-
-  def render(drops_or_context, page = nil)
-    template = Liquid::Template.parse(body)
-    result = tracker.cleanup template.render(drops_or_context,  :registers => {:tracker => tracker, :page => page, :file_system => PufferPages::Liquid::FileSystem.new})
-    main? ? result : "<% content_for :#{name} do %>#{result}<% end %>"
-  end
-
-  def tracker
-    @tracker ||= PufferPages::Liquid::Tracker.new
-  end
-
-  def main?
-    name == PufferPages.primary_page_part_name
-  end
-
+class PagePart < PufferPages::PagePart
 end

data/app/models/puffer_pages/layout.rb

@@ -0,0 +1,8 @@
+class PufferPages::Layout < ActiveRecord::Base
+  self.abstract_class = true
+
+  validates_presence_of :name
+  validates_uniqueness_of :name
+
+  has_many :pages, :class_name => '::Page'
+end

data/app/models/puffer_pages/page.rb

@@ -0,0 +1,107 @@
+class PufferPages::Page < ActiveRecord::Base
+  self.abstract_class = true
+
+  def self.inherited base
+    base.acts_as_nested_set
+    super
+  end
+
+  scope :published, where(:status => 'published')
+
+  def self.statuses
+    %w(draft hidden published)
+  end
+
+  def self.find_page location
+    page = PufferPages.single_section_page_path ?
+      ::Page.find_by_slug(location) : ::Page.find_by_location(location)
+    raise ActiveRecord::RecordNotFound if page.nil? || page.draft?
+    page
+  end
+
+  has_many :page_parts, :order => "name = '#{PufferPages.primary_page_part_name}' desc, name", :dependent => :destroy, :class_name => '::PagePart'
+  accepts_nested_attributes_for :page_parts, :allow_destroy => true
+  belongs_to :layout, :primary_key => :name, :foreign_key => :layout_name, :class_name => '::Layout'
+
+  validates_presence_of :name
+  validates_uniqueness_of :slug, :scope => (:parent_id unless PufferPages.single_section_page_path)
+  validates_inclusion_of :status, :in => statuses
+  validates_format_of :slug, :with => /\A\s*\Z/, :message => :root_slug_format, :if => :root?
+  validates_format_of :slug, :with => /\A([\w]+[\w-]*(\.[\w]+)?|\*)\Z/, :message => :slug_format, :unless => :root?
+  validate do |page|
+    page.errors.add(:layout_name, :blank) unless page.inherited_layout_name.present?
+  end
+
+  attr_protected :location
+
+  before_validation :defaultize_attributes
+  def defaultize_attributes
+    self.status ||= 'draft'
+    self.slug = slug.presence
+    self.location = [swallow_nil{parent.location}, slug].compact.join('/').presence
+  end
+
+  before_update :update_locations
+  def update_locations
+    self.class.update_all "location = replace(location, '#{location_was}', '#{location}')", ["location like ?", location_was + '%'] if location_changed?
+  end
+
+  after_save :create_main_part
+  def create_main_part
+    page_parts.create(:name => PufferPages.primary_page_part_name) if root?
+  end
+
+  statuses.each do |status_name|
+    define_method "#{status_name}?" do status == status_name end
+  end
+
+  def to_location
+    PufferPages.single_section_page_path ? slug : location
+  end
+
+  def render(drops_or_context)
+    if inherited_layout
+      @template = Liquid::Template.parse(inherited_layout.body)
+      tracker.cleanup @template.render(drops_or_context, :registers => {:tracker => tracker, :page => self, :file_system => PufferPages::Liquid::FileSystem.new})
+    else
+      inherited_page_parts.map{|part| part.render(drops_or_context, self)}.join
+    end
+  end
+
+  def tracker
+    @tracker ||= PufferPages::Liquid::Tracker.new
+  end
+
+  def inherited_layout_page
+    @inherited_layout_page ||= layout_name? ? self : swallow_nil{parent.inherited_layout_page}
+  end
+
+  def inherited_layout_name
+    @inherited_layout_name ||= swallow_nil{inherited_layout_page.layout_name}
+  end
+
+  def inherited_layout
+    @inherited_layout ||= swallow_nil{inherited_layout_page.layout}
+  end
+
+  def render_layout
+    inherited_layout ? false : inherited_layout_name
+  end
+
+  def inherited_page_parts
+    ::PagePart.where(:page_parts => {:page_id => self_and_ancestors.map(&:id)}).joins(:page).order("page_parts.name = '#{PufferPages.primary_page_part_name}' desc, page_parts.name, pages.lft desc").uniq_by &:name
+  end
+
+  def part name
+    inherited_page_parts.detect {|part| part.name == name}
+  end
+
+  def is_layout?
+    self.location.include?('*')
+  end
+
+  def content_type
+    Rack::Mime.mime_type(File.extname(slug.to_s), 'text/html')
+  end
+
+end

data/app/models/puffer_pages/page_part.rb

@@ -0,0 +1,23 @@
+class PufferPages::PagePart < ActiveRecord::Base
+  self.abstract_class = true
+
+  belongs_to :page, :class_name => '::Page'
+
+  validates_presence_of :name
+  validates_uniqueness_of :name, :scope => :page_id
+
+  def render(drops_or_context, page = nil)
+    template = Liquid::Template.parse(body)
+    result = tracker.cleanup template.render(drops_or_context,  :registers => {:tracker => tracker, :page => page, :file_system => PufferPages::Liquid::FileSystem.new})
+    main? ? result : "<% content_for :#{name} do %>#{result}<% end %>"
+  end
+
+  def tracker
+    @tracker ||= PufferPages::Liquid::Tracker.new
+  end
+
+  def main?
+    name == PufferPages.primary_page_part_name
+  end
+
+end

data/app/models/puffer_pages/snippet.rb

@@ -0,0 +1,6 @@
+class PufferPages::Snippet < ActiveRecord::Base
+  self.abstract_class = true
+
+  validates_presence_of :name
+  validates_uniqueness_of :name
+end

data/app/models/snippet.rb

@@ -1,4 +1,2 @@
-class Snippet < ActiveRecord::Base
-  validates_presence_of :name
-  validates_uniqueness_of :name
+class Snippet < PufferPages::Snippet
 end

data/app/views/puffer_pages/{_page_part_builder.html.erb → pages/_page_part_builder.html.erb}

@@ -1,3 +1,3 @@
 <%= page_part_builder.puffer_field :name, :type => :hidden %>
-<%= page_part_builder.puffer_field :body, :type => :page_parts_body %>
+<%= page_part_builder.puffer_field :body, :type => :page_parts_body, :html => {:codemirror => true} %>
 <%= page_part_builder.puffer_field :_destroy, :type => :hidden, :html => { :class => 'destroy_mark' } %>

data/config/locales/en.yml

@@ -1,3 +1,5 @@
 en:
-  puffer:
+  puffer_pages:
     inherited_layout: inherited (%{name})
+    tree_page:
+      view: view

data/lib/puffer/inputs/page_parts.rb

@@ -6,7 +6,6 @@ module Puffer
         template.render :partial => 'page_parts', :locals => {:builder => builder}
       end
 
-
     end
   end
 end

data/lib/puffer/inputs/page_parts_body.rb

@@ -6,7 +6,6 @@ module Puffer
         input
       end
 
-
     end
   end
 end

data/lib/puffer/tree_base.rb

@@ -2,12 +2,11 @@ module Puffer
   class TreeBase < Puffer::Base
     unloadable
 
-    view_paths_fallbacks_prepend :puffer_tree
     helper :puffer_tree
 
     define_fields :tree
 
-    def self.tree_fields
+    def self.tree_fi elds
       _tree_fields.presence || index_fields
     end
 

data/lib/puffer_pages/engine.rb

@@ -2,10 +2,6 @@ module PufferPages
   class Engine < Rails::Engine
     config.autoload_paths << File.join(root, 'lib')
 
-    initializer 'puffer_pages.add_cells_paths', :after => :add_view_paths do
-      ::Cell::Base.prepend_view_path(Cells::DEFAULT_VIEW_PATHS.map { |path| File.join(root, path) })
-    end
-
     initializer 'puffer_pages.add_puffer_pages_route', :after => :add_builtin_route do |app|
       app.routes_reloader.paths << File.join(root, 'config/puffer_routes.rb')
     end

data/lib/puffer_pages/liquid/file_system.rb

@@ -2,15 +2,18 @@ module PufferPages
   module Liquid
     class FileSystem < ::Liquid::BlankFileSystem
 
-      def read_template_file(context, template_name)
-        template_path = context[template_name]
-
+      def read_template_file(template_path, context)
         case template_type template_path
         when :snippet then
           template_path = template_path.gsub(/^snippets\//, '')
           snippet = Snippet.find_by_name(template_path)
           raise ::Liquid::FileSystemError, "No such snippet '#{template_path}' found" unless snippet
           snippet.body
+        when :layout then
+          template_path = template_path.gsub(/^layouts\//, '')
+          layout = Layout.find_by_name(template_path)
+          raise ::Liquid::FileSystemError, "No such layout '#{template_path}' found" unless layout
+          layout.body
         when :page_part then
           page_part = context.registers[:page].part(template_path)
           raise ::Liquid::FileSystemError, "No such page_part '#{template_path}' found for current page" unless page_part
@@ -20,6 +23,7 @@ module PufferPages
 
       def template_type template_path
         return :snippet if template_path.start_with? 'snippets/'
+        return :layout if template_path.start_with? 'layouts/'
         return :page_part
       end
 

data/lib/puffer_pages/liquid/page_drop.rb

@@ -6,14 +6,16 @@ module PufferPages
       include Rails.application.routes.url_helpers
 
       delegate *(Page.statuses.map {|s| "#{s}?"} << {:to => :page})
-      delegate :root, :name, :title, :description, :keywords, :created_at, :updated_at, :to => :page
+      delegate :name, :title, :description, :keywords, :created_at, :updated_at, :to => :page
 
-      def initialize page, current_page = nil, request = nil
-        @page, @request, @current_page = page, request, current_page
+      def initialize page, current_page = nil, controller = nil
+        @page, @current_page, @controller = page, current_page, controller
       end
 
-      def parent
-        @parent ||= self.class.new(page.parent, current_page, request)
+      %w(parent root).each do |attribute|
+        define_method attribute do
+          instance_variable_get("@#{attribute}") || instance_variable_set("@#{attribute}", self.class.new(page.parent, current_page, request))
+        end
       end
 
       %w(ancestors self_and_ancestors children self_and_children siblings self_and_siblings descendants, self_and_descendants).each do |attribute|
@@ -42,9 +44,14 @@ module PufferPages
         page.id == drop.send(:page).id
       end
 
+      def before_method method
+        swallow_nil{page.part(method).body}
+      end
+
     private
 
-      attr_reader :page, :request, :current_page
+      attr_reader :page, :current_page, :controller
+      delegate :env, :request, :to => :controller, :allow_nil => true
 
     end
   end