puffer_pages 0.0.1 → 0.0.2

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem 'rails', '~> 3.0.3'
 gem 'liquid'
 gem 'nested_set'
-gem 'puffer'
+gem 'puffer', '>= 0.0.11'
 gem 'will_paginate', '~> 3.0.pre2'
 gem 'cells', '~> 3.4.4'
 

data/Gemfile.lock

@@ -82,7 +82,7 @@ GEM
       railties (>= 3.0.0)
     nokogiri (1.4.4)
     polyglot (0.3.1)
-    puffer (0.0.10)
+    puffer (0.0.11)
       cells (~> 3.4.4)
       rails (~> 3.0.3)
       will_paginate (~> 3.0.pre2)
@@ -148,7 +148,7 @@ DEPENDENCIES
   liquid
   mongrel
   nested_set
-  puffer
+  puffer (>= 0.0.11)
   rails (~> 3.0.3)
   rspec-rails
   sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/app/controllers/puffer_pages/pages_controller.rb

@@ -9,12 +9,24 @@ class PufferPages::PagesController < PufferPages::Base
   end
 
   form do
+    field :parent_id, :type => :hidden
     field :name
     field :slug
-    field :layout_name
+    field :layout_name, :select => :possible_layouts
     field :status, :select => Page.statuses
     field :title
     field :description
     field :keywords
   end
+
+  member do
+    get :inherit
+  end
+
+  def inherit
+    @parent = resource.member
+    @page = @parent.children.new
+    render 'new'
+  end
+
 end

data/app/helpers/puffer_pages_helper.rb

@@ -0,0 +1,19 @@
+module PufferPagesHelper
+
+  def possible_layouts
+    inherited_layout + (application_layouts + puffer_layouts).sort
+  end
+
+  def application_layouts
+    view_paths.map {|path| Dir.glob("#{path}/layouts/[^_]*")}.flatten.map {|path| File.basename(path).gsub(/\..*$/, '')}.uniq
+  end
+
+  def puffer_layouts
+    Layout.order(:name).all.map(&:name)
+  end
+
+  def inherited_layout
+    record.inherited_layout_name ? [[t('puffer.inherited_layout', :name => record.inherited_layout_name), '']] : []
+  end
+
+end

data/config/locales/en.yml

@@ -0,0 +1,3 @@
+en:
+  puffer:
+    inherited_layout: inherited (%{name})

data/lib/puffer_pages/base.rb

@@ -1,6 +1,8 @@
 class PufferPages::Base < Puffer::Base
   unloadable
 
+  helper :puffer_pages
+
   configure do
     group :cms
   end

data/puffer_pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
-  s.date = %q{2011-02-03}
+  s.date = %q{2011-02-04}
   s.description = %q{Puffer pages is integratable rails CMS with puffer admin interface}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -27,11 +27,13 @@ Gem::Specification.new do |s|
     "app/controllers/puffer_pages/layouts_controller.rb",
     "app/controllers/puffer_pages/pages_controller.rb",
     "app/controllers/puffer_pages/snippets_controller.rb",
+    "app/helpers/puffer_pages_helper.rb",
     "app/models/layout.rb",
     "app/models/page.rb",
     "app/models/page_part.rb",
     "app/models/snippet.rb",
     "autotest/discover.rb",
+    "config/locales/en.yml",
     "config/puffer_routes.rb",
     "config/routes.rb",
     "lib/generators/puffer_pages/install/USAGE",
@@ -169,7 +171,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rails>, ["~> 3.0.3"])
       s.add_runtime_dependency(%q<liquid>, [">= 0"])
       s.add_runtime_dependency(%q<nested_set>, [">= 0"])
-      s.add_runtime_dependency(%q<puffer>, [">= 0"])
+      s.add_runtime_dependency(%q<puffer>, [">= 0.0.11"])
       s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
       s.add_runtime_dependency(%q<cells>, ["~> 3.4.4"])
       s.add_development_dependency(%q<capybara>, [">= 0.4.0"])
@@ -184,7 +186,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails>, ["~> 3.0.3"])
       s.add_dependency(%q<liquid>, [">= 0"])
       s.add_dependency(%q<nested_set>, [">= 0"])
-      s.add_dependency(%q<puffer>, [">= 0"])
+      s.add_dependency(%q<puffer>, [">= 0.0.11"])
       s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
       s.add_dependency(%q<cells>, ["~> 3.4.4"])
       s.add_dependency(%q<capybara>, [">= 0.4.0"])
@@ -200,7 +202,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails>, ["~> 3.0.3"])
     s.add_dependency(%q<liquid>, [">= 0"])
     s.add_dependency(%q<nested_set>, [">= 0"])
-    s.add_dependency(%q<puffer>, [">= 0"])
+    s.add_dependency(%q<puffer>, [">= 0.0.11"])
     s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
     s.add_dependency(%q<cells>, ["~> 3.4.4"])
     s.add_dependency(%q<capybara>, [">= 0.4.0"])

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

@@ -273,7 +273,7 @@ h1
     background: #f4f4f4;
 }
 
-label, input, textarea
+label, input, textarea, select
 {
 	font-family: Helvetica, Arial, sans-serif;
 }
@@ -302,6 +302,11 @@ input[type=submit]
     font-size: 11pt;
 }
 
+select
+{
+    font-size: 11pt;
+}
+
 #search
 {
     width: 120px;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer_pages
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - pyromaniac
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +03:00
+date: 2011-02-04 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,10 +69,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 9
         segments: 
         - 0
-        version: "0"
+        - 0
+        - 11
+        version: 0.0.11
   requirement: *id004
   prerelease: false
   name: puffer
@@ -245,11 +247,13 @@ files:
 - app/controllers/puffer_pages/layouts_controller.rb
 - app/controllers/puffer_pages/pages_controller.rb
 - app/controllers/puffer_pages/snippets_controller.rb
+- app/helpers/puffer_pages_helper.rb
 - app/models/layout.rb
 - app/models/page.rb
 - app/models/page_part.rb
 - app/models/snippet.rb
 - autotest/discover.rb
+- config/locales/en.yml
 - config/puffer_routes.rb
 - config/routes.rb
 - lib/generators/puffer_pages/install/USAGE