puffer_pages 0.0.11 → 0.0.12

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/app/controllers/pages_controller.rb

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

data/app/models/page.rb

@@ -10,12 +10,9 @@ class Page < ActiveRecord::Base
     %w(draft hidden published)
   end
 
-  def self.root
-    roots.first
-  end
-
   def self.find_page location
-    page = Page.find_by_location 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
@@ -28,7 +25,7 @@ class Page < ActiveRecord::Base
   validate do |page|
     page.errors.add(:layout_name, :blank) unless page.inherited_layout_name.present?
   end
-  validates_uniqueness_of :slug, :scope => :parent_id
+  validates_uniqueness_of :slug, :scope => (:parent_id unless PufferPages.single_section_page_path)
   validates_format_of :slug,
     :with => /\A([\w]+[\w-]*(\.[\w]+)?|\*)\Z/,
     :message => :slug_format,
@@ -65,6 +62,10 @@ class Page < ActiveRecord::Base
     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)
@@ -95,7 +96,7 @@ class Page < ActiveRecord::Base
   end
 
   def inherited_page_parts
-    scope = 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
+    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
@@ -110,4 +111,8 @@ class Page < ActiveRecord::Base
     Rack::Mime.mime_type(File.extname(slug), 'text/html')
   end
 
+  def self_and_children
+    [self] + children
+  end
+
 end

data/lib/puffer_pages/liquid/page_drop.rb

@@ -5,59 +5,42 @@ module PufferPages
       include ActionController::UrlFor
       include Rails.application.routes.url_helpers
 
-      def initialize page, request = nil
-        @page, @request = page, request
-      end
+      delegate *(Page.statuses.map {|s| "#{s}?"} << {:to => :page})
+      delegate :root, :name, :title, :description, :keywords, :created_at, :updated_at, :to => :page
 
-      (%w(name title description keywords created_at updated_at) + Page.statuses.map{|s| "#{s}?"}).each do |attribute|
-        define_method attribute do
-          page.send(attribute)
-        end
+      def initialize page, current_page = nil, request = nil
+        @page, @request, @current_page = page, request, current_page
       end
 
       def parent
-        @parent ||= self.class.new(page.parent, @request)
+        @parent ||= self.class.new(page.parent, current_page, request)
       end
 
-      %w(ancestors children).each do |attribute|
+      %w(ancestors self_and_ancestors children self_and_children siblings self_and_siblings descendants, self_and_descendants).each do |attribute|
         define_method attribute do
-          instance_variable_get("@#{attribute}") || instance_variable_set("@#{attribute}", page.send(attribute).map{ |ac| self.class.new(ac, request)})
+          instance_variable_get("@#{attribute}") || instance_variable_set("@#{attribute}", page.send(attribute).map{ |ac| self.class.new(ac, current_page, request)})
         end
       end
 
-      def ancestors?
-        !page.root?
-      end
-
-      def children?
-        page.children.present?
-      end
-
       def path
-        puffer_page_path page.location
+        puffer_page_path page.to_location
       end
 
       def url
-        puffer_page_url page.location
+        puffer_page_url page.to_location
       end
 
       def current?
-        path == request.path_info
+        page == current_page
       end
 
       def ancestor?
-        request.path_info.start_with? path
+        page.is_ancestor_of? current_page
       end
 
     private
 
-      def request
-        @request
-      end
-
-      def page
-        @page
-      end
+      attr_reader :page, :request, :current_page
 
     end
   end

data/puffer_pages.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]

data/spec/lib/drops_spec.rb

@@ -4,14 +4,14 @@ describe 'Drops' do
 
   include 
 
-  def render_page(page, one_more = nil)
+  def render_page(current_page, page = nil)
     request = ActionController::TestRequest.new
     request.env["rack.url_scheme"] = "http"
     request.host = 'test.com'
     request.port = 80
-    request.path = "/#{page.location}"
-    page.render 'self' => PufferPages::Liquid::PageDrop.new(page, request),
-      'page' => (PufferPages::Liquid::PageDrop.new(one_more, request) if one_more)
+    request.path = "/#{current_page.location}"
+    current_page.render 'self' => PufferPages::Liquid::PageDrop.new(current_page, current_page, request),
+      'page' => (PufferPages::Liquid::PageDrop.new(page, current_page, request) if page)
   end
 
   describe 'page drop' do
@@ -20,6 +20,9 @@ describe 'Drops' do
       @root = Fabricate :page, :layout_name => 'foo_layout'
       @foo = Fabricate :page, :slug => 'hello', :parent => @root
       @bar = Fabricate :page, :slug => 'world', :parent => @foo
+      @root.reload
+      @foo.reload
+      @bar.reload
     end
 
     it 'should render proper url and path' do
@@ -39,7 +42,7 @@ describe 'Drops' do
     it 'should render proper ancestor?' do
       @layout = Fabricate :layout, :name => 'foo_layout', :body => "{{ page.ancestor? }}"
 
-      render_page(@foo, @foo).should == 'true'
+      render_page(@foo, @foo).should == 'false'
       render_page(@foo, @root).should == 'true'
       render_page(@foo, @bar).should ==  'false'
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer_pages
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - pyromaniac