puffer_pages 0.1.0 → 0.1.1

data/app/assets/stylesheets/puffer/codemirror/night.css

@@ -18,3 +18,4 @@
 .cm-s-night span.cm-bracket { color: #8da6ce; }
 .cm-s-night span.cm-comment { color: #6900a1; }
 .cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }
+.cm-s-night span.cm-link { color: #845dc4; }

data/app/assets/stylesheets/puffer/codemirror/rubyblue.css

@@ -0,0 +1,21 @@
+.cm-s-rubyblue { font:13px/1.4em Trebuchet, Verdana, sans-serif; }	/* - customized editor font - */
+
+.cm-s-rubyblue { background: #112435; color: white; }
+.cm-s-rubyblue span.CodeMirror-selected { background: #0000FF !important; }
+.cm-s-rubyblue .CodeMirror-gutter { background: #1F4661; border-right: 7px solid #3E7087; min-width:2.5em; }
+.cm-s-rubyblue .CodeMirror-gutter-text { color: white; }
+.cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; }
+
+.cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; }
+.cm-s-rubyblue span.cm-atom { color: #F4C20B; }
+.cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; }
+.cm-s-rubyblue span.cm-keyword { color: #F0F; }
+.cm-s-rubyblue span.cm-string { color: #F08047; }
+.cm-s-rubyblue span.cm-meta { color: #F0F; }
+.cm-s-rubyblue span.cm-variable-2, .cm-s-rubyblue span.cm-tag { color: #7BD827; }
+.cm-s-rubyblue span.cm-variable-3, .cm-s-rubyblue span.cm-def { color: white; }
+.cm-s-rubyblue span.cm-error { color: #AF2018; }
+.cm-s-rubyblue span.cm-bracket { color: #F0F; }
+.cm-s-rubyblue span.cm-link { color: #F4C20B; }
+.cm-s-rubyblue span.CodeMirror-matchingbracket { color:#F0F !important; }
+.cm-s-rubyblue span.cm-builtin, .cm-s-rubyblue span.cm-special { color: #FF9D00; }

data/app/assets/stylesheets/puffer/puffer_pages.css

@@ -1,7 +1,63 @@
 //= require puffer/codemirror
 //= require_tree ./codemirror
 
-.rui-tabs li
-{
-    margin-bottom: 0;
+.cm-s-default {
+  background: #fff;
+}
+
+span.cm-liquid {
+  color: red;
+}
+
+#page_parts li {
+  margin-bottom: 0;
+}
+
+#page_parts .rui-tabs-panel {
+  padding: 0;
+  border-left: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  min-height: 300px;
+}
+
+.active_line {
+  background: #eee !important;
+}
+
+.fullscreen {
+  display: block;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 9999;
+  margin: 0;
+  padding: 0;
+}
+
+.codemirror_buttons {
+  border-bottom: 1px dashed #ccc;
+  background: #fff;
+}
+
+.codemirror_buttons li {
+  list-style: none;
+  display: inline-block;
+  padding: 4px 10px;
+  margin: 0;
+  cursor: pointer;
+}
+
+.codemirror_buttons li:hover {
+  color: #ff6600;
+}
+
+.codemirror_buttons_fulscreen {
+  display: block;
+  position: fixed;
+  top: -20px;
+  left: 0;
+  width: 100%;
+  z-index: 10000;
 }

data/app/components/codemirror/form.html.erb

@@ -0,0 +1,16 @@
+<%= component_fields_for @record do |f| %>
+  <% unless field.options[:input_only] %>
+    <div class="label">
+      <%= f.label field %>
+      <div class="field_error">
+        <%= @record.errors[field.name.to_sym].first %>
+      </div>
+    </div>
+  <% end %>
+  <ul class="codemirror_buttons">
+    <% buttons.each do |button| %>
+      <li data-codemirror-button="<%= button %>"><%= t(".#{button}") %></li>
+    <% end %>
+  </ul>
+  <%= f.text_area field, field.input_options.merge(:data => {:codemirror => true}) %>
+<% end %>

data/app/components/codemirror_component.rb

@@ -0,0 +1,9 @@
+class CodemirrorComponent < BaseComponent
+  helper_method :buttons
+
+private
+
+  def buttons
+    PufferPages.codemirror_buttons + Array.wrap(field.options[:buttons])
+  end
+end

data/app/components/page_parts/form.html.erb

@@ -1,12 +1,21 @@
 <%= fields_for @record do |f| %>
-  <ul id="<%= field.name %>" data-tabs="{closable: true, onRemove: page_part_tab_remove, addButton: page_part_tab_add}">
-    <ul>
+  <ul id="<%= field.name %>" class="rui-tabs" data-tabs="{closable: true, onSelect: page_part_tab_select, onRemove: page_part_tab_remove, addButton: page_part_tab_add}">
+    <ul class="rui-tabs-list">
       <% @record.send(field.name).each_with_index do |page_part, index| %>
-        <li><%= link_to page_part.name, "#page_part_tab_#{index}" %></li>
+        <li>
+          <%= link_to "#page_part_tab_#{index}" do %>
+            <%= page_part.name %>
+            <% if page_part.errors[:name].present? %>
+              <span class="field_error">
+                <%= page_part.errors[:name].first %>
+              </span>
+            <% end %>
+          <% end %>
+        </li>
       <% end %>
     </ul>
     <% @record.send(field.name).each_with_index do |page_part, index| -%>
-      <li id="<%= "page_part_tab_#{index}" %>">
+      <li id="<%= "page_part_tab_#{index}" %>" class="rui-tabs-panel">
         <%= f.fields_for field.name, page_part do |page_part_builder| %>
           <% field.children.each do |field| %>
             <%= field.render :form, parent_controller, page_part_builder.object, :builder => page_part_builder %>

data/app/controllers/pages_controller.rb

@@ -2,16 +2,7 @@ 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
-  end
-
-  private
-
-  def drops
-    {
-      :self => PufferPages::Liquid::PageDrop.new(@page, @page, self),
-      :root => PufferPages::Liquid::PageDrop.new(@page.root, @page, self)
-    }.stringify_keys
+    render :inline => @page.render(default_drops(@page)), :layout => @page.render_layout, :content_type => @page.content_type
   end
 
 end

data/app/controllers/puffer_pages/layouts_base.rb

@@ -12,7 +12,7 @@ class PufferPages::LayoutsBase < Puffer::Base
 
   form do
     field :name
-    field :body, :html => {:codemirror => true}
+    field :body, :type => :codemirror
   end
 
 end

data/app/controllers/puffer_pages/pages_base.rb

@@ -23,7 +23,7 @@ class PufferPages::PagesBase < Puffer::TreeBase
     field :name
     field :slug
     field :page_parts, :type => :page_parts do
-      field :body, :type => :page_part_body, :html => {:codemirror => true}
+      field :body, :type => :codemirror, :input_only => true
       field :name, :type => :hidden
       field :_destroy, :type => :hidden, :html => { :class => 'destroy_mark' }
     end

data/app/controllers/puffer_pages/snippets_base.rb

@@ -12,7 +12,7 @@ class PufferPages::SnippetsBase < Puffer::Base
 
   form do
     field :name
-    field :body, :html => {:codemirror => true}
+    field :body, :type => :codemirror
   end
 
 end

data/app/models/puffer_pages/page.rb

@@ -23,12 +23,13 @@ class PufferPages::Page < ActiveRecord::Base
 
   def self.find_layout_page location
     location.gsub!(/^\/|\/$/, '')
-    page = where(['? like location', location]).where(['status not in (?)', 'draft']).order('lft desc').first
+    page = location.blank? ? Page.roots.first :
+      where(['? like location', location]).where(['status not in (?)', 'draft']).order('lft desc').first
     raise PufferPages::LayoutMissed.new("PufferPages can`t render this page because layout page missed or draft") unless page
     page
   end
 
-  has_many :page_parts, :order => "name = '#{PufferPages.primary_page_part_name}' desc, name", :dependent => :destroy, :class_name => '::PagePart'
+  has_many :page_parts, :order => "name = '#{PufferPages.primary_page_part_name}' desc, name", :dependent => :destroy, :class_name => '::PagePart', :validate => true
   accepts_nested_attributes_for :page_parts, :allow_destroy => true
   belongs_to :layout, :primary_key => :name, :foreign_key => :layout_name, :class_name => '::Layout'
 
@@ -72,7 +73,7 @@ class PufferPages::Page < ActiveRecord::Base
   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})
+      tracker.cleanup @template.render(drops_or_context, :registers => {:tracker => tracker, :page => self, :file_system => PufferPages::Liquid::FileSystem.new})
     else
       inherited_page_parts.reverse.map{|part| part.render(drops_or_context, self)}.join
     end

data/app/views/layouts/puffer_pages_layout.html.erb

@@ -1 +1,2 @@
-<%= render :inline => layout_page.render(layout_page_drops), :layout => ("layouts/#{layout_page.render_layout}" if layout_page.render_layout) %>
+<% drops = default_drops(layout_page).merge(@drops.presence || {}).stringify_keys %>
+<%= render :inline => layout_page.render(drops), :layout => ("layouts/#{layout_page.render_layout}" if layout_page.render_layout) %>

data/gemfiles/Gemfile-rails-3.1

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec :path => '..'
+
+gem 'rails', '~> 3.1.0'

data/gemfiles/Gemfile-rails-3.1.lock

@@ -0,0 +1,173 @@
+PATH
+  remote: /home/pyromaniac/work/opensource/puffer_pages
+  specs:
+    puffer_pages (0.1.1)
+      liquid
+      nested_set
+      puffer
+      rails (~> 3.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.1)
+      ffi (~> 1.0.6)
+    database_cleaner (0.7.1)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    fabrication (1.2.0)
+    ffi (1.0.11)
+    forgery (0.5.0)
+    guard (1.0.0)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-rspec (0.6.0)
+      guard (>= 0.10.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.5)
+    kaminari (0.13.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    libnotify (0.7.2)
+    liquid (2.3.0)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    mysql (2.8.1)
+    nested_set (1.6.8)
+      activerecord (>= 3.0.0)
+      railties (>= 3.0.0)
+    nokogiri (1.5.0)
+    orm_adapter (0.0.6)
+    pg (0.12.2)
+    polyglot (0.3.3)
+    puffer (0.1.1)
+      kaminari
+      orm_adapter
+      rails (~> 3.1)
+    rack (1.3.6)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
+      bundler (~> 1.0)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
+    rubyzip (0.9.5)
+    selenium-webdriver (2.18.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
+      rubyzip
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bcrypt-ruby
+  capybara (>= 0.4.0)
+  database_cleaner
+  fabrication
+  forgery
+  guard
+  guard-rspec
+  libnotify
+  mysql
+  pg
+  puffer_pages!
+  rails (~> 3.1.0)
+  rb-inotify
+  rspec-rails
+  sqlite3-ruby

data/gemfiles/Gemfile-rails-3.2

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec :path => '..'
+
+gem 'rails', '~> 3.2.0'

data/gemfiles/Gemfile-rails-3.2.lock

@@ -0,0 +1,171 @@
+PATH
+  remote: /home/pyromaniac/work/opensource/puffer_pages
+  specs:
+    puffer_pages (0.1.1)
+      liquid
+      nested_set
+      puffer
+      rails (~> 3.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
+      mail (~> 2.4.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
+      builder (~> 3.0.0)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.0)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.1)
+      ffi (~> 1.0.6)
+    database_cleaner (0.7.1)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    fabrication (1.2.0)
+    ffi (1.0.11)
+    forgery (0.5.0)
+    guard (1.0.0)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-rspec (0.6.0)
+      guard (>= 0.10.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.1)
+    json (1.6.5)
+    kaminari (0.13.0)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
+    libnotify (0.7.2)
+    liquid (2.3.0)
+    mail (2.4.1)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
+    mysql (2.8.1)
+    nested_set (1.6.8)
+      activerecord (>= 3.0.0)
+      railties (>= 3.0.0)
+    nokogiri (1.5.0)
+    orm_adapter (0.0.6)
+    pg (0.12.2)
+    polyglot (0.3.3)
+    puffer (0.1.1)
+      kaminari
+      orm_adapter
+      rails (~> 3.1)
+    rack (1.4.1)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)
+      bundler (~> 1.0)
+      railties (= 3.2.1)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
+    rubyzip (0.9.5)
+    selenium-webdriver (2.18.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
+      rubyzip
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bcrypt-ruby
+  capybara (>= 0.4.0)
+  database_cleaner
+  fabrication
+  forgery
+  guard
+  guard-rspec
+  libnotify
+  mysql
+  pg
+  puffer_pages!
+  rails (~> 3.2.0)
+  rb-inotify
+  rspec-rails
+  sqlite3-ruby