puffer_pages 0.0.13 → 0.0.14

data/Gemfile

@@ -1,8 +1,8 @@
 source "http://rubygems.org"
 
-gem 'rails', '~> 3.0.3'
-gem 'liquid', :git => 'git://github.com/tobi/liquid.git'
-gem 'nested_set'
+gem 'rails'
+gem 'liquid', :git => 'git://github.com/puffer/liquid.git'
+gem 'nested_set', :git => 'git://github.com/pyromaniac/nested_set.git'
 gem 'puffer', '>= 0.0.17'
 
 group :development, :test, :pg_test do

data/Gemfile.lock

@@ -1,20 +1,28 @@
 GIT
-  remote: git://github.com/tobi/liquid.git
-  revision: 7bbb4ff84f192a6a2292e8bf16e1049cad34d763
+  remote: git://github.com/puffer/liquid.git
+  revision: 18ddffc9c4be25dadf9ec55dc5664a454ae3d072
   specs:
     liquid (2.2.2)
 
+GIT
+  remote: git://github.com/pyromaniac/nested_set.git
+  revision: 32c0d948cfccdb81324bc127daa3c5077d89be22
+  specs:
+    nested_set (1.6.4)
+      activerecord (>= 3.0.0)
+      railties (>= 3.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.4.2)
+    ZenTest (4.5.0)
     abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
       mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
@@ -22,24 +30,24 @@ GEM
       rack-mount (~> 0.6.13)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
-    arel (2.0.8)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     builder (2.1.2)
-    capybara (0.4.1.1)
+    capybara (0.4.1.2)
       celerity (>= 0.7.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
@@ -48,10 +56,10 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.3)
-    celerity (0.8.7)
+    celerity (0.8.8)
     cells (3.4.4)
     cgi_multipart_eof_fix (2.5.0)
-    childprocess (0.1.6)
+    childprocess (0.1.7)
       ffi (~> 0.6.3)
     culerity (0.2.15)
     daemons (1.1.0)
@@ -62,7 +70,8 @@ GEM
     fastthread (1.0.7)
     ffi (0.6.3)
       rake (>= 0.8.7)
-    forgery (0.3.6)
+    forgery (0.3.7)
+      nokogiri (~> 1.4)
     gem_plugin (0.2.3)
     git (1.2.5)
     i18n (0.5.0)
@@ -83,32 +92,29 @@ GEM
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
     mysql (2.8.1)
-    nested_set (1.6.3)
-      activerecord (>= 3.0.0)
-      railties (>= 3.0.0)
     nokogiri (1.4.4)
     pg (0.10.1)
     polyglot (0.3.1)
-    puffer (0.0.17)
+    puffer (0.0.19)
       cells (~> 3.4.4)
-      rails (~> 3.0.3)
+      rails (~> 3.0.4)
       will_paginate (~> 3.0.pre2)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
       bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
@@ -126,7 +132,7 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.5.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.2)
+    selenium-webdriver (0.1.3)
       childprocess (~> 0.1.5)
       ffi (~> 0.6.3)
       json_pure
@@ -154,9 +160,9 @@ DEPENDENCIES
   liquid!
   mongrel
   mysql
-  nested_set
+  nested_set!
   pg
   puffer (>= 0.0.17)
-  rails (~> 3.0.3)
+  rails
   rspec-rails
   sqlite3-ruby

data/README.md

@@ -1,5 +1,6 @@
-# Warning! This puffer_pages version requires liquid from repo. So, add following line to your Gemfile until new liquid version will release.
-<pre>gem 'liquid', :git => 'git://github.com/tobi/liquid.git'</pre>
+# 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 CMS
 

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/app/helpers/puffer_pages_helper.rb

@@ -1,11 +1,12 @@
 module PufferPagesHelper
 
   def possible_layouts
-    inherited_layout + (application_layouts + puffer_layouts).sort
+    inherited_layout + (application_layouts + puffer_layouts).uniq.sort
   end
 
   def application_layouts
-    view_paths.map {|path| Dir.glob("#{path}/layouts/[^_]*")}.flatten.map {|path| File.basename(path).gsub(/\..*$/, '')}.uniq
+    application_layouts_path = view_paths.detect {|path| path.to_s.starts_with? Rails.root }
+    Dir.glob("#{application_layouts_path}/layouts/[^_]*").flatten.map {|path| File.basename(path).gsub(/\..*$/, '')}.uniq
   end
 
   def puffer_layouts
