radiant-templates-extension 1.0.0 → 1.0.1

data/HELP_designer.textile

@@ -56,9 +56,9 @@ h4. Creating a new page
 
 h4. Changing the template for an existing page
 
-* When editing the page, expand the meta drawer, by clicking 'More' underneath the Page Title.
-* You will see the current template bolded, and the others as links
-* To change to another template, simply select it, and save the page.
+* When editing a page, you will see the Template Selector at the top left, just to the right of the 'Edit Page header.
+* Click this to see all available templates
+* To change to another template, simply select it, and then save the page (Simply selecting it will not change it -- you must save the page).
 
 WARNING: For page parts of your old template, if your new template does a page parts of the same name, then that content will be lost.  This is a good reason to follow naming standards when creating templates, e.g. define a page part "main_content" for all your templates.
 

data/README.textile

@@ -96,9 +96,9 @@ h4. Creating a new page
 
 h4. Changing the template for an existing page
 
-* When editing the page, expand the meta drawer, by clicking 'More' underneath the Page Title.
-* You will see the current template bolded, and the others as links
-* To change to another template, simply select it, and save the page.
+* When editing a page, you will see the Template Selector at the top left, just to the right of the 'Edit Page header.
+* Click this to see all available templates
+* To change to another template, simply select it, and then save the page (Simply selecting it will not change it -- you must save the page).
 
 WARNING: For page parts of your old template, if your new template does a page parts of the same name, then that content will be lost.  This is a good reason to follow naming standards when creating templates, e.g. define a page part "main_content" for all your templates.
 

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.email = "avonderluft@avlux.net"
     gem.homepage = "https://github.com/avonderluft/radiant-templates-extension"
     gem.authors = ['Andrew vonderLuft','Sean Cribbs']
-    gem.add_dependency 'radiant', ">=0.9.1"
+    gem.add_dependency 'radiant', ">=1.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/app/views/admin/pages/_edit_template.html.haml

@@ -19,8 +19,7 @@
 - content_for :page_css do
   :sass
     .template_part
-      padding: 6px 0
-      border-bottom: 1px solid #DFDCD1
+      padding: 4px 0
       width: 100%
       label
       textarea.textarea

data/app/views/admin/pages/_switch_templates.html.haml

@@ -10,12 +10,12 @@
 
 - content_for :page_css do
   :sass
+    @import "compass/utilities/lists/inline-list"
     ul#template-chooser
-      list-style: none
+      +inline-list
       li, li a
-        display: inline
-        padding: 0.3em
-        line-height: 2.0em
+        padding: 0.2em
+        line-height: 1.5em
         color: white
         white-space: nowrap
         &.selected

data/app/views/admin/pages/_template_chooser.html.haml

@@ -0,0 +1,43 @@
+.template_chooser
+  %table.index
+    %tr
+      %td.label Template Selector >
+      %td.actions
+        - @content_template ||= @page.template
+        = link_to @page.template_name, "#template_choices", :class => "action dropdown"
+        %ul.menu{:id => "template_choices"}
+          %li= link_to "Blank Page", @page.id.nil? ? "?template=" : "?template=0"
+          %li.separator
+          - ::Template.find(:all).each do |template|
+            %li= link_to image('template') + ' ' + template.name.humanize.titleize, "?template=#{template.id}"
+          %li{:class => @content_template.blank? ? 'selected' : nil}
+
+- content_for :page_css do
+  :sass
+    .template_chooser
+      float: left
+      background: #7E7E7E
+      table.index
+        margin: -2px 0 0 60px
+        border: none
+        tr, td.label, td.actions
+          border: none
+          padding: 0px
+          background: #7E7E7E
+        td.label
+          text-align: right
+          padding-right: 6px
+        td.actions
+          width: 178px
+          a.action, span.action.disabled
+            color: white
+            text-decoration: underline
+            margin: 0
+            &:hover
+              color: black
+              text-decoration: none
+              background: #eee image_url('admin/buttons_background.png') repeat-x
+            &.selected
+              color: black
+              text-decoration: none
+              background: #c5e0f5

data/app/views/admin/templates/index.html.haml

