schofield 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/generators/schofield_controller/schofield_controller_generator.rb

@@ -25,6 +25,11 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
       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_child_class               = options[: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
       
       assigns = { :sco_underscored                => sco_underscored,
                   :sco_underscored_plural         => sco_underscored_plural,
@@ -36,7 +41,11 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
                   :sco_parent_class               => sco_parent_class,
                   :sco_titleized_plural           => sco_titleized_plural,
                   :sco_humanized                  => sco_humanized,
-                  :non_restful_actions            => non_restful_actions }
+                  :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 }
                   
       
       # Check for class naming collisions.
@@ -74,8 +83,14 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
         m.template "#{template_directory}/#{action}.rb",
           File.join('app/views', class_path, file_name, "#{action}.haml"),
           :assigns => assigns if actions_with_view.include?(action)
-          
       end
+      
+      if actions.include?('index')
+        m.template 'index_partial.rb',
+          File.join('app/views/shared', "_#{sco_underscored_plural}.haml"),
+          :assigns => assigns
+      end
+      
     end
   end
   
@@ -101,6 +116,7 @@ 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? }
     end
   
     def banner

data/generators/schofield_controller/templates/index_partial.rb

@@ -0,0 +1,17 @@
+- if <%= sco_underscored_plural %>.any?
+  
+  %table#<%= sco_underscored_plural %>
+  
+    = render :partial => 'shared/admin/table_header', :locals => { :columns => %w( Title ), :buttons => 3 }
+    
+    %tbody
+    
+      - <%= sco_underscored_plural %>.each do |<%= sco_underscored %>|
+    
+        %tr
+      
+          %td&= <%= sco_underscored %>
+        
+          %td=  link_to_button 'Show',   admin_<%= sco_underscored %>_path(<%= sco_underscored %>)
+          %td=  link_to_button 'Edit',   edit_admin_<%= sco_underscored %>_path(<%= sco_underscored %>)
+          %td=  link_to_button 'Delete', admin_<%= sco_underscored %>_path(<%= sco_underscored %>), :method => 'delete', :confirm => "Are you sure you want to delete the <%= sco_humanized %>: #{h(<%= sco_underscored %>)}?"

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

@@ -2,20 +2,4 @@
 
 %p= link_to('Add new <%= sco_humanized %>', new_admin_<%= sco_parent_underscored %>_<%= sco_underscored %>_path)
 
-- if @<%= sco_underscored_plural %>.any?
-  
-  %table#<%= sco_underscored_plural %>
-  
-    = render :partial => 'shared/admin/table_header', :locals => { :columns => %w( Title ), :buttons => 3 }
-    
-    %tbody
-    
-      - @<%= sco_underscored_plural %>.each do |<%= sco_underscored %>|
-    
-        %tr
-      
-          %td&= <%= sco_underscored %>
-        
-          %td=  link_to_button 'Show',   admin_<%= sco_underscored %>_path(<%= sco_underscored %>)
-          %td=  link_to_button 'Edit',   edit_admin_<%= sco_underscored %>_path(<%= sco_underscored %>)
-          %td=  link_to_button 'Delete', admin_<%= sco_underscored %>_path(<%= sco_underscored %>), :method => 'delete', :confirm => "Are you sure you want to delete the <%= sco_humanized %>: #{h(<%= sco_underscored %>)}?"
+= render :partial => 'shared/<%= sco_underscored_plural %>', :object => @<%= sco_underscored_plural %>

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

@@ -2,20 +2,4 @@
 
 %p= link_to('Add new <%= sco_humanized %>', new_admin_<%= sco_underscored %>_path)
 