@@ -13,7 +14,7 @@ module PufferPagesHelper
   end
 
   def inherited_layout
-    record.inherited_layout_name ? [[t('puffer.inherited_layout', :name => record.inherited_layout_name), '']] : []
+    record.inherited_layout_name && !record.root? ? [[t('puffer.inherited_layout', :name => record.inherited_layout_name), '']] : []
   end
 
   def possible_statuses

data/app/helpers/puffer_tree_helper.rb

@@ -2,9 +2,13 @@ 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
+      puffer_tree_node hash, &block
+    end if hash.present?
+  end
+
+  def puffer_tree_node hash, &block
+    hash.keys.each do |node|
+      block.call node, render_tree(hash[node], &block)
     end if hash.present?
   end
 

data/app/models/page.rb

@@ -2,9 +2,7 @@ class Page < ActiveRecord::Base
 
   acts_as_nested_set
 
-  scope :with_parts, includes(:page_parts)
   scope :published, where(:status => 'published')
-  default_scope order(:lft)
 
   def self.statuses
     %w(draft hidden published)
@@ -22,24 +20,21 @@ class Page < ActiveRecord::Base
   belongs_to :layout, :primary_key => :name, :foreign_key => :layout_name
 
   validates_presence_of :name
-  validate do |page|
-    page.errors.add(:layout_name, :blank) unless page.inherited_layout_name.present?
-  end
   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?
-  validates_format_of :slug,
-    :with => nil,
-    :message => :root_slug_format,
-    :if => :root?
-  validates_inclusion_of :status, :in => Page.statuses
+  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 :default_values
-  def default_values
+  before_validation :defaultize_attributes
+  def defaultize_attributes
     self.status ||= 'draft'
     self.slug = slug.presence
     self.location = [swallow_nil{parent.location}, slug].compact.join('/').presence
@@ -105,11 +100,7 @@ class Page < ActiveRecord::Base
   end
 
   def content_type
-    Rack::Mime.mime_type(File.extname(slug), 'text/html')
-  end
-
-  def self_and_children
-    [self] + children
+    Rack::Mime.mime_type(File.extname(slug.to_s), 'text/html')
   end
 
 end

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

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

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

@@ -0,0 +1,27 @@
+<li id="<%= dom_id record %>">
+  <dl class="record columns">
+    <dt class="column">
+      <% unless record.leaf? || record.root? %>
+        <span class="toggle">
+        <% if children.blank? %>
+          <%= link_to '+', resource.member_path(record, :action => :expand), :remote => true %>
+        <% else %>
+          <%= link_to '–', resource.member_path(record, :action => :collapse), :remote => true %>
+        <% end %>
+        </span>
+      <% end %>
+      <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>

data/app/views/puffer_tree/toggle.js.erb

@@ -0,0 +1,6 @@
+<% nodes = capture do %>
+  <% puffer_tree_node records do |record, children| %>
+    <%= render :partial => 'record', :object => record, :locals => {:children => children} %>
+  <% end %>
+<% end %>
+$('<%= dom_id @parent %>').replace('<%= escape_javascript nodes %>')

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

@@ -2,24 +2,7 @@
 <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>
+    <%= render :partial => 'record', :object => record, :locals => {:children => children} %>
   <% end %>
 <% else %>
   <p>Sorry, but there is no records in <%= resource.human %></p>

data/lib/generators/puffer_pages/install/templates/puffer/stylesheets/puffer_tree.css

@@ -1,10 +1,12 @@
-.puffer_tree ul
+.puffer_tree *
 {
+    font-size: 8pt;
 }
 
 .puffer_tree li
 {
     list-style: none;
+    position: relative;
 }
 
 .puffer_tree li ul
@@ -49,3 +51,15 @@
     padding-right: 10px;
     color: #999;
 }
+
+.puffer_tree li .record .toggle
+{
+    position: absolute;
+    left: -20px;
+}
+
+.puffer_tree li .record .toggle a
+{
+    color: #999;
+    text-decoration: none;
+}

