puffer_pages 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/app/models/page.rb

@@ -95,14 +95,7 @@ class Page < ActiveRecord::Base
   end
 
   def inherited_page_parts
-    scope = PagePart.where(:page_id => self_and_ancestors.map(&:id).reverse)
-    case PagePart.connection.adapter_name.downcase
-    when 'postgresql' then
-      ids = scope.select('distinct on (page_parts.name) page_parts.id').joins(:page).order('page_parts.name, pages.lft desc').map(&:id)
-      PagePart.where(:id => ids).order("name = '#{PufferPages.primary_page_part_name}' desc, name")
-    else
-      scope.group('name').order("name = '#{PufferPages.primary_page_part_name}' desc, name")
-    end
+    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
   end
 
   def part name

data/lib/puffer_pages/liquid/file_system.rb

@@ -9,11 +9,11 @@ module PufferPages
         when :snippet then
           template_path = template_path.gsub(/^snippets\//, '')
           snippet = Snippet.find_by_name(template_path)
-          raise FileSystemError, "No such snippet '#{template_path}' found" unless snippet
+          raise ::Liquid::FileSystemError, "No such snippet '#{template_path}' found" unless snippet
           snippet.body
         when :page_part then
           page_part = context.registers[:page].part(template_path)
-          raise FileSystemError, "No such page_part '#{template_path}' found for current page" unless page_part
+          raise ::Liquid::FileSystemError, "No such page_part '#{template_path}' found for current page" unless page_part
           page_part.body
         end
       end

data/puffer_pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-02-13}
+  s.date = %q{2011-02-14}
   s.description = %q{Puffer pages is integratable rails CMS with puffer admin interface}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer_pages
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - pyromaniac
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 +03:00
+date: 2011-02-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency