puffer_pages 0.0.18 → 0.0.19

data/app/assets/stylesheets/puffer/codemirror/elegant.css

@@ -0,0 +1,9 @@
+.cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;}
+.cm-s-elegant span.cm-comment {color: #262;font-style: italic;}
+.cm-s-elegant span.cm-meta {color: #555;font-style: italic;}
+.cm-s-elegant span.cm-variable {color: black;}
+.cm-s-elegant span.cm-variable-2 {color: #b11;}
+.cm-s-elegant span.cm-qualifier {color: #555;}
+.cm-s-elegant span.cm-keyword {color: #730;}
+.cm-s-elegant span.cm-builtin {color: #30a;}
+.cm-s-elegant span.cm-error {background-color: #fdd;}

data/app/assets/stylesheets/puffer/codemirror/neat.css

@@ -0,0 +1,8 @@
+.cm-s-neat span.cm-comment { color: #a86; }
+.cm-s-neat span.cm-keyword { font-weight: bold; color: blue; }
+.cm-s-neat span.cm-string { color: #a22; }
+.cm-s-neat span.cm-builtin { font-weight: bold; color: #077; }
+.cm-s-neat span.cm-special { font-weight: bold; color: #0aa; }
+.cm-s-neat span.cm-variable { color: black; }
+.cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; }
+.cm-s-neat span.cm-meta {color: #555;}

data/app/assets/stylesheets/puffer/codemirror/night.css

@@ -0,0 +1,20 @@
+/* Loosely based on the Midnight Textmate theme */
+
+.cm-s-night { background: #0a001f; color: #f8f8f8; }
+.cm-s-night span.CodeMirror-selected { background: #a8f !important; }
+.cm-s-night .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-night .CodeMirror-gutter-text { color: #f8f8f8; }
+.cm-s-night .CodeMirror-cursor { border-left: 1px solid white !important; }
+
+.cm-s-night span.cm-comment { color: #6900a1; }
+.cm-s-night span.cm-atom { color: #845dc4; }
+.cm-s-night span.cm-number, .cm-s-night span.cm-attribute { color: #ffd500; }
+.cm-s-night span.cm-keyword { color: #599eff; }
+.cm-s-night span.cm-string { color: #37f14a; }
+.cm-s-night span.cm-meta { color: #7678e2; }
+.cm-s-night span.cm-variable-2, .cm-s-night span.cm-tag { color: #99b2ff; }
+.cm-s-night span.cm-variable-3, .cm-s-night span.cm-def { color: white; }
+.cm-s-night span.cm-error { color: #9d1e15; }
+.cm-s-night span.cm-bracket { color: #8da6ce; }
+.cm-s-night span.cm-comment { color: #6900a1; }
+.cm-s-night span.cm-builtin, .cm-s-night span.cm-special { color: #ff9e59; }

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

@@ -0,0 +1,7 @@
+//= require puffer/codemirror
+//= require_tree ./codemirror
+
+.rui-tabs li
+{
+    margin-bottom: 0;
+}

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

@@ -1,15 +1,16 @@
-<ul id="page_parts" data-tabs="{closable: true, onRemove: page_part_tab_remove, addButton: page_part_tab_add}">
+<ul id="<%= field.name %>" 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| %>
+    <% opts[:form].object.send(field.name).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| -%>
+  <% opts[:form].object.send(field.name).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| %>
+      <% opts[:form].fields_for field.name, page_part, :hidden_field_id => true do |page_part_builder| %>
         <% field.children.each do |field| %>
           <%= field.render parent_controller, :form, :form => page_part_builder %>
         <% end %>
+        <%= page_part_builder.hidden_field :id unless page_part_builder.object.persisted? %>
       <% end %>
     </li>
   <% end -%>
@@ -18,7 +19,7 @@
 </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| %>
+  <% opts[:form].fields_for field.name, 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 %>
@@ -26,5 +27,5 @@
 <% end %>
 
 <%= javascript_tag do %>
-  var new_page_part_tab_panel = '<%= escape_javascript new_page_part_tab_panel.strip.html_safe %>'
+  var new_page_part_tab_panel = '<%= j new_page_part_tab_panel.strip.html_safe %>'
 <% end %>

data/app/controllers/puffer_pages/layouts_base.rb

@@ -1,10 +1,9 @@
 class PufferPages::LayoutsBase < Puffer::Base
   unloadable
 
-  layout 'puffer_pages'
-
   setup do
     group :pages
+    model_name :layout
   end
 
   index do

data/app/controllers/puffer_pages/pages_base.rb

@@ -1,12 +1,11 @@
 class PufferPages::PagesBase < Puffer::TreeBase
   unloadable
 
-  layout 'puffer_pages'
-
   helper :puffer_pages
 
   setup do
     group :pages
+    model_name :page
   end
 
   tree do

data/app/controllers/puffer_pages/snippets_base.rb

@@ -1,10 +1,9 @@
 class PufferPages::SnippetsBase < Puffer::Base
   unloadable
 
-  layout 'puffer_pages'
-
   setup do
     group :pages
+    model_name :snippet
   end
 
   index do

data/puffer_pages.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.18"
+  s.version = "0.0.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{pyromaniac}]
-  s.date = %q{2011-09-09}
+  s.date = %q{2011-10-27}
   s.description = %q{Puffer pages is integratable rails CMS with puffer admin interface}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -24,15 +24,22 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
-    "app/assets/javascripts/puffer_pages/application.js",
-    "app/assets/javascripts/puffer_pages/codemirror-base.js",
-    "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-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/assets/javascripts/puffer/codemirror.js",
+    "app/assets/javascripts/puffer/codemirror/css.js",
+    "app/assets/javascripts/puffer/codemirror/htmlmixed.js",
+    "app/assets/javascripts/puffer/codemirror/javascript.js",
+    "app/assets/javascripts/puffer/codemirror/xml.js",
+    "app/assets/javascripts/puffer/overlay.js",
+    "app/assets/javascripts/puffer/puffer_pages.js",
+    "app/assets/javascripts/puffer/right-tabs-src.js",
+    "app/assets/stylesheets/puffer/codemirror.css",
+    "app/assets/stylesheets/puffer/codemirror/cobalt.css",
+    "app/assets/stylesheets/puffer/codemirror/default.css",
+    "app/assets/stylesheets/puffer/codemirror/eclipse.css",
+    "app/assets/stylesheets/puffer/codemirror/elegant.css",
+    "app/assets/stylesheets/puffer/codemirror/neat.css",
+    "app/assets/stylesheets/puffer/codemirror/night.css",
+    "app/assets/stylesheets/puffer/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",
@@ -53,7 +60,6 @@ Gem::Specification.new do |s|
     "app/models/puffer_pages/page_part.rb",
     "app/models/puffer_pages/snippet.rb",
     "app/models/snippet.rb",
-    "app/views/layouts/puffer_pages.html.erb",
     "app/views/puffer_pages/pages_base/_tree_page.html.erb",
     "config/locales/en.yml",
     "config/puffer_routes.rb",

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  def has_puffer_access? namespace
+    true
+  end
 end

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

@@ -24,4 +24,7 @@ Dummy::Application.configure do
 
   # Do not compress assets
   config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
 end

data/spec/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puffer_pages
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000Z
+date: 2011-10-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &21147960 !ruby/object:Gem::Requirement
+  requirement: &14370180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *21147960
+  version_requirements: *14370180
 - !ruby/object:Gem::Dependency
   name: puffer
-  requirement: &21146840 !ruby/object:Gem::Requirement
+  requirement: &14369580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21146840
+  version_requirements: *14369580
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &21145940 !ruby/object:Gem::Requirement
+  requirement: &14338380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21145940
+  version_requirements: *14338380
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &21144900 !ruby/object:Gem::Requirement
+  requirement: &14337760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21144900
+  version_requirements: *14337760
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &21144000 !ruby/object:Gem::Requirement
+  requirement: &14337160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21144000
+  version_requirements: *14337160
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &21142840 !ruby/object:Gem::Requirement
+  requirement: &14336520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21142840
+  version_requirements: *14336520
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &19229200 !ruby/object:Gem::Requirement
+  requirement: &14335860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19229200
+  version_requirements: *14335860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &19221700 !ruby/object:Gem::Requirement
+  requirement: &14335360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19221700
+  version_requirements: *14335360
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &19218260 !ruby/object:Gem::Requirement
+  requirement: &14334880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *19218260
+  version_requirements: *14334880
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &19197020 !ruby/object:Gem::Requirement
+  requirement: &14334400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19197020
+  version_requirements: *14334400
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &19192240 !ruby/object:Gem::Requirement
+  requirement: &14333900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19192240
+  version_requirements: *14333900
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &19189500 !ruby/object:Gem::Requirement
+  requirement: &14333380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19189500
+  version_requirements: *14333380
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &19186120 !ruby/object:Gem::Requirement
+  requirement: &14332840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19186120
+  version_requirements: *14332840
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &19181780 !ruby/object:Gem::Requirement
+  requirement: &14332340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19181780
+  version_requirements: *14332340
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &19176340 !ruby/object:Gem::Requirement
+  requirement: &14331840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19176340
+  version_requirements: *14331840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &19170480 !ruby/object:Gem::Requirement
+  requirement: &14331360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19170480
+  version_requirements: *14331360
 description: Puffer pages is integratable rails CMS with puffer admin interface
 email: kinwizard@gmail.com
 executables: []
@@ -202,15 +202,22 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- app/assets/javascripts/puffer_pages/application.js
-- app/assets/javascripts/puffer_pages/codemirror-base.js
-- 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-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/assets/javascripts/puffer/codemirror.js
+- app/assets/javascripts/puffer/codemirror/css.js
+- app/assets/javascripts/puffer/codemirror/htmlmixed.js
+- app/assets/javascripts/puffer/codemirror/javascript.js
+- app/assets/javascripts/puffer/codemirror/xml.js
+- app/assets/javascripts/puffer/overlay.js
+- app/assets/javascripts/puffer/puffer_pages.js
+- app/assets/javascripts/puffer/right-tabs-src.js
+- app/assets/stylesheets/puffer/codemirror.css
+- app/assets/stylesheets/puffer/codemirror/cobalt.css
+- app/assets/stylesheets/puffer/codemirror/default.css
+- app/assets/stylesheets/puffer/codemirror/eclipse.css
+- app/assets/stylesheets/puffer/codemirror/elegant.css
+- app/assets/stylesheets/puffer/codemirror/neat.css
+- app/assets/stylesheets/puffer/codemirror/night.css
+- app/assets/stylesheets/puffer/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
@@ -231,7 +238,6 @@ files:
 - app/models/puffer_pages/page_part.rb
 - app/models/puffer_pages/snippet.rb
 - app/models/snippet.rb
-- app/views/layouts/puffer_pages.html.erb
 - app/views/puffer_pages/pages_base/_tree_page.html.erb
 - config/locales/en.yml
 - config/puffer_routes.rb
@@ -312,7 +318,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1478367954881148837
+      hash: -3241101979451614417
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: