schofield 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/generators/schofield_controller/schofield_controller_generator.rb

@@ -27,12 +27,25 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
       sco_parent_underscored_plural = sco_parent_underscored.pluralize
       sco_parent_titleized_plural   = sco_parent_underscored.titleize.pluralize
       
-      sco_child_class               = has_child? ? options[:child].classify : ''
-      sco_child_underscored         = sco_child_class.underscore.downcase
-      sco_child_underscored_plural  = sco_child_underscored.pluralize
-      sco_child_titleized_plural    = sco_child_underscored.titleize.pluralize
-      sco_child_humanized           = sco_child_underscored.humanize.downcase
+      sco_children = []
       
+      if has_children?
+        options[:children].each do |child|
+          sco_child_class               = has_children? ? child.classify : ''
+          sco_child_underscored         = sco_child_class.underscore.downcase
+          sco_child_underscored_plural  = sco_child_underscored.pluralize
+          sco_child_titleized_plural    = sco_child_underscored.titleize.pluralize
+          sco_child_humanized           = sco_child_underscored.humanize.downcase
+          sco_children << {
+            :class               => sco_child_class,
+            :underscored         => sco_child_underscored,
+            :underscored_plural  => sco_child_underscored_plural,
+            :titleized_plural    => sco_child_titleized_plural,
+            :humanized           => sco_child_humanized
+          }
+        end
+      end
+        
       assigns = { :sco_underscored                => sco_underscored,
                   :sco_underscored_plural         => sco_underscored_plural,
                   :sco_class                      => sco_class,
@@ -44,10 +57,7 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
                   :sco_titleized_plural           => sco_titleized_plural,
                   :sco_humanized                  => sco_humanized,
                   :non_restful_actions            => non_restful_actions,
-                  :sco_child_underscored          => sco_child_underscored,
-                  :sco_child_underscored_plural   => sco_child_underscored_plural,
-                  :sco_child_titleized_plural     => sco_child_titleized_plural,
-                  :sco_child_humanized            => sco_child_humanized }
+                  :sco_children                   => sco_children }
                   
       
       # Check for class naming collisions.
@@ -118,15 +128,15 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
       opt.separator ''
       opt.separator 'Options:'
       opt.on('--parent PARENT', 'Specify the parent model') { |v| options[:parent] = v if v.present? }
-      opt.on('--child CHILD',   'Specify the child model')  { |v| options[:child]  = 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?
     end
     
-    def has_child?
-      options[:child].present?
+    def has_children?
+      options[:children].present?
     end
     
     def filter_actions array

data/generators/schofield_controller/templates/unnested/show.rb

@@ -1,10 +1,10 @@
 - toggle_show_edit 'Edit', :admin, @<%= sco_underscored %>
-<% if has_child? -%>
+<% sco_children.each do |child| -%>
   
   
-%h5 <%= sco_child_titleized_plural %>
+%h5 <%= child[:titleized_plural] %>
 
-%p= link_to('Add new <%= sco_child_humanized %>', new_admin_<%= sco_underscored %>_<%= sco_child_underscored %>_path(@<%= sco_underscored %>))
+%p= link_to('Add new <%= child[:humanized] %>', new_admin_<%= sco_underscored %>_<%= child[:underscored] %>_path(@<%= sco_underscored %>))
 
-= render :partial => 'shared/<%= sco_child_underscored_plural %>', :object => @<%= sco_underscored %>.<%= sco_child_underscored_plural %>
+= render :partial => 'shared/<%= child[:underscored_plural] %>', :object => @<%= sco_underscored %>.<%= child[:underscored_plural] %>
 <% end -%>

data/lib/schofield.rb

@@ -44,7 +44,7 @@ module Schofield
   class ControllerInfo
     
     attr_reader   :parent, :controller_name, :controller_path, :model_name
-    attr_accessor :actions, :child
+    attr_accessor :actions, :children
     
     def initialize route_info
       @controller_name  = route_info.controller_name
@@ -52,6 +52,7 @@ module Schofield
       @model_name       = route_info.model_name
       @parent           = route_info.parent
       @actions          = []
+      @children         = []
     end
     
   end
@@ -76,7 +77,7 @@ module Schofield
     
     def set_children
       @controller_infos.each do |index, info|
-        @controller_infos[info.parent].child = index unless info.parent.nil?
+        @controller_infos[info.parent].children << index unless info.parent.nil?
       end
     end
       
@@ -86,7 +87,7 @@ module Schofield
       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, :child => info.child)
+        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)
       end
     end

data/schofield.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{schofield}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Marc Tauber