puffer_pages 0.0.17 → 0.0.18

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'rails', '>= 3.1.0.rc5'
+gem 'rails', '~> 3.1.0'
 gem 'puffer', :git => 'git://github.com/puffer/puffer.git'
 gem 'liquid', :git => 'git://github.com/puffer/liquid.git'
 gem 'nested_set'

data/Gemfile.lock

@@ -6,84 +6,84 @@ GIT
 
 GIT
   remote: git://github.com/puffer/puffer.git
-  revision: 133a50608537404ea10584bcd0907907f4bc596a
+  revision: b3e74b6272b02edf6ccdc4dc3dc3476d85399fa4
   specs:
-    puffer (0.0.23)
+    puffer (0.0.25)
       apotomo
       kaminari
-      rails (>= 3.1.0.rc5)
+      rails (~> 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0.rc5)
-      actionpack (= 3.1.0.rc5)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
       mail (~> 2.3.0)
-    actionpack (3.1.0.rc5)
-      activemodel (= 3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.1)
-      rack-cache (~> 1.0.2)
-      rack-mount (~> 0.8.1)
-      rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.12)
-    activemodel (3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
-      bcrypt-ruby (~> 2.1.4)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0.rc5)
-      activemodel (= 3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
-      arel (~> 2.1.4)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0.rc5)
-      activemodel (= 3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
-    activesupport (3.1.0.rc5)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
       multi_json (~> 1.0)
     apotomo (1.1.2)
       cells (>= 3.5.6)
       hooks (~> 0.1.3)
       onfire (~> 0.2.0)
-    arel (2.1.4)
-    bcrypt-ruby (2.1.4)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.0)
     builder (3.0.0)
-    capybara (1.0.0)
+    capybara (1.1.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 0.2.0)
+      selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    cells (3.6.4)
+    cells (3.6.5)
       actionpack (~> 3.0)
       railties (~> 3.0)
-    childprocess (0.2.0)
+    childprocess (0.2.2)
       ffi (~> 1.0.6)
     database_cleaner (0.6.7)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     erubis (2.7.0)
-    fabrication (1.0.1)
+    fabrication (1.1.0)
     ffi (1.0.9)
-    forgery (0.3.12)
-      nokogiri (~> 1.4)
+    forgery (0.5.0)
     git (1.2.5)
-    guard (0.5.1)
+    guard (0.6.3)
       thor (~> 0.14.6)
-    guard-rspec (0.4.0)
+    guard-rspec (0.4.4)
       guard (>= 0.4.0)
-    hike (1.2.0)
+    hike (1.2.1)
     hooks (0.1.4)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json_pure (1.5.3)
+    json_pure (1.5.4)
+      spruz (~> 0.2.8)
     kaminari (0.12.4)
       rails (>= 3.0.0)
     libnotify (0.5.7)
@@ -94,7 +94,7 @@ GEM
     mime-types (1.16)
     multi_json (1.0.3)
     mysql (2.8.1)
-    nested_set (1.6.7)
+    nested_set (1.6.8)
       activerecord (>= 3.0.0)
       railties (>= 3.0.0)
     nokogiri (1.5.0)
@@ -102,31 +102,31 @@ GEM
     pg (0.11.0)
     polyglot (0.3.2)
     rack (1.3.2)
-    rack-cache (1.0.2)
+    rack-cache (1.0.3)
       rack (>= 0.4)
-    rack-mount (0.8.1)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0.rc5)
-      actionmailer (= 3.1.0.rc5)
-      actionpack (= 3.1.0.rc5)
-      activerecord (= 3.1.0.rc5)
-      activeresource (= 3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc5)
-    railties (3.1.0.rc5)
-      actionpack (= 3.1.0.rc5)
-      activesupport (= 3.1.0.rc5)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
-    rdoc (3.9.1)
+    rdoc (3.9.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -141,20 +141,21 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.2.2)
-      childprocess (>= 0.1.9)
+    selenium-webdriver (2.5.0)
+      childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
-    sprockets (2.0.0.beta.12)
+    sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (!= 1.3.0, ~> 1.1)
+    spruz (0.2.13)
     sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     thor (0.14.6)
-    tilt (1.3.2)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
@@ -179,6 +180,6 @@ DEPENDENCIES
   nested_set
   pg
   puffer!
-  rails (>= 3.1.0.rc5)
+  rails (~> 3.1.0)
   rspec-rails
   sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/app/assets/javascripts/puffer_pages/application.js

@@ -1,6 +1,3 @@
-//= require puffer_pages/right-tabs
-//= require puffer_pages/right-dialog
+//= require puffer_pages/right-tabs-src
 //= require puffer_pages/puffer_pages