data/lib/puffer/tree_base.rb

@@ -13,12 +13,19 @@ module Puffer
 
     def index
       return super if params[:search]
-      @records = resource.collection_scope.includes(resource.includes).arrange
+      @records = resource.collection_scope.includes(resource.includes)
+      if session[:expanded].present?
+        @records = @records.where(["depth in (0, 1) or parent_id in (#{session[:expanded].join(', ')})"]).arrange
+      else
+        @records = @records.where(:depth => [0, 1]).arrange
+      end
       render 'tree'
     end
 
     member do
       get :inherit, :label => 'new page'
+      get :expand, :display => false
+      get :collapse, :display => false
     end
 
     def inherit
@@ -27,5 +34,22 @@ module Puffer
       render 'new'
     end
 
+    def expand
+      @parent = resource.member
+      session[:expanded] ||= []
+      session[:expanded].push params[:id] if @parent
+      session[:expanded].uniq!
+      @records = @parent.self_and_descendants.where(:parent_id => [@parent.parent_id] + session[:expanded]).includes(resource.includes).arrange
+      render 'toggle'
+    end
+
+    def collapse
+      @parent = resource.member
+      session[:expanded] ||= []
+      session[:expanded].delete params[:id]
+      @records = resource.collection_scope.where(:id => [@parent.id]).includes(resource.includes).arrange
+      render 'toggle'
+    end
+
   end
 end

data/lib/puffer_pages/extensions/core.rb

@@ -5,3 +5,18 @@ Kernel.class_eval do
     nil
   end
 end
+
+Array.class_eval do
+  def arranged
+    arranged = ActiveSupport::OrderedHash.new
+    insertion_points = [arranged]
+    depth = 0
+    each do |node|
+      insertion_points.push insertion_points.last.values.last if node.depth > depth
+      (depth - node.depth).times { insertion_points.pop } if node.depth < depth
+      insertion_points.last.merge! node => ActiveSupport::OrderedHash.new
+      depth = node.depth
+    end
+    arranged
+  end
+end

data/lib/puffer_pages/liquid/page_drop.rb

@@ -38,6 +38,10 @@ module PufferPages
         page.is_ancestor_of? current_page
       end
 
+      def == drop
+        page.id == drop.send(:page).id
+      end
+
     private
 
       attr_reader :page, :request, :current_page

data/puffer_pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-02-15}
+  s.date = %q{2011-03-01}
   s.description = %q{Puffer pages is integratable rails CMS with puffer admin interface}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -36,6 +36,8 @@ Gem::Specification.new do |s|
     "app/views/puffer_pages/_page_part_builder.html.erb",
     "app/views/puffer_pages/_page_parts.html.erb",
     "app/views/puffer_pages/_tree_page.html.erb",
+    "app/views/puffer_tree/_record.html.erb",
+    "app/views/puffer_tree/toggle.js.erb",
     "app/views/puffer_tree/tree.html.erb",
     "autotest/discover.rb",
     "config/locales/en.yml",
@@ -130,6 +132,7 @@ Gem::Specification.new do |s|
     "spec/fabricators/pages_fabricator.rb",
     "spec/fabricators/snippets_fabricator.rb",
     "spec/integration/navigation_spec.rb",
+    "spec/lib/core_spec.rb",
     "spec/lib/drops_spec.rb",
     "spec/lib/tags_spec.rb",
     "spec/models/page_spec.rb",
@@ -173,6 +176,7 @@ Gem::Specification.new do |s|
     "spec/fabricators/pages_fabricator.rb",
     "spec/fabricators/snippets_fabricator.rb",
     "spec/integration/navigation_spec.rb",
+    "spec/lib/core_spec.rb",
     "spec/lib/drops_spec.rb",
     "spec/lib/tags_spec.rb",
     "spec/models/page_spec.rb",
@@ -184,7 +188,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_runtime_dependency(%q<rails>, [">= 0"])
       s.add_runtime_dependency(%q<liquid>, [">= 0"])
       s.add_runtime_dependency(%q<nested_set>, [">= 0"])
       s.add_runtime_dependency(%q<puffer>, [">= 0.0.17"])