@@ -42,6 +42,5 @@
 - render_region :bottom do |bottom|
   - bottom.new_button do
     #actions
-      = pagination_for(@templates)
       %ul
         %li= link_to image('plus') + " " + t('new_template'), new_admin_template_url

data/radiant-templates-extension.gemspec

@@ -0,0 +1,176 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{radiant-templates-extension}
+  s.version = "1.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Andrew vonderLuft", "Sean Cribbs"]
+  s.date = %q{2011-04-06}
+  s.description = %q{Imposes structure on pages via content templates.}
+  s.email = %q{avonderluft@avlux.net}
+  s.extra_rdoc_files = [
+    "README.textile"
+  ]
+  s.files = [
+    "HELP_designer.textile",
+    "README.textile",
+    "Rakefile",
+    "VERSION",
+    "app/controllers/admin/part_types_controller.rb",
+    "app/controllers/admin/templates_controller.rb",
+    "app/helpers/admin/part_types_helper.rb",
+    "app/helpers/admin/templates_helper.rb",
+    "app/models/part_type.rb",
+    "app/models/template.rb",
+    "app/models/template_part.rb",
+    "app/views/admin/pages/_edit_template.html.haml",
+    "app/views/admin/pages/_edit_template_part.html.haml",
+    "app/views/admin/pages/_switch_templates.html.haml",
+    "app/views/admin/pages/_template_chooser.html.haml",
+    "app/views/admin/pages/_template_column.html.haml",
+    "app/views/admin/pages/_template_column_header.html.haml",
+    "app/views/admin/part_types/_form.html.haml",
+    "app/views/admin/part_types/_list.html.haml",
+    "app/views/admin/part_types/edit.html.haml",
+    "app/views/admin/part_types/index.html.haml",
+    "app/views/admin/part_types/new.html.haml",
+    "app/views/admin/part_types/remove.html.haml",
+    "app/views/admin/templates/_form.html.haml",
+    "app/views/admin/templates/_template_part.html.haml",
+    "app/views/admin/templates/_templates_css.html.haml",
+    "app/views/admin/templates/edit.html.haml",
+    "app/views/admin/templates/index.html.haml",
+    "app/views/admin/templates/new.html.haml",
+    "app/views/admin/templates/remove.html.haml",
+    "config/initializers/radiant_config.rb",
+    "config/locales/en.yml",
+    "config/routes.rb",
+    "db/migrate/001_create_templates.rb",
+    "db/migrate/002_create_template_parts.rb",
+    "db/migrate/003_rename_sublayout_column.rb",
+    "db/migrate/004_add_position_to_templates.rb",
+    "db/migrate/005_create_part_types.rb",
+    "db/migrate/006_add_description_to_template_parts.rb",
+    "db/migrate/007_add_page_class_name_to_templates.rb",
+    "db/migrate/008_add_index_to_templates.rb",
+    "db/migrate/009_create_default_part_types.rb",
+    "db/migrate/010_update_boolean_part_type.rb",
+    "db/migrate/011_add_timestamps.rb",
+    "lib/file_system/model/part_type_extensions.rb",
+    "lib/file_system/model/template_extensions.rb",
+    "lib/tasks/templates_extension_tasks.rake",
+    "lib/templates/associations.rb",
+    "lib/templates/controller_extensions.rb",
+    "lib/templates/helper.rb",
+    "lib/templates/page_extensions.rb",
+    "lib/templates/tags.rb",
+    "pkg/radiant-templates-extension-1.0.0.gem",
+    "public/images/admin/menu_arrow.png",
+    "public/images/admin/move_higher.png",
+    "public/images/admin/move_lower.png",
+    "public/images/admin/move_to_bottom.png",
+    "public/images/admin/move_to_top.png",
+    "public/images/admin/part_type.png",
+    "public/images/admin/template.png",
+    "radiant-templates-extension.gemspec",
+    "spec/controllers/admin_page_controller_extensions_spec.rb",
+    "spec/controllers/part_types_controller_spec.rb",
+    "spec/controllers/templates_controller_spec.rb",
+    "spec/datasets/part_types_dataset.rb",
+    "spec/datasets/templates_dataset.rb",
+    "spec/helpers/templates_helper_spec.rb",
+    "spec/models/page_extensions_spec.rb",
+    "spec/models/part_type_spec.rb",
+    "spec/models/tags_spec.rb",
+    "spec/models/template_part_spec.rb",
+    "spec/models/template_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "templates_extension.rb",
+    "vendor/plugins/acts_as_list/README",
+    "vendor/plugins/acts_as_list/init.rb",
+    "vendor/plugins/acts_as_list/lib/active_record/acts/list.rb",
+    "vendor/plugins/acts_as_list/test/list_test.rb",
+    "vendor/plugins/make_resourceful/.gitignore",
+    "vendor/plugins/make_resourceful/DEFAULTS",
+    "vendor/plugins/make_resourceful/LICENSE",
+    "vendor/plugins/make_resourceful/README",
+    "vendor/plugins/make_resourceful/Rakefile",
+    "vendor/plugins/make_resourceful/VERSION",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/resourceful_scaffold_generator.rb",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/controller.rb",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/fixtures.yml",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/functional_test.rb",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/helper.rb",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/migration.rb",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/model.rb",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/unit_test.rb",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view__form.haml",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_edit.haml",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_index.haml",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_new.haml",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_partial.haml",
+    "vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/view_show.haml",
+    "vendor/plugins/make_resourceful/init.rb",
+    "vendor/plugins/make_resourceful/lib/resourceful/base.rb",
+    "vendor/plugins/make_resourceful/lib/resourceful/builder.rb",
+    "vendor/plugins/make_resourceful/lib/resourceful/default/accessors.rb",
+    "vendor/plugins/make_resourceful/lib/resourceful/default/actions.rb",
+    "vendor/plugins/make_resourceful/lib/resourceful/default/callbacks.rb",
+    "vendor/plugins/make_resourceful/lib/resourceful/default/responses.rb",
+    "vendor/plugins/make_resourceful/lib/resourceful/default/urls.rb",
+    "vendor/plugins/make_resourceful/lib/resourceful/maker.rb",
+    "vendor/plugins/make_resourceful/lib/resourceful/response.rb",
+    "vendor/plugins/make_resourceful/lib/resourceful/serialize.rb",
+    "vendor/plugins/make_resourceful/spec/accessors_spec.rb",
+    "vendor/plugins/make_resourceful/spec/actions_spec.rb",
+    "vendor/plugins/make_resourceful/spec/base_spec.rb",
+    "vendor/plugins/make_resourceful/spec/builder_spec.rb",
+    "vendor/plugins/make_resourceful/spec/callbacks_spec.rb",
+    "vendor/plugins/make_resourceful/spec/integration_spec.rb",
+    "vendor/plugins/make_resourceful/spec/maker_spec.rb",
+    "vendor/plugins/make_resourceful/spec/response_spec.rb",
+    "vendor/plugins/make_resourceful/spec/responses_spec.rb",
+    "vendor/plugins/make_resourceful/spec/rspec-rails/LICENSE",
+    "vendor/plugins/make_resourceful/spec/rspec-rails/redirect_to.rb",
+    "vendor/plugins/make_resourceful/spec/rspec-rails/render_template.rb",
+    "vendor/plugins/make_resourceful/spec/serialize_spec.rb",
+    "vendor/plugins/make_resourceful/spec/spec_helper.rb",
+    "vendor/plugins/make_resourceful/spec/urls_spec.rb"
+  ]
+  s.homepage = %q{https://github.com/avonderluft/radiant-templates-extension}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Templates Extension for Radiant CMS}
+  s.test_files = [
+    "spec/controllers/admin_page_controller_extensions_spec.rb",
+    "spec/controllers/part_types_controller_spec.rb",
+    "spec/controllers/templates_controller_spec.rb",
+    "spec/datasets/part_types_dataset.rb",
+    "spec/datasets/templates_dataset.rb",
+    "spec/helpers/templates_helper_spec.rb",
+    "spec/models/page_extensions_spec.rb",
+    "spec/models/part_type_spec.rb",
+    "spec/models/tags_spec.rb",
+    "spec/models/template_part_spec.rb",
+    "spec/models/template_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  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<radiant>, [">= 1.0.0"])
+    else
+      s.add_dependency(%q<radiant>, [">= 1.0.0"])
+    end
+  else
+    s.add_dependency(%q<radiant>, [">= 1.0.0"])
+  end
+end
+

data/templates_extension.rb

@@ -27,7 +27,7 @@ class TemplatesExtension < Radiant::Extension
     # Admin UI customization
     admin.page.index.add :node, 'template_column', :after => 'title_column'
     admin.page.index.add :sitemap_head, 'template_column_header', :after => 'title_column_header'
-    admin.page.edit.add :extended_metadata, 'switch_templates', :after => 'breadcrumb'
+    admin.page.edit.add :main, "template_chooser", :before => "edit_header"
     admin.page.edit.add :form, 'edit_template', :before => 'edit_page_parts'
     admin.page.edit.form.delete 'edit_page_parts'
     admin.page.edit.parts_bottom.delete 'edit_layout_and_type'

data/vendor/plugins/make_resourceful/.gitignore

@@ -0,0 +1 @@
+testapp

data/vendor/plugins/make_resourceful/DEFAULTS

@@ -15,7 +15,7 @@ indicating how to customize various bits of the controller.
   class PostsController < ApplicationController
     def index
       # Override #current_objects to change this
-      @posts = Post.find(:all)
+      @posts = Post.all
 
       # Use before :index to add something here
 

data/vendor/plugins/make_resourceful/README

@@ -18,12 +18,11 @@ while still keeping your controllers trim and readable.
  
 Rails
 
-  $ ruby script/plugin install http://svn.hamptoncatlin.com/make_resourceful/trunk
-  $ mv vendor/plugins/trunk vendor/plugins/make_resourceful
+  $ ruby script/plugin install git://github.com/hcatlin/make_resourceful.git
 
-Subversion
+Git
 
-  $ svn co http://svn.hamptoncatlin.com/make_resourceful/trunk make_resourceful
+  $ git clone git://github.com/hcatlin/make_resourceful.git
 
 == Use it!
 
@@ -69,7 +68,7 @@ Yes.
 === What about paging?
 
   def current_objects
-    @current_object ||= current_model.find(:all,
+    @current_objects ||= current_model.find(:all,
       :order => "created_at DESC", :page => {:current => params[:page], :size => 10 } )
   end
 
@@ -225,7 +224,7 @@ Don't despair, there are still more resources available!
 
 ---
 
-Copyright 2007 Hampton Catlin, Nathan Weizenbaum, and Jeff Hardy.
+Copyright 2007, 2008, 2009 Hampton Catlin, Nathan Weizenbaum, and Jeff Hardy.
 
 Contributions by:
 
@@ -237,3 +236,5 @@ Contributions by:
 * Don Petersen
 * Alex Ross
 * Tom Stuart
+* Glenn Powell
+* Johannes Jörg Schmidt

data/vendor/plugins/make_resourceful/Rakefile

@@ -1,10 +1,9 @@
 require 'rake'
-require 'rake/testtask'
 require 'rake/rdoctask'
 require 'spec/rake/spectask'
 
-desc 'Default: run unit tests.'
-task :default => :test
+desc 'Default: run specs.'
+task :default => :spec
 
 spec_files = Rake::FileList["spec/**/*_spec.rb"]
 
@@ -21,16 +20,6 @@ Spec::Rake::SpecTask.new(:coverage) do |t|
   t.rcov_opts = ['--exclude', 'spec,/var/lib/gems']
 end
 
-desc 'Test the make_resourceful plugin.'
-task :test do
-  Dir.chdir(File.dirname(__FILE__) + '/test')
-  tests = IO.popen('rake test')
-
-  while byte = tests.read(1)
-    print byte
-  end
-end
-
 desc 'Generate documentation for the make_resourceful plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/vendor/plugins/make_resourceful/VERSION

@@ -1 +1 @@
-0.2.3.0
+0.9.9

data/vendor/plugins/make_resourceful/generators/resourceful_scaffold/templates/functional_test.rb

@@ -4,14 +4,7 @@ require '<%= controller_file_path %>_controller'
 # Re-raise errors caught by the controller.
 class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; end
 
-class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
-  fixtures :<%= table_name %>
-
-  def setup
-    @controller = <%= controller_class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+class <%= controller_class_name %>ControllerTest < ActionController::TestCase
 
   def test_should_get_index
     get :index

data/vendor/plugins/make_resourceful/lib/resourceful/base.rb

@@ -21,6 +21,9 @@ module Resourceful
 
   # The actions that act on just one record.
   SINGULAR_ACTIONS = ACTIONS - PLURAL_ACTIONS
+
+  # The actions that act on just one record.
+  SINGULAR_PRELOADED_ACTIONS = SINGULAR_ACTIONS - [:new, :create]
 end
 
 require 'resourceful/default/accessors'
@@ -49,4 +52,12 @@ module Resourceful::Base
   include Resourceful::Default::Responses
   include Resourceful::Default::Callbacks
   include Resourceful::Default::URLs
+
+  # FIXME HACK
+  # making methods assigned to controller private
+  # prevents access from dispatcher.
+  private *Resourceful::Default::Accessors.public_instance_methods
+  private *Resourceful::Default::Responses.public_instance_methods
+  private *Resourceful::Default::Callbacks.public_instance_methods
+  private *Resourceful::Default::URLs.public_instance_methods
 end

data/vendor/plugins/make_resourceful/lib/resourceful/builder.rb

@@ -27,6 +27,8 @@ module Resourceful
       @responses        = {}
       @publish          = {}
       @parents          = []
+      @custom_member_actions = []
+      @custom_collection_actions = []
     end
 
     # This method is only meant to be called internally.
@@ -55,7 +57,9 @@ module Resourceful
       kontroller.write_inheritable_attribute(:made_resourceful, true)
 
       kontroller.write_inheritable_attribute(:parents, @parents)
-      kontroller.before_filter :load_parent_object, :only => @ok_actions
+      kontroller.before_filter :load_object, :only => (@ok_actions & SINGULAR_PRELOADED_ACTIONS) + @custom_member_actions
+      kontroller.before_filter :load_objects, :only => (@ok_actions & PLURAL_ACTIONS) + @custom_collection_actions
+      kontroller.before_filter :load_parent_object, :only => @ok_actions + @custom_member_actions + @custom_collection_actions
     end
 
     # :call-seq:
@@ -81,13 +85,40 @@ module Resourceful
     #
     # The available actions are defined in Default::Actions.
     def actions(*available_actions)
+      # FIXME HACK
+      # made all methods private, so plural?, too.
+      # Did not want to make an exception for that and i do not like it to
+      # come up on actions_methods.
+      # TODO: maybe we can define plural? as class_method
       if available_actions.first == :all
-        available_actions = controller.new.plural? ? ACTIONS : SINGULAR_ACTIONS
+        if controller.respond_to?(:new_without_capture)
+          available_actions = controller.new_without_capture.send(:plural?) ? ACTIONS : SINGULAR_ACTIONS
+        else
+          available_actions = controller.new.send(:plural?) ? ACTIONS : SINGULAR_ACTIONS
+        end
       end
 
       available_actions.each { |action| @ok_actions << action.to_sym }
     end
     alias build actions
+    
+    # :call-seq:
+    #   member_actions(*available_actions)
+    # 
+    # Registers custom member actions which will use the load_object before_filter.
+    # These actions are not created, but merely registered for filtering.
+    def member_actions(*available_actions)
+      available_actions.each { |action| @custom_member_actions << action.to_sym }
+    end
+    
+    # :call-seq:
+    #   collection_actions(*available_actions)
+    # 
+    # Registers custom collection actions which will use the load_objects before_filter.
+    # These actions are not created, but merely registered for filtering.
+    def collection_actions(*available_actions)
+      available_actions.each { |action| @custom_collection_actions << action.to_sym }
+    end
 
     # :call-seq:
     #   before(*events) { ... }