-//= require puffer_pages/codemirror
-//= require puffer_pages/codemirror-base
-//= require puffer_pages/codemirror-parser
+//= require puffer_pages/codemirror

data/app/assets/javascripts/puffer_pages/puffer_pages.js

@@ -34,13 +34,15 @@ var page_part_tab_add = function(event) {
   }).show();
 }
 
-$(document).onReady(function() {
-  $$('textarea[codemirror]').each(function(textarea) {
-    CodeMirror.fromTextArea(textarea._, {
-      basefiles: "/puffer/javascripts/codemirror-base.js",
-      parserfile: "/puffer/javascripts/codemirror-parser.js",
-      stylesheet: "/puffer/stylesheets/codemirror.css",
-      tabMode: 'shift'
-    });
+var init_codemirror = function(textarea) {
+  CodeMirror.fromTextArea(textarea._, {
+    basefiles: "/assets/puffer_pages/codemirror-base.js",
+    parserfile: "/assets/puffer_pages/codemirror-parser.js",
+    stylesheet: "/assets/puffer_pages/codemirror.css",
+    tabMode: 'shift'
   });
+}
+
+$(document).onReady(function() {
+  $$('textarea[codemirror]').each(init_codemirror);
 });

data/app/assets/stylesheets/puffer_pages/application.css

@@ -1,4 +1,3 @@
 /*
  *= require puffer_pages/puffer_pages
- *= require puffer_pages/codemirror
  */

data/app/components/page_part_body/form.html.erb

@@ -0,0 +1 @@
+<%= opts[:form].text_area field, field.input_options %>

data/app/components/page_part_body_component.rb

@@ -0,0 +1,3 @@
+class PagePartBodyComponent < BaseComponent
+
+end

data/app/components/page_parts/form.html.erb

@@ -0,0 +1,30 @@
+<ul id="page_parts" data-tabs="{closable: true, onRemove: page_part_tab_remove, addButton: page_part_tab_add}">
+  <ul>
+    <% opts[:form].object.page_parts.each_with_index do |page_part, index| %>
+      <li><%= link_to page_part.name, "#page_part_tab_#{index}" %></li>
+    <% end %>
+  </ul>
+  <% opts[:form].object.page_parts.each_with_index do |page_part, index| -%>
+    <li id="<%= "page_part_tab_#{index}" %>">
+      <% opts[:form].fields_for :page_parts, page_part do |page_part_builder| %>
+        <% field.children.each do |field| %>
+          <%= field.render parent_controller, :form, :form => page_part_builder %>
+        <% end %>
+      <% end %>
+    </li>
+  <% end -%>
+</ul>
+<div id="page_parts_marked_for_destroy">
+</div>
+
+<% new_page_part_tab_panel = capture do %>
+  <% opts[:form].fields_for :page_parts, PagePart.new, :child_index => 'new_page_part_tab_panel_index' do |page_part_builder| %>
+    <% field.children.each do |field| %>
+      <%= field.render parent_controller, :form, :form => page_part_builder %>
+    <% end %>
+  <% end %>
+<% end %>
+
+<%= javascript_tag do %>
+  var new_page_part_tab_panel = '<%= escape_javascript new_page_part_tab_panel.strip.html_safe %>'
+<% end %>

data/app/components/page_parts_component.rb

@@ -0,0 +1,7 @@
+class PagePartsComponent < Puffer::Component::Base
+
+  def form
+    render
+  end
+
+end

data/app/controllers/puffer_pages/layouts_base.rb

@@ -1,6 +1,8 @@
 class PufferPages::LayoutsBase < Puffer::Base
   unloadable
 
+  layout 'puffer_pages'
+
   setup do
     group :pages
   end

data/app/controllers/puffer_pages/pages_base.rb

@@ -23,7 +23,11 @@ class PufferPages::PagesBase < Puffer::TreeBase
   form do
     field :name
     field :slug
-    field :page_parts, :type => :page_parts
+    field :page_parts, :type => :page_parts do
+      field :body, :type => :page_part_body, :html => {:codemirror => true}
+      field :name, :type => :hidden
+      field :_destroy, :type => :hidden, :html => { :class => 'destroy_mark' }
+    end
     field :layout_name, :select => :possible_layouts
     field :status, :select => :possible_statuses
     field :title

data/app/controllers/puffer_pages/snippets_base.rb

@@ -1,6 +1,8 @@
 class PufferPages::SnippetsBase < Puffer::Base
   unloadable
 
+  layout 'puffer_pages'
+
   setup do
     group :pages
   end

data/lib/puffer_pages/liquid/page_drop.rb

@@ -6,7 +6,7 @@ module PufferPages
       include Rails.application.routes.url_helpers
 
       delegate *(Page.statuses.map {|s| "#{s}?"} << {:to => :page})
-      delegate :name, :title, :description, :keywords, :created_at, :updated_at, :to => :page
+      delegate :id, :name, :title, :description, :keywords, :created_at, :updated_at, :to => :page
 
       def initialize page, current_page = nil, controller = nil
         @page, @current_page, @controller = page, current_page, controller
@@ -14,13 +14,13 @@ module PufferPages
 
       %w(parent root).each do |attribute|
         define_method attribute do
-          instance_variable_get("@#{attribute}") || instance_variable_set("@#{attribute}", self.class.new(page.parent, current_page, request))
+          instance_variable_get("@#{attribute}") || instance_variable_set("@#{attribute}", self.class.new(page.parent, current_page, controller))
         end
       end
 
       %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, current_page, request)})
+          instance_variable_get("@#{attribute}") || instance_variable_set("@#{attribute}", page.send(attribute).map{ |ac| self.class.new(ac, current_page, controller)})
         end
       end
 
@@ -41,7 +41,7 @@ module PufferPages
       end
 
       def == drop
-        page.id == drop.send(:page).id
+        id == drop.send(:page).id
       end
 
       def before_method method

data/puffer_pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.17"
+  s.version = "0.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["pyromaniac"]
-  s.date = %q{2011-08-01}
+  s.authors = [%q{pyromaniac}]
+  s.date = %q{2011-09-09}
   s.description = %q{Puffer pages is integratable rails CMS with puffer admin interface}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -29,11 +29,14 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/puffer_pages/codemirror-parser.js",
     "app/assets/javascripts/puffer_pages/codemirror.js",
     "app/assets/javascripts/puffer_pages/puffer_pages.js",
-    "app/assets/javascripts/puffer_pages/right-dialog.js",
-    "app/assets/javascripts/puffer_pages/right-tabs.js",
+    "app/assets/javascripts/puffer_pages/right-tabs-src.js",
     "app/assets/stylesheets/puffer_pages/application.css",
     "app/assets/stylesheets/puffer_pages/codemirror.css",
     "app/assets/stylesheets/puffer_pages/puffer_pages.css",
+    "app/components/page_part_body/form.html.erb",
+    "app/components/page_part_body_component.rb",
+    "app/components/page_parts/form.html.erb",
+    "app/components/page_parts_component.rb",
     "app/controllers/admin/layouts_controller.rb",
     "app/controllers/admin/pages_controller.rb",
     "app/controllers/admin/snippets_controller.rb",
@@ -51,8 +54,6 @@ Gem::Specification.new do |s|
     "app/models/puffer_pages/snippet.rb",
     "app/models/snippet.rb",
     "app/views/layouts/puffer_pages.html.erb",
-    "app/views/puffer_pages/pages_base/_page_part_builder.html.erb",
-    "app/views/puffer_pages/pages_base/_page_parts.html.erb",
     "app/views/puffer_pages/pages_base/_tree_page.html.erb",
     "config/locales/en.yml",
     "config/puffer_routes.rb",
@@ -60,8 +61,6 @@ Gem::Specification.new do |s|
     "db/migrate/20090504132337_create_page_parts.rb",
     "db/migrate/20090506102004_create_layouts.rb",
     "db/migrate/20090510121824_create_snippets.rb",
-    "lib/puffer/inputs/page_parts.rb",
-    "lib/puffer/inputs/page_parts_body.rb",
     "lib/puffer_pages.rb",
     "lib/puffer_pages/engine.rb",
     "lib/puffer_pages/extensions/core.rb",
@@ -123,15 +122,15 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/puffer/puffer_pages}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Content management system}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.1.0.rc5"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_runtime_dependency(%q<puffer>, [">= 0"])
       s.add_runtime_dependency(%q<liquid>, [">= 0"])
       s.add_runtime_dependency(%q<nested_set>, [">= 0"])
@@ -148,7 +147,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<fabrication>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.1.0.rc5"])
+      s.add_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_dependency(%q<puffer>, [">= 0"])
       s.add_dependency(%q<liquid>, [">= 0"])
       s.add_dependency(%q<nested_set>, [">= 0"])
@@ -166,7 +165,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.1.0.rc5"])
+    s.add_dependency(%q<rails>, ["~> 3.1.0"])
     s.add_dependency(%q<puffer>, [">= 0"])
     s.add_dependency(%q<liquid>, [">= 0"])
     s.add_dependency(%q<nested_set>, [">= 0"])