puffer_pages 0.0.19 → 0.1.0

data/.gitignore

@@ -0,0 +1,8 @@
+.bundle/
+.rvmrc
+log/*.log
+pkg/
+spec/dummy/db/*.sqlite3
+spec/dummy/log/*.log
+spec/dummy/tmp/
+*.orig

data/Gemfile

@@ -1,25 +1,5 @@
 source "http://rubygems.org"
 
-gem 'rails', '~> 3.1.0'
-gem 'puffer', :git => 'git://github.com/puffer/puffer.git'
-gem 'liquid', :git => 'git://github.com/puffer/liquid.git'
-gem 'nested_set'
-
-group :development, :test, :pg_test do
-  gem "sqlite3-ruby", :require => "sqlite3"
-  gem "pg"
-  gem "mysql"
-
-  gem "rspec-rails"
-  gem "capybara", ">= 0.4.0"
-  gem 'database_cleaner'
-
-  gem 'guard'
-  gem 'libnotify'
-  gem 'guard-rspec'
-
-  gem 'forgery'
-  gem 'fabrication'
-  gem "jeweler"
-end
+gemspec
 
+gem 'puffer', :git => 'git://github.com/puffer/puffer.git'

data/Gemfile.lock

@@ -1,18 +1,21 @@
-GIT
-  remote: git://github.com/puffer/liquid.git
-  revision: 3885290fefa0e6f92cfd812455a7cbd8eee9871b
-  specs:
-    liquid (2.2.2)
-
 GIT
   remote: git://github.com/puffer/puffer.git
-  revision: 9b392031c0c1264d963c632794f92ede1895968b
+  revision: cdbcc66e5b205cd8f95a48e84568c6748640f349
   specs:
-    puffer (0.0.30)
+    puffer (0.1.0)
       kaminari
       orm_adapter
       rails (~> 3.1.0)
 
+PATH
+  remote: .
+  specs:
+    puffer_pages (0.1.0)
+      liquid
+      nested_set
+      puffer
+      rails (~> 3.1.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -61,22 +64,18 @@ GEM
     fabrication (1.1.0)
     ffi (1.0.9)
     forgery (0.5.0)
-    git (1.2.5)
     guard (0.6.3)
       thor (~> 0.14.6)
     guard-rspec (0.4.5)
       guard (>= 0.4.0)
     hike (1.2.1)
     i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
     json (1.6.1)
     json_pure (1.6.0)
     kaminari (0.12.4)
       rails (>= 3.0.0)
     libnotify (0.5.7)
+    liquid (2.3.0)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -90,7 +89,7 @@ GEM
     nokogiri (1.5.0)
     orm_adapter (0.0.5)
     pg (0.11.0)
-    polyglot (0.3.2)
+    polyglot (0.3.3)
     rack (1.3.5)
     rack-cache (1.1)
       rack (>= 0.4)
@@ -149,7 +148,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    tzinfo (0.3.31)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -163,13 +162,10 @@ DEPENDENCIES
   forgery
   guard
   guard-rspec
-  jeweler
   libnotify
-  liquid!
   mysql
-  nested_set
   pg
   puffer!
-  rails (~> 3.1.0)
+  puffer_pages!
   rspec-rails
   sqlite3-ruby

data/README.md

@@ -1,7 +1,3 @@
-# Warning! This puffer_pages version requires liquid from puffer repo. So, add following line to your Gemfile until new liquid version will release.
-<pre>gem 'liquid', :git => 'git://github.com/puffer/liquid.git'</pre>
-I hope, it's temporarly
-
 # Puffer_pages is lightweight rails 3.1 CMS
 
 Interface of pages based on [puffer](https://github.com/puffer/puffer)

data/Rakefile

@@ -24,14 +24,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-require 'jeweler'
-
-Jeweler::Tasks.new do |gem|
-  gem.name = "puffer_pages"
-  gem.summary = %Q{Content management system}
-  gem.description = %Q{Puffer pages is integratable rails CMS with puffer admin interface}
-  gem.email = "kinwizard@gmail.com"
-  gem.homepage = "http://github.com/puffer/puffer_pages"
-  gem.authors = ["pyromaniac"]
-end
-Jeweler::GemcutterTasks.new
+require "bundler/gem_tasks"

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

@@ -1 +1,3 @@
-<%= opts[:form].text_area field, field.input_options %>
+<%= component_fields_for @record do |f| %>
+  <%= f.text_area field, field.input_options %>
+<% end %>

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

@@ -1,31 +1,33 @@
-<ul id="<%= field.name %>" data-tabs="{closable: true, onRemove: page_part_tab_remove, addButton: page_part_tab_add}">
-  <ul>
-    <% opts[:form].object.send(field.name).each_with_index do |page_part, index| %>
-      <li><%= link_to page_part.name, "#page_part_tab_#{index}" %></li>
-    <% end %>
-  </ul>
-  <% opts[:form].object.send(field.name).each_with_index do |page_part, index| -%>
-    <li id="<%= "page_part_tab_#{index}" %>">
-      <% opts[:form].fields_for field.name, page_part, :hidden_field_id => true do |page_part_builder| %>
-        <% field.children.each do |field| %>
-          <%= field.render parent_controller, :form, :form => page_part_builder %>
-        <% end %>
-        <%= page_part_builder.hidden_field :id unless page_part_builder.object.persisted? %>
+<%= fields_for @record do |f| %>
+  <ul id="<%= field.name %>" data-tabs="{closable: true, onRemove: page_part_tab_remove, addButton: page_part_tab_add}">
+    <ul>
+      <% @record.send(field.name).each_with_index do |page_part, index| %>
+        <li><%= link_to page_part.name, "#page_part_tab_#{index}" %></li>
       <% end %>
-    </li>
-  <% end -%>
-</ul>
-<div id="page_parts_marked_for_destroy">
-</div>
+    </ul>
+    <% @record.send(field.name).each_with_index do |page_part, index| -%>
+      <li id="<%= "page_part_tab_#{index}" %>">
+        <%= 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 %>
+          <% end %>
+          <%= page_part_builder.hidden_field :id unless page_part_builder.object.persisted? %>
+        <% end %>
+      </li>
+    <% end -%>
+  </ul>
+  <div id="page_parts_marked_for_destroy">
+  </div>
 
-<% new_page_part_tab_panel = capture do %>
-  <% opts[:form].fields_for field.name, PagePart.new, :child_index => 'new_page_part_tab_panel_index' do |page_part_builder| %>
-    <% field.children.each do |field| %>
-      <%= field.render parent_controller, :form, :form => page_part_builder %>
+  <% new_page_part_tab_panel = capture do %>
+    <%= f.fields_for field.name, PagePart.new, :child_index => 'new_page_part_tab_panel_index' do |page_part_builder| %>
+      <% field.children.each do |field| %>
+        <%= field.render :form, parent_controller, page_part_builder.object, :builder => page_part_builder %>
+      <% end %>
     <% end %>
   <% end %>
-<% end %>
 
-<%= javascript_tag do %>
-  var new_page_part_tab_panel = '<%= j new_page_part_tab_panel.strip.html_safe %>'
+  <%= javascript_tag do %>
+    var new_page_part_tab_panel = '<%= j new_page_part_tab_panel.strip.html_safe %>'
+  <% end %>
 <% end %>

data/app/controllers/puffer_pages/pages_base.rb

@@ -27,8 +27,8 @@ class PufferPages::PagesBase < Puffer::TreeBase
       field :name, :type => :hidden
       field :_destroy, :type => :hidden, :html => { :class => 'destroy_mark' }
     end
-    field :layout_name, :select => :possible_layouts
-    field :status, :select => :possible_statuses
+    field :layout_name, :select => :possible_layouts, :include_blank => false
+    field :status, :select => :possible_statuses, :include_blank => false
     field :title
     field :description
     field :keywords

data/app/helpers/puffer_pages_helper.rb

@@ -20,7 +20,7 @@ module PufferPagesHelper
     Page.statuses
   end
 
-  def tree_page record
+  def tree_page
     render :partial => 'tree_page', :object => record
   end
 

data/app/models/puffer_pages/page.rb

@@ -15,8 +15,16 @@ class PufferPages::Page < ActiveRecord::Base
 
   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?
+      find_by_slug(location) : find_by_location(location)
+    raise ActiveRecord::RecordNotFound unless page
+    raise PufferPages::DraftPage.new("PufferPages can`t show this page because it is draft") if page.draft?
+    page
+  end
+
+  def self.find_layout_page location
+    location.gsub!(/^\/|\/$/, '')
+    page = 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
 
@@ -28,7 +36,7 @@ class PufferPages::Page < ActiveRecord::Base
   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?
+  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
@@ -42,14 +50,15 @@ class PufferPages::Page < ActiveRecord::Base
     self.location = [swallow_nil{parent.location}, slug].compact.join('/').presence
   end
 
-  before_update :update_locations
+  before_update :update_locations, :if => :location_changed?
   def update_locations
-    self.class.update_all "location = replace(location, '#{location_was}', '#{location}')", ["location like ?", location_was + '%'] if location_changed?
+    self.class.update_all "location = replace(location, '#{location_was}', '#{location}')", ["location like ?", location_was + '%']
   end
 
-  after_save :create_main_part
-  def create_main_part
-    page_parts.create(:name => PufferPages.primary_page_part_name) if root?
+  after_initialize :build_main_part, :if => :root?
+  before_save :build_main_part, :if => :root?
+  def build_main_part
+    page_parts.build(:name => PufferPages.primary_page_part_name) unless page_parts.map(&:name).include?(PufferPages.primary_page_part_name)
   end
 
   statuses.each do |status_name|
@@ -63,9 +72,9 @@ 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.map{|part| part.render(drops_or_context, self)}.join
+      inherited_page_parts.reverse.map{|part| part.render(drops_or_context, self)}.join
     end
   end
 

data/app/models/puffer_pages/page_part.rb

@@ -6,10 +6,10 @@ class PufferPages::PagePart < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => :page_id
 
-  def render(drops_or_context, page = nil)
+  def render(drops_or_context, page = page)
     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 %>"
+    main? ? result : "<% content_for :'#{name}' do %>#{result}<% end %>"
   end
 
   def tracker

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

@@ -0,0 +1 @@
+<%= render :inline => layout_page.render(layout_page_drops), :layout => ("layouts/#{layout_page.render_layout}" if layout_page.render_layout) %>

data/lib/puffer_pages/extensions/controller.rb

@@ -0,0 +1,34 @@
+module PufferPages
+  module Extensions
+    module ActionController
+      module Base
+        extend ActiveSupport::Concern
+
+        included do
+          helper_method :layout_page, :layout_page_drops
+        end
+
+        module InstanceMethods
+          def puffer_pages
+            'puffer_pages_layout'
+          end
+
+          def layout_page
+            @layout_page ||= ::Page.find_layout_page(request.path_info)
+          end
+
+          def layout_page_drops
+            {
+              :self => PufferPages::Liquid::PageDrop.new(layout_page, layout_page, self),
+              :root => PufferPages::Liquid::PageDrop.new(layout_page.root, layout_page, self)
+            }.merge(@drops.presence || {}).stringify_keys
+          end
+
+        end
+
+      end
+    end
+  end
+end
+
+ActionController::Base.send :include, PufferPages::Extensions::ActionController::Base

data/lib/puffer_pages/extensions/mapper.rb

@@ -1,12 +1,10 @@
 module PufferPages
   module Extensions
     module Mapper
+      extend ActiveSupport::Concern
 
-      def self.included base
-        base.class_eval do
-          class_attribute :_puffer_pages
-          include InstanceMethods
-        end
+      included do
+        class_attribute :_puffer_pages
       end
 
       module InstanceMethods

data/lib/puffer_pages/liquid/file_system.rb

@@ -6,12 +6,12 @@ module PufferPages
         case template_type template_path
         when :snippet then
           template_path = template_path.gsub(/^snippets\//, '')
-          snippet = Snippet.find_by_name(template_path)
+          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)
+          layout = ::Layout.find_by_name(template_path)
           raise ::Liquid::FileSystemError, "No such layout '#{template_path}' found" unless layout
           layout.body
         when :page_part then

data/lib/puffer_pages/liquid/tags/javascripts.rb

@@ -24,8 +24,8 @@ module PufferPages
 
         def variables_from_string(markup)
           markup.split(',').map do |var|
-          var.strip =~ /\s*(#{::Liquid::QuotedFragment})\s*/
-          $1 ? $1 : nil
+            var.strip =~ /\s*(#{::Liquid::QuotedFragment})\s*/
+            $1 ? $1 : nil
           end.compact
         end
 

data/lib/puffer_pages/liquid/tags/stylesheets.rb

@@ -24,8 +24,8 @@ module PufferPages
 
         def variables_from_string(markup)
           markup.split(',').map do |var|
-          var.strip =~ /\s*(#{::Liquid::QuotedFragment})\s*/
-          $1 ? $1 : nil
+            var.strip =~ /\s*(#{::Liquid::QuotedFragment})\s*/
+            $1 ? $1 : nil
           end.compact
         end
 

data/lib/puffer_pages/liquid/tags/yield.rb

@@ -8,21 +8,17 @@ module PufferPages
         def initialize(tag_name, markup, tokens)
           if markup =~ Syntax
             @name = $1
+          elsif markup.blank?
+            @name = nil
           else
-            @name = "'#{PufferPages.primary_page_part_name}'"
+            raise SyntaxError.new("Syntax Error in 'yield' - Valid syntax: yield [content_name]")
           end
 
           super
         end
 
         def render(context)
-          name = context[@name]
-          part = context.registers[:page].part(name)
-          if part
-            part.render(context)
-          else
-            raise ArgumentError.new("Argument error in 'yield' - Can not find page part named '#{name}'")
-          end
+          context.registers[:tracker].register(@name ? "<%= yield :'#{@name}' %>" : "<%= yield %>")
         end
       end
 

data/lib/puffer_pages/liquid/tracker.rb

@@ -7,23 +7,17 @@ module PufferPages
       end
 
       def register content
-        @ids << uid
+        @ids << Digest::MD5.hexdigest(SecureRandom.uuid)
         content.gsub(/<%/, "<#{@ids.last}%").gsub(/%>/, "%#{@ids.last}>")
       end
 
       def cleanup text
         ids = @ids.join('|')
         @ids = []
-        text = text.gsub(/<%/, "&lt;%").gsub(/%>/, "%&gt;")# unless Cobalt.config[:allow_erb]
+        text = text.gsub(/<%/, "&lt;%").gsub(/%>/, "%&gt;")# unless PufferPages.config[:allow_erb]
         text.gsub(/<(#{ids})%/, "<%").gsub(/%(#{ids})>/, "%>")
       end
 
-      private
-
-      def uid
-        Digest::MD5.hexdigest("#{rand}#{Time.now.to_f}")
-      end
-
     end
   end
 end

data/lib/puffer_pages/version.rb

@@ -0,0 +1,3 @@
+module PufferPages
+  VERSION = "0.1.0"
+end

data/lib/puffer_pages.rb

@@ -1,5 +1,14 @@
 module PufferPages
 
+  class PufferPagesError < StandardError
+  end
+
+  class DraftPage < PufferPagesError
+  end
+
+  class LayoutMissed < PufferPagesError
+  end
+
   mattr_accessor :primary_page_part_name
   self.primary_page_part_name = 'body'
 
@@ -19,6 +28,7 @@ require 'nested_set'
 require 'puffer_pages/engine'
 require 'puffer_pages/extensions/core'
 require 'puffer_pages/extensions/mapper'
-#require 'puffer_pages/liquid/tags/yield'
+require 'puffer_pages/extensions/controller'
+require 'puffer_pages/liquid/tags/yield'
 require 'puffer_pages/liquid/tags/stylesheets'
 require 'puffer_pages/liquid/tags/javascripts'