puffer_pages 0.0.2 → 0.0.3

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem 'rails', '~> 3.0.3'
 gem 'liquid'
 gem 'nested_set'
-gem 'puffer', '>= 0.0.11'
+gem 'puffer', '>= 0.0.13'
 gem 'will_paginate', '~> 3.0.pre2'
 gem 'cells', '~> 3.4.4'
 

data/Gemfile.lock

@@ -82,7 +82,7 @@ GEM
       railties (>= 3.0.0)
     nokogiri (1.4.4)
     polyglot (0.3.1)
-    puffer (0.0.11)
+    puffer (0.0.13)
       cells (~> 3.4.4)
       rails (~> 3.0.3)
       will_paginate (~> 3.0.pre2)
@@ -105,19 +105,19 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    rspec-rails (2.4.1)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.4.0)
+      rspec (~> 2.5.0)
     rubyzip (0.9.4)
     selenium-webdriver (0.1.2)
       childprocess (~> 0.1.5)
@@ -148,7 +148,7 @@ DEPENDENCIES
   liquid
   mongrel
   nested_set
-  puffer (>= 0.0.11)
+  puffer (>= 0.0.13)
   rails (~> 3.0.3)
   rspec-rails
   sqlite3-ruby

data/README.md

@@ -0,0 +1,63 @@
+# Puffer pages is lightweight rails 3 CMS
+
+Interface of pages based on [puffer](https://github.com/puffer/puffer)
+
+## Keyfeatures
+
+* Full rails integration. Puffer pages is part of rails and you can different features related to pages in rails application directly
+* Flexibility. Puffer designed to be as flexible as possible, so you can create your own functionality easily.
+* Layouts. You can use rails layouts for pages and you can use pages as action layouts!
+
+## Installation.
+
+You can instal puffer as a gem:
+<pre>gem install puffer_pages</pre>
+Or in Gemfile:
+<pre>gem "puffer_pages"</pre>
+Next step is:
+<pre>rails g puffer_pages:install</pre>
+This will install puffer pages config file in your initializers, some css/js, controllers and migrations
+<pre>rake db:migrate</pre>
+
+## Introduction.
+
+The first thing, you should do - setup routes if you want pages path different from /(*path).
+Just put in your routes.rb:
+<pre>puffer_page "pages/(*path)" => 'whatever#show'</pre>
+Default pages route you can see with rake routes.
+
+Puffer pages is radiant-like cms, so it has layouts, snippets and pages.
+Puffer pages use liquid as template language.
+
+## Pages.
+Pages - tree-based structure of site.
+Every page has one or more page parts.
+
+## Layouts.
+Layout is page canvas, so you can draw page parts on it.
+In puffer pages you can use puffer pages layouts or applcation layouts.
+
+### Puffer pages layouts
+For puffer pages layouts page parts placeholder is liquid tag yield.
+<pre>{% yield [page_part_name] %}</pre>
+
+If no page_part_name specified, puffer layout will use page part with default name (`body`). You can change defaul page part name in puffer pages setup initializer.
+
+### Application layouts.
+For application layout page part body will be inserted instead of SUDDENLY! <%= yield %>
+Rules are the same. If no page part name specified puffer will use page part with default name.
+
+So, main page part is action view and other are partials. So easy.
+
+## Liquid.
+
+The first tag was {% yield %}
+Also, you can acces current page and root page from puffer pages templates.
+Page named `self` in templates:
+<pre>{{ self.name }}</pre>
+And root page:
+<pre>{{ root.name }}</pre>
+
+Also you can do anything you can do with [liquid](http://github.com/tobi/liquid/)
+
+`self` and `root` are both instances of page drop. View [this](https://github.com/puffer/puffer_pages/blob/master/lib/puffer_pages/liquid/page_drop.rb) to find list of possible page drop methods

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/app/controllers/pages_controller.rb

@@ -1,8 +1,8 @@
 class PagesController < ApplicationController
 
   def index
-    @page = Page.find_page("/#{params[:path]}")
-    render :inline => @page.render(drops), :layout => @page.render_layout, :content_type => page.content_type
+    @page = Page.find_page params[:path]
+    render :inline => @page.render(drops), :layout => @page.render_layout, :content_type => @page.content_type
   end
 
   private

data/app/controllers/puffer_pages/layouts_controller.rb

@@ -1,6 +1,10 @@
-class PufferPages::LayoutsController < PufferPages::Base
+class PufferPages::LayoutsController < Puffer::Base
   unloadable
 
+  configure do
+    group :cms
+  end
+
   index do
     field :name
   end

data/app/controllers/puffer_pages/pages_controller.rb

@@ -1,6 +1,17 @@
-class PufferPages::PagesController < PufferPages::Base
+class PufferPages::PagesController < Puffer::TreeBase
   unloadable
 
+  view_paths_fallbacks_prepend :puffer_pages
+  helper :puffer_pages
+
+  configure do
+    group :cms
+  end
+
+  tree do
+    field :name, :render => :tree_page
+  end
+
   index do
     field :name
     field :slug
@@ -9,24 +20,15 @@ class PufferPages::PagesController < PufferPages::Base
   end
 
   form do
-    field :parent_id, :type => :hidden
     field :name
     field :slug
+    field :page_parts, :type => :page_parts
     field :layout_name, :select => :possible_layouts
-    field :status, :select => Page.statuses
+    field :status, :select => :possible_statuses
     field :title
     field :description
     field :keywords
-  end
-
-  member do
-    get :inherit
-  end
-
-  def inherit
-    @parent = resource.member
-    @page = @parent.children.new
-    render 'new'
+    field :parent_id, :type => :hidden
   end
 
 end

data/app/controllers/puffer_pages/snippets_controller.rb

@@ -1,6 +1,10 @@
-class PufferPages::SnippetsController < PufferPages::Base
+class PufferPages::SnippetsController < Puffer::Base
   unloadable
 
+  configure do
+    group :cms
+  end
+
   index do
     field :name
   end

data/app/helpers/puffer_pages_helper.rb

@@ -16,4 +16,12 @@ module PufferPagesHelper
     record.inherited_layout_name ? [[t('puffer.inherited_layout', :name => record.inherited_layout_name), '']] : []
   end
 
+  def possible_statuses
+    Page.statuses
+  end
+
+  def tree_page record
+    render :partial => 'tree_page', :object => record
+  end
+
 end

data/app/helpers/puffer_tree_helper.rb

@@ -0,0 +1,11 @@
+module PufferTreeHelper
+
+  def puffer_tree hash, options = {}, &block
+    content_tag :ul, options do
+      hash.keys.each do |node|
+        block.call node, render_tree(hash[node], &block)
+      end
+    end if hash.present?
+  end
+
+end

data/app/models/page.rb

@@ -1,6 +1,3 @@
-class LayoutError < StandardError
-end
-
 class Page < ActiveRecord::Base
 
   acts_as_nested_set
@@ -20,9 +17,11 @@ class Page < ActiveRecord::Base
   def self.find_page location
     page = Page.find_by_location location
     raise ActiveRecord::RecordNotFound if page.nil? || page.draft?
+    page
   end
 
-  has_many :page_parts, :order => "name = '#{PufferPages::MAIN_PART}' desc, name", :dependent => :destroy
+  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
@@ -31,11 +30,11 @@ class Page < ActiveRecord::Base
   end
   validates_uniqueness_of :slug, :scope => :parent_id
   validates_format_of :slug,
-    :with => /\A([a-zA-Z0-9]+[\w-]*(\.[a-zA-Z0-9]+)?|\*)\Z/,
+    :with => /\A([\w]+[\w-]*(\.[\w]+)?|\*)\Z/,
     :message => :slug_format,
     :unless => :root?
   validates_format_of :slug,
-    :with => /\A\/\Z/,
+    :with => /\A\Z/,
     :message => :root_slug_format,
     :if => :root?
   validates_inclusion_of :status, :in => Page.statuses
@@ -49,7 +48,7 @@ class Page < ActiveRecord::Base
 
   before_save :update_location
   def update_location
-    self.location = [(swallow_nil{parent.location} || '/'), slug].compact.join('/').gsub(/\/+/, '/')
+    self.location = [swallow_nil{parent.location}, slug].compact.join('/').presence
   end
 
   before_update :update_locations
@@ -59,7 +58,7 @@ class Page < ActiveRecord::Base
 
   after_save :create_main_part
   def create_main_part
-    page_parts.create(:name => PufferPages::MAIN_PART) if root?
+    page_parts.create(:name => PufferPages.primary_page_part_name) if root?
   end
 
   statuses.each do |status_name|
@@ -96,7 +95,7 @@ class Page < ActiveRecord::Base
   end
 
   def inherited_page_parts
-    PagePart.where(:page_id => self_and_ancestors.map(&:id).reverse).group('name').order("name = '#{PufferPages::MAIN_PART}' desc, name")
+    PagePart.where(:page_id => self_and_ancestors.map(&:id).reverse).group('name').order("name = '#{PufferPages.primary_page_part_name}' desc, name")
   end
 
   def part name

data/app/models/page_part.rb

@@ -17,7 +17,7 @@ class PagePart < ActiveRecord::Base
   end
 
   def main?
-    name == PufferPages::MAIN_PART
+    name == PufferPages.primary_page_part_name
   end
 
 end

data/app/views/puffer_pages/_page_part_builder.html.erb

@@ -0,0 +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 :_destroy, :type => :hidden, :html => { :class => 'destroy_mark' } %>

data/app/views/puffer_pages/_page_parts.html.erb

@@ -0,0 +1,26 @@
+<ul id="page_parts" data-tabs="{closable: true, onRemove: page_part_tab_remove, addButton: page_part_tab_add}">
+  <ul>
+    <% builder.object.page_parts.each_with_index do |page_part, index| %>
+      <li><%= link_to page_part.name, "#page_part_tab_#{index}" %></li>
+    <% end %>
+  </ul>
+  <% builder.object.page_parts.each_with_index do |page_part, index| %>
+    <li id="<%= "page_part_tab_#{index}" %>">
+      <%= builder.fields_for :page_parts, page_part do |page_part_builder| %>
+        <%= render :partial => 'page_part_builder', :object => page_part_builder %>
+      <% end %>
+    </li>
+  <% end %>
+</ul>
+<div id="page_parts_marked_for_destroy">
+</div>
+
+<% new_page_part_tab_panel = capture do %>
+  <%= builder.fields_for :page_parts, PagePart.new, :child_index => 'new_page_part_tab_panel_index' do |page_part_builder| %>
+    <%= render :partial => 'page_part_builder', :object => page_part_builder %>
+  <% end %>
+<% end %>
+
+<%= javascript_tag do %>
+  var new_page_part_tab_panel = '<%= escape_javascript new_page_part_tab_panel.strip %>'
+<% end %>

data/app/views/puffer_pages/_tree_page.html.erb

@@ -0,0 +1,2 @@
+<strong><%= tree_page.id %></strong> — <%= tree_page.name %>
+(<%= link_to t('.view'), puffer_page_path(tree_page.location), :target => '_blank' %>)

data/app/views/puffer_tree/tree.html.erb

@@ -0,0 +1,55 @@
+<% @title = resource.human %>
+<h1><%= @title %> Tree</h1>
+<% if records.present? %>
+  <%= puffer_tree records, :class => 'puffer_tree' do |record, children| %>
+    <li id="<%= dom_id(record) %>">
+      <dl class="record columns">
+        <dt class="column">
+          <span class="handle">⇅</span>
+          <% tree_fields.each do |field| -%>
+            <span><%= render_field field, record %></span>
+          <% end -%>
+        </dt>
+        <dd class="column">
+          <%= link_to 'edit', resource.edit_path(record) if update_fields.present? %>
+          <% controller._members.each do |member| %>
+            <%= link_to member.label, resource.member_path(record, :action => member.action) if member.display? %>
+          <% end %>
+          <%= link_to 'destroy', resource.member_path(record), :confirm => "Are you sure?", :method => :delete if configuration.destroy %>
+        </dd>
+      </dl>
+      <%= children %>
+    </li>
+  <% end %>
+<% else %>
+  <p>Sorry, but there is no records in <%= resource.human %></p>
+<% end %>
+
+<% if false %>
+  <table class="list_table">
+    <thead>
+      <tr>
+      <% index_fields.each do |field| -%>
+        <th><%= render_head field %></th>
+      <% end -%>
+        <th class="actions">Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+    <% records.each do |record| -%>
+      <tr>
+      <% index_fields.each do |field| -%>
+        <td><%= render_field field, record %></td>
+      <% end -%>
+        <td class="actions">
+          <%= link_to 'edit', resource.edit_path(record) if update_fields.present? %>
+          <% controller._members.each do |member| %>
+            <%= link_to member.label, resource.member_path(record, :action => member.action) if member.display? %>
+          <% end %>
+          <%= link_to 'destroy', resource.member_path(record), :confirm => "Are you sure?", :method => :delete if configuration.destroy %>
+        </td>
+      </tr>
+    <% end -%>
+    </tbody>
+  </table>
+<% end %>

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

@@ -1,6 +1,10 @@
 class PufferPages::InstallGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
+  def generate_assets
+    directory 'puffer', 'public/puffer'
+  end
+
   def generate_migrations
     directory 'migrate', 'db/migrate'
   end
@@ -9,4 +13,8 @@ class PufferPages::InstallGenerator < Rails::Generators::Base
     directory 'controllers', 'app/controllers/admin'
   end
 
+  def generate_config
+    copy_file 'puffer_pages.rb', 'config/initializers/puffer_pages.rb'
+  end
+
 end

data/lib/generators/puffer_pages/install/templates/puffer/javascripts/puffer_pages.js

@@ -0,0 +1,35 @@
+Tabs.include({
+  initialize: function(options) {
+    this.$super(options);
+    this.buildAddButton();
+  },
+
+  buildAddButton: function() {
+    if (isFunction(this.options.addButton)) {
+      this.addButton = $E('a', {'class': 'rui-tabs-tab rui-tabs-add', 'html': '<a href="#">+</a>'}).insertTo(this.tabsList);
+      this.addButton.onClick(this.options.addButton.bind(this));
+    }
+  }
+});
+
+var page_part_tab_remove = function(event) {
+  var destroy_mark = event.target.panel.first('.destroy_mark');
+  var page_part_param = destroy_mark.next();
+  $('page_parts_marked_for_destroy').append(destroy_mark.value('1'))
+  if (page_part_param) {
+    $('page_parts_marked_for_destroy').append(page_part_param);
+  }
+}
+
+var page_part_tab_add = function(event) {
+  event.stop();
+  var new_id = new Date().getTime();
+  var _this = this;
+  new Dialog.Prompt({label: 'Enter new page part name'}).onOk(function() {
+    _this.add(this.input.value(), new_page_part_tab_panel.replace(/new_page_part_tab_panel_index/g, new_id), {id: new_id});
+    _this.tabs.last().panel.first('input[type=hidden]').value(this.input.value());
+    _this.tabs.last().select();
+    _this.addButton.insertTo(_this.tabsList);
+    this.hide();
+  }).show();
+}