schofield 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/generators/schofield_controller/schofield_controller_generator.rb

@@ -13,7 +13,7 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       
-      template_directory            = has_parent? ? 'nested' : 'unnested'
+      template_directory            = has_parents? ? 'nested' : 'unnested'
       
       sco_class                     = class_name.gsub('Admin::', '').singularize
       sco_underscored               = sco_class.underscore
@@ -22,13 +22,23 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
       sco_titleized_plural          = sco_underscored_plural.titleize
       sco_humanized                 = sco_humanized_uc.downcase
       
-      sco_parent_class              = has_parent? ? options[:parent].classify : ''
-      sco_parent_underscored        = sco_parent_class.underscore.downcase
-      sco_parent_underscored_plural = sco_parent_underscored.pluralize
-      sco_parent_titleized_plural   = sco_parent_underscored.titleize.pluralize
-      
+      sco_parents = []
+      if has_parents?
+        options[:parents].each do |parent|
+          sco_parent_class              = has_parents? ? parent.classify : ''
+          sco_parent_underscored        = sco_parent_class.underscore.downcase
+          sco_parent_underscored_plural = sco_parent_underscored.pluralize
+          sco_parent_titleized_plural   = sco_parent_underscored.titleize.pluralize 
+          sco_parents << {
+            :class               => sco_parent_class,
+            :underscored         => sco_parent_underscored,
+            :underscored_plural  => sco_parent_underscored_plural,
+            :titleized_plural    => sco_parent_titleized_plural,
+          }
+        end
+      end
+          
       sco_children = []
-      
       if has_children?
         options[:children].each do |child|
           sco_child_class               = has_children? ? child.classify : ''
@@ -50,10 +60,7 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
                   :sco_underscored_plural         => sco_underscored_plural,
                   :sco_class                      => sco_class,
                   :sco_humanized_uc               => sco_humanized_uc,
-                  :sco_parent_underscored         => sco_parent_underscored,
-                  :sco_parent_underscored_plural  => sco_parent_underscored_plural,
-                  :sco_parent_titleized_plural    => sco_parent_titleized_plural,
-                  :sco_parent_class               => sco_parent_class,
+                  :sco_parents                    => sco_parents,
                   :sco_titleized_plural           => sco_titleized_plural,
                   :sco_humanized                  => sco_humanized,
                   :non_restful_actions            => non_restful_actions,
@@ -97,7 +104,7 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
           :assigns => assigns if actions_with_view.include?(action)
       end
       
-      if actions.include?('index') || has_parent?
+      if actions.include?('index') || has_parents?
         m.template 'index_partial.rb',
           File.join('app/views/shared', "_#{sco_underscored_plural}.haml"),
           :assigns => assigns
@@ -127,12 +134,12 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
     def add_options!(opt)
       opt.separator ''
       opt.separator 'Options:'
-      opt.on('--parent PARENT', 'Specify the parent model') { |v| options[:parent] = v if v.present? }
+      opt.on('--parents PARENTS', 'Specify the parent models') { |v| options[:parents] = v if v.present? }
       opt.on('--children CHILDREN',   'Specify the children models')  { |v| options[:children]  = v if v.present? }
     end
     
-    def has_parent?
-      options[:parent].present?
+    def has_parents?
+      options[:parents].present?
     end
     
     def has_children?
@@ -144,7 +151,7 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
     end
   
     def banner
-      "Usage: #{$0} schofield_controller ControllerName [--parent PARENT]"
+      "Usage: #{$0} schofield_controller ControllerName [--parents PARENTS --children CHILDREN]"
     end
   
 end

data/generators/schofield_controller/templates/nested/controller.rb

@@ -1,14 +1,16 @@
 class <%= class_name %>Controller < Admin::AdminController
 
   before_filter :find_<%= sco_underscored %>, :only => [<%= filter_actions %w( show edit update destroy) %>]
-  before_filter :find_<%= sco_parent_underscored %>, :only => [<%= filter_actions %w( index new create) %>]
+  <%- sco_parents.each do |parent| -%>
+  before_filter :find_<%= parent[:underscored] %>, :except => [<%= filter_actions %w( destroy sort ) %>]
+  <%- end -%>
   before_filter :titles, :except => [<%= filter_actions %w( destroy sort ) %>]
 
 
   <% if actions.include?('index') -%>
 
   def index
-    @<%= sco_underscored_plural %> = @<%= sco_parent_underscored %>.<%= sco_underscored_plural %>
+    @<%= sco_underscored_plural %> = @<%= sco_parents.last[:underscored] %>.<%= sco_underscored_plural %>
   end
 
   <% end -%>
@@ -21,7 +23,7 @@ class <%= class_name %>Controller < Admin::AdminController
   <% if actions.include?('new') -%>
 
   def new
-    @<%= sco_underscored %> = @<%= sco_parent_underscored %>.<%= sco_underscored_plural %>.build
+    @<%= sco_underscored %> = @<%= sco_parents.last[:underscored] %>.<%= sco_underscored_plural %>.build
   end
   
   <% end -%>
@@ -34,7 +36,7 @@ class <%= class_name %>Controller < Admin::AdminController
   <% if actions.include?('create') -%>
 
   def create
-    @<%= sco_underscored %> = @<%= sco_parent_underscored %>.<%= sco_underscored_plural %>.build(params[:<%= sco_underscored %>])
+    @<%= sco_underscored %> = @<%= sco_parents.last[:underscored] %>.<%= sco_underscored_plural %>.build(params[:<%= sco_underscored %>])
     if @<%= sco_underscored %>.save
       flash[:notice] = '<%= sco_humanized_uc %> was successfully created.'
       redirect_to_form_referer