-- if @<%= sco_underscored_plural %>.any?
-  
-  %table#<%= sco_underscored_plural %>
-  
-    = render :partial => 'shared/admin/table_header', :locals => { :columns => %w( Title ), :buttons => 3 }
-    
-    %tbody
-    
-      - @<%= sco_underscored_plural %>.each do |<%= sco_underscored %>|
-    
-        %tr
-      
-          %td&= <%= sco_underscored %>
-        
-          %td=  link_to_button 'Show',   admin_<%= sco_underscored %>_path(<%= sco_underscored %>)
-          %td=  link_to_button 'Edit',   edit_admin_<%= sco_underscored %>_path(<%= sco_underscored %>)
-          %td=  link_to_button 'Delete', admin_<%= sco_underscored %>_path(<%= sco_underscored %>), :method => 'delete', :confirm => "Are you sure you want to delete the <%= sco_humanized %>: #{h(<%= sco_underscored %>)}?"
+= render :partial => 'shared/<%= sco_underscored_plural %>', :object => @<%= sco_underscored_plural %>

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

@@ -1,3 +1,10 @@
 - titles link_to('<%= sco_titleized_plural %>', admin_<%= sco_underscored_plural %>_path), @<%= sco_underscored %>
 
-- toggle_show_edit 'Edit', :admin, @<%= sco_underscored %>
+- toggle_show_edit 'Edit', :admin, @<%= sco_underscored %>
+
+
+%h5 <%= sco_child_titleized_plural %>
+
+%p= link_to('Add new <%= sco_child_humanized %>', new_admin_<%= sco_underscored %>_<%= sco_child_underscored %>_path(@<%= sco_underscored %>))
+
+= render :partial => 'shared/<%= sco_child_underscored_plural %>', :object => @<%= sco_underscored %>.<%= sco_child_underscored_plural %>

data/lib/schofield/tasks/schofield.rake

@@ -1,13 +1,7 @@
 namespace :schofield do
-
   desc "Generate controllers and views based on routes"
   task :generate => :environment do
-    
     @generator = Schofield::Generator.new
-    ActionController::Routing::Routes.routes.each do |route|
-      @generator.process_route(route)
-    end
     @generator.generate
-    
   end
 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
+    attr_accessor :actions, :child
     
     def initialize route_info
       @controller_name  = route_info.controller_name
@@ -63,18 +63,30 @@ module Schofield
       @controller_infos = {}
     end
     
+    def process_routes
+      ActionController::Routing::Routes.routes.each { |route| process_route(route) }
+    end
+    
     def process_route route
       route_info = RouteInfo.new(route)
       return unless route_info.use?
-      @controller_infos[route_info.controller_name] ||= ControllerInfo.new(route_info)
-      @controller_infos[route_info.controller_name].actions << route_info.action_name
+      @controller_infos[route_info.model_name] ||= ControllerInfo.new(route_info)
+      @controller_infos[route_info.model_name].actions << route_info.action_name
     end
-
+    
+    def set_children
+      @controller_infos.each do |index, info|
+        @controller_infos[info.parent].child = index unless info.parent.nil?
+      end
+    end
+      
     def generate
+      process_routes
+      set_children
       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)
+        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_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.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Tauber"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "generators/schofield_controller/schofield_controller_generator.rb",
      "generators/schofield_controller/templates/controller_spec.rb",
      "generators/schofield_controller/templates/helper_spec.rb",
+     "generators/schofield_controller/templates/index_partial.rb",
      "generators/schofield_controller/templates/nested/controller.rb",
      "generators/schofield_controller/templates/nested/edit.rb",
      "generators/schofield_controller/templates/nested/index.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: schofield
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Marc Tauber
@@ -51,6 +51,7 @@ files:
 - generators/schofield_controller/schofield_controller_generator.rb
 - generators/schofield_controller/templates/controller_spec.rb
 - generators/schofield_controller/templates/helper_spec.rb
+- generators/schofield_controller/templates/index_partial.rb
 - generators/schofield_controller/templates/nested/controller.rb
 - generators/schofield_controller/templates/nested/edit.rb
 - generators/schofield_controller/templates/nested/index.rb