puffer_pages 0.0.8 → 0.0.9

data/Gemfile

@@ -5,9 +5,11 @@ gem 'liquid'
 gem 'nested_set'
 gem 'puffer', '>= 0.0.17'
 
-group :development, :test do
+group :development, :test, :pg_test do
   gem "capybara", ">= 0.4.0"
   gem "sqlite3-ruby", :require => "sqlite3"
+  gem "pg"
+  gem "mysql"
 
   gem "rspec-rails"
   gem "autotest"

data/Gemfile.lock

@@ -77,10 +77,12 @@ GEM
       daemons (>= 1.0.3)
       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)
       cells (~> 3.4.4)
@@ -146,7 +148,9 @@ DEPENDENCIES
   jeweler
   liquid
   mongrel
+  mysql
   nested_set
+  pg
   puffer (>= 0.0.17)
   rails (~> 3.0.3)
   rspec-rails

data/README.md

@@ -46,12 +46,16 @@ Pages - tree-based structure of site.
 Every page has one or more page parts.
 Every page part must have main page part, named by default `body`. You can configure main page part name in config/initializers/puffer_pages.rb
 
+## PageParts
+Page_parts are the same as content_for block in rails. You can insert current page page_patrs at layout.
+Also, page_parts are inheritable. It means, that if root has page_part named `sidebar`, all its children will have the same page_part until this page_part will be redefined.
+
 ## Layouts
 Layout is page canvas, so you can draw page parts on it.
 You can use layouts from database or applcation for pages.
 
 ### Application layouts
-For application layout page part body will be inserted instead of SUDDENLY! <%= yield %>
+For application layout page_part body will be inserted instead of SUDDENLY! <%= yield %>
 Rules are the same. If no page part name specified puffer will use page part with default name.
 See `yield` liquid tag reference
 

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/app/models/page.rb

@@ -95,7 +95,14 @@ class Page < ActiveRecord::Base
   end
 
   def inherited_page_parts
-    PagePart.where(:page_id => self_and_ancestors.map(&:id).reverse).group('name').order("name = '#{PufferPages.primary_page_part_name}' desc, name")
+    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
   end
 
   def part name

data/puffer_pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-02-12}
+  s.date = %q{2011-02-13}
   s.description = %q{Puffer pages is integratable rails CMS with puffer admin interface}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -84,6 +84,7 @@ Gem::Specification.new do |s|
     "spec/dummy/config/database.yml",
     "spec/dummy/config/environment.rb",
     "spec/dummy/config/environments/development.rb",
+    "spec/dummy/config/environments/pg_test.rb",
     "spec/dummy/config/environments/production.rb",
     "spec/dummy/config/environments/test.rb",
     "spec/dummy/config/initializers/backtrace_silencers.rb",
@@ -129,8 +130,8 @@ Gem::Specification.new do |s|
     "spec/fabricators/pages_fabricator.rb",
     "spec/fabricators/snippets_fabricator.rb",
     "spec/integration/navigation_spec.rb",
+    "spec/lib/tags_spec.rb",
     "spec/models/page_spec.rb",
-    "spec/models/tags_spec.rb",
     "spec/puffer_pages_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -150,6 +151,7 @@ Gem::Specification.new do |s|
     "spec/dummy/config/boot.rb",
     "spec/dummy/config/environment.rb",
     "spec/dummy/config/environments/development.rb",
+    "spec/dummy/config/environments/pg_test.rb",
     "spec/dummy/config/environments/production.rb",
     "spec/dummy/config/environments/test.rb",
     "spec/dummy/config/initializers/backtrace_silencers.rb",
@@ -170,8 +172,8 @@ Gem::Specification.new do |s|
     "spec/fabricators/pages_fabricator.rb",
     "spec/fabricators/snippets_fabricator.rb",
     "spec/integration/navigation_spec.rb",
+    "spec/lib/tags_spec.rb",
     "spec/models/page_spec.rb",
-    "spec/models/tags_spec.rb",
     "spec/puffer_pages_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -186,6 +188,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<puffer>, [">= 0.0.17"])
       s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<pg>, [">= 0"])
+      s.add_development_dependency(%q<mysql>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<forgery>, [">= 0"])
@@ -199,6 +203,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<puffer>, [">= 0.0.17"])
       s.add_dependency(%q<capybara>, [">= 0.4.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<pg>, [">= 0"])
+      s.add_dependency(%q<mysql>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<forgery>, [">= 0"])
@@ -213,6 +219,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<puffer>, [">= 0.0.17"])
     s.add_dependency(%q<capybara>, [">= 0.4.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<pg>, [">= 0"])
+    s.add_dependency(%q<mysql>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<forgery>, [">= 0"])

data/spec/dummy/config/database.yml

@@ -15,6 +15,13 @@ test:
   pool: 5
   timeout: 5000
 
+pg_test:
+  adapter: postgresql
+  hostname: localhost
+  database: puffer_pages
+  schema_search_path: public
+  encoding: utf8
+
 production:
   adapter: sqlite3
   database: db/development.sqlite3

data/spec/dummy/config/environments/pg_test.rb

@@ -0,0 +1,35 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer_pages
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - pyromaniac
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 +03:00
+date: 2011-02-13 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,7 +121,7 @@ dependencies:
         version: "0"
   requirement: *id007
   prerelease: false
-  name: rspec-rails
+  name: pg
 - !ruby/object:Gem::Dependency 
   type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
@@ -135,7 +135,7 @@ dependencies:
         version: "0"
   requirement: *id008
   prerelease: false
-  name: autotest
+  name: mysql
 - !ruby/object:Gem::Dependency 
   type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement 
@@ -149,10 +149,38 @@ dependencies:
         version: "0"
   requirement: *id009
   prerelease: false
-  name: forgery
+  name: rspec-rails
 - !ruby/object:Gem::Dependency 
   type: :development
   version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id010
+  prerelease: false
+  name: autotest
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id011
+  prerelease: false
+  name: forgery
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -163,12 +191,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  requirement: *id010
+  requirement: *id012
   prerelease: false
   name: fabrication
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,12 +205,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
+  requirement: *id013
   prerelease: false
   name: jeweler
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -191,7 +219,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
+  requirement: *id014
   prerelease: false
   name: mongrel
 description: Puffer pages is integratable rails CMS with puffer admin interface
@@ -271,6 +299,7 @@ files:
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/pg_test.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
@@ -316,8 +345,8 @@ files:
 - spec/fabricators/pages_fabricator.rb
 - spec/fabricators/snippets_fabricator.rb
 - spec/integration/navigation_spec.rb
+- spec/lib/tags_spec.rb
 - spec/models/page_spec.rb
-- spec/models/tags_spec.rb
 - spec/puffer_pages_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -366,6 +395,7 @@ test_files:
 - spec/dummy/config/boot.rb
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/pg_test.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
@@ -386,7 +416,7 @@ test_files:
 - spec/fabricators/pages_fabricator.rb
 - spec/fabricators/snippets_fabricator.rb
 - spec/integration/navigation_spec.rb
+- spec/lib/tags_spec.rb
 - spec/models/page_spec.rb
-- spec/models/tags_spec.rb
 - spec/puffer_pages_spec.rb
 - spec/spec_helper.rb