@@ -82,18 +84,21 @@ class <%= class_name %>Controller < Admin::AdminController
 <% end -%>
 
   private
-
-    def find_<%= sco_parent_underscored %>
-      @<%= sco_parent_underscored %> = <%= sco_parent_class %>.find(params[:<%= sco_parent_underscored %>_id])
+<% sco_parents.each_with_index do |parent, index| -%>
+    def find_<%= parent[:underscored] %>
+      @<%= parent[:underscored] %> = params[:<%= parent[:underscored] %>_id].present? ? <%= parent[:class] %>.find(params[:<%= parent[:underscored] %>_id]) : @<%= index == 0 ? sco_underscored : sco_parents[index-1][:underscored] %>.<%= parent[:underscored] %>
     end
 
+<% end -%>
     def find_<%= sco_underscored %>
       @<%= sco_underscored %> = <%= sco_class %>.find(params[:id])
     end
     
     def titles
-      add_breadcrumb '<%= sco_parent_titleized_plural %>', admin_<%= sco_parent_underscored_plural %>_path
-      add_breadcrumb @<%= sco_parent_underscored %>
+      <%- sco_parents.reverse_each do |parent| -%>
+      add_breadcrumb '<%= parent[:titleized_plural] %>', admin_<%= parent[:underscored_plural] %>_path
+      add_breadcrumb @<%= parent[:underscored] %>
+      <%- end -%>
       add_breadcrumb '<%= sco_titleized_plural %>'
       add_breadcrumb @<%= sco_underscored %>
     end

data/generators/schofield_controller/templates/nested/index.rb

@@ -1,3 +1,3 @@
-%p= link_to('Add new <%= sco_humanized %>', new_admin_<%= sco_parent_underscored %>_<%= sco_underscored %>_path)
+%p= link_to('Add new <%= sco_humanized %>', new_admin_<%= sco_parent.first[:underscored] %>_<%= sco_underscored %>_path)
 
 = render :partial => 'shared/<%= sco_underscored_plural %>', :object => @<%= sco_underscored_plural %>

data/generators/schofield_form/schofield_form_generator.rb

@@ -4,15 +4,19 @@ class SchofieldFormGenerator < FormGenerator
     
     def add_options!(opt)
       super
-      opt.on('--parent PARENT_PATH',
-        "Specify the parent for the specified model.") do |v|
-        options[:parent] = v if v.present?
+      opt.on('--parents PARENTS_PATH',
+        "Specify the parents for the specified model.") do |v|
+        options[:parents] = v if v.present?
       end
     end
     
-    def form_model
+    def form_model type='new'
       array = [':admin']
-      array << "@#{options[:parent]}" unless options[:parent].nil?
+      if type == 'new' && options[:parents].present?
+        options[:parents].each do |parent|
+          array << "@#{parent}"
+        end
+      end
       array << "@#{singular_name.singularize}"
       "[#{array.join(', ')}]"
     end

data/generators/schofield_form/templates/view__form.html.haml

@@ -1,6 +1,6 @@
 = error_messages_for '<%= singular_name.singularize %>', :object => object
 
-- semantic_form_for <%= form_model %>, :html => { :multipart => true } do |f|
+- semantic_form_for @<%= singular_name.singularize %>.new_record? ? <%= form_model('new') %> : <%= form_model('edit') %>, :html => { :multipart => true } do |f|
 
   - f.inputs do
   

data/lib/schofield.rb

@@ -44,7 +44,7 @@ module Schofield
   class ControllerInfo
     
     attr_reader   :parent, :controller_name, :controller_path, :model_name
-    attr_accessor :actions, :children
+    attr_accessor :actions, :children, :parents
     
     def initialize route_info
       @controller_name  = route_info.controller_name
@@ -53,6 +53,7 @@ module Schofield
       @parent           = route_info.parent
       @actions          = []
       @children         = []
+      @parents          = []
     end
     
   end
@@ -80,15 +81,29 @@ module Schofield
         @controller_infos[info.parent].children << index unless info.parent.nil?
       end
     end
+    
+    def set_parents
+      @controller_infos.each do |index, info|
+        parent_models = []
+        parent_model = info.parent
+        while parent_model
+          parent_models << parent_model
+          parent_model = @controller_infos[parent_model].parent
+        end
+        info.parents = parent_models
+      end
+    end
+      
       
     def generate
       process_routes
       set_children
+      set_parents
       require 'rails_generator'
       require 'rails_generator/scripts/generate'
       @controller_infos.each do |index, info|
-        Rails::Generator::Scripts::Generate.new.run(['schofield_controller', info.controller_path, *info.actions ], :parent => info.parent, :children => info.children)
-        Rails::Generator::Scripts::Generate.new.run(['schofield_form',       info.model_name], :partial => true, :haml => true, :controller => info.controller_path, :parent => info.parent)
+        Rails::Generator::Scripts::Generate.new.run(['schofield_controller', info.controller_path, *info.actions ], :parents => info.parents, :children => info.children)
+        Rails::Generator::Scripts::Generate.new.run(['schofield_form',       info.model_name], :partial => true, :haml => true, :controller => info.controller_path, :parents => info.parents)
       end
     end
     

data/schofield.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{schofield}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Tauber"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Marc Tauber