@@ -199,7 +203,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<mongrel>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_dependency(%q<rails>, [">= 0"])
       s.add_dependency(%q<liquid>, [">= 0"])
       s.add_dependency(%q<nested_set>, [">= 0"])
       s.add_dependency(%q<puffer>, [">= 0.0.17"])
@@ -215,7 +219,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mongrel>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 3.0.3"])
+    s.add_dependency(%q<rails>, [">= 0"])
     s.add_dependency(%q<liquid>, [">= 0"])
     s.add_dependency(%q<nested_set>, [">= 0"])
     s.add_dependency(%q<puffer>, [">= 0.0.17"])

data/spec/dummy/public/puffer/stylesheets/puffer_tree.css

@@ -5,6 +5,7 @@
 .puffer_tree li
 {
     list-style: none;
+    position: relative;
 }
 
 .puffer_tree li ul
@@ -49,3 +50,15 @@
     padding-right: 10px;
     color: #999;
 }
+
+.puffer_tree li .record .toggle
+{
+    position: absolute;
+    left: -20px;
+}
+
+.puffer_tree li .record .toggle a
+{
+    color: #999;
+    text-decoration: none;
+}

data/spec/lib/core_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'Core' do
+
+  describe 'arrange' do
+
+    it 'should generate proper hash' do
+      @root = Fabricate :page, :layout_name => 'foo_layout'
+      @foo = Fabricate :page, :slug => 'foo', :parent => @root
+      @bar = Fabricate :page, :slug => 'bar', :parent => @foo
+      @baz = Fabricate :page, :slug => 'baz', :parent => @root
+
+      @root.reload.self_and_descendants.all.arrange.should == @root.reload.self_and_descendants.arrange
+    end
+
+  end
+
+end

data/spec/lib/drops_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 describe 'Drops' do
 
-  include 
-
   def render_page(current_page, page = nil)
     request = ActionController::TestRequest.new
     request.env["rack.url_scheme"] = "http"

data/spec/lib/tags_spec.rb

@@ -44,6 +44,12 @@ describe 'Tags' do
       render_page(@page).should == @snippet.body
     end
 
+    it 'should include snippet with proper object name' do
+      @snippet = Fabricate :snippet, :name => 'var', :body => '{{ var }}'
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% assign sn = 'snippets/var' %}{% include sn with 'hello' %}"
+      render_page(@page).should == 'hello'
+    end
+
   end
 
   describe 'stylesheets' do

data/spec/models/page_spec.rb

@@ -127,6 +127,12 @@ describe Page do
       result.should == "#{@root.title} #{@root.name}"
     end
 
+    it 'should receive proper content type' do
+      @root.content_type.should == 'text/html'
+      page = Fabricate :page, :slug => 'style.css'
+      page.content_type.should == 'text/css'
+    end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer_pages
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - pyromaniac
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +03:00
+date: 2011-03-01 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,14 +23,12 @@ dependencies:
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 3
         segments: 
-        - 3
         - 0
-        - 3
-        version: 3.0.3
+        version: "0"
   requirement: *id001
   prerelease: false
   name: rails
@@ -251,6 +249,8 @@ files:
 - app/views/puffer_pages/_page_part_builder.html.erb
 - app/views/puffer_pages/_page_parts.html.erb
 - app/views/puffer_pages/_tree_page.html.erb
+- app/views/puffer_tree/_record.html.erb
+- app/views/puffer_tree/toggle.js.erb
 - app/views/puffer_tree/tree.html.erb
 - autotest/discover.rb
 - config/locales/en.yml
@@ -345,6 +345,7 @@ files:
 - spec/fabricators/pages_fabricator.rb
 - spec/fabricators/snippets_fabricator.rb
 - spec/integration/navigation_spec.rb
+- spec/lib/core_spec.rb
 - spec/lib/drops_spec.rb
 - spec/lib/tags_spec.rb
 - spec/models/page_spec.rb
@@ -417,6 +418,7 @@ test_files:
 - spec/fabricators/pages_fabricator.rb
 - spec/fabricators/snippets_fabricator.rb
 - spec/integration/navigation_spec.rb
+- spec/lib/core_spec.rb
 - spec/lib/drops_spec.rb
 - spec/lib/tags_spec.rb
 - spec/models/page_spec.rb