schofield 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/generators/schofield_controller/schofield_controller_generator.rb

@@ -13,7 +13,9 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       
-      template_directory            = options[:parent].nil? ? 'unnested' : 'nested'
+      
+      
+      template_directory            = has_parent? ? 'nested' : 'unnested'
       
       sco_class                     = class_name.gsub('Admin::', '').singularize
       sco_humanized_uc              = sco_class.underscore.humanize
@@ -21,11 +23,11 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
       sco_underscored_plural        = sco_underscored.pluralize
       sco_titleized_plural          = sco_underscored.pluralize.titleize
       sco_humanized                 = sco_humanized_uc.downcase
-      sco_parent_class              = options[:parent] ? options[:parent].classify : ''
+      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_child_class               = options[:child] ? options[:child].classify : ''
+      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
@@ -118,6 +120,18 @@ class SchofieldControllerGenerator < Rails::Generator::NamedBase
       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 has_parent?
+      options[:parent].present?
+    end
+    
+    def has_child?
+      options[:child].present?
+    end
+    
+    def filter_actions array
+      array.map { |item| actions.include?(item) ? ":#{item}" : nil }.compact.join(', ')
+    end
   
     def banner
       "Usage: #{$0} schofield_controller ControllerName [--parent PARENT]"

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

@@ -1,7 +1,7 @@
 class <%= class_name %>Controller < Admin::AdminController
 
-  before_filter :find_<%= sco_underscored %>, :only => [:show, :edit, :update, :destroy]
-  before_filter :find_<%= sco_parent_underscored %>,  :only => [:index, :new, :create]
+  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) %>]
 
 
   <% if actions.include?('index') -%>
@@ -11,19 +11,26 @@ class <%= class_name %>Controller < Admin::AdminController
   end
 
   <% end -%>
-
+  <% if actions.include?('show') -%>
+    
   def show
   end
-
+  
+  <% end -%>
+  <% if actions.include?('new') -%>
 
   def new
     @<%= sco_underscored %> = @<%= sco_parent_underscored %>.<%= sco_underscored_plural %>.build
   end
-
+  
+  <% end -%>
+  <% if actions.include?('edit') -%>
 
   def edit
   end
-
+  
+  <% end -%>
+  <% if actions.include?('create') -%>
 
   def create
     @<%= sco_underscored %> = @<%= sco_parent_underscored %>.<%= sco_underscored_plural %>.build(params[:<%= sco_underscored %>])
@@ -34,7 +41,9 @@ class <%= class_name %>Controller < Admin::AdminController
       render :action => 'new'
     end
   end
-
+  
+  <% end -%>
+  <% if actions.include?('update') -%>
 
   def update
     if @<%= sco_underscored %>.update_attributes(params[:<%= sco_underscored %>])
@@ -44,15 +53,17 @@ class <%= class_name %>Controller < Admin::AdminController
       render :action => 'edit'
     end
   end
-
+  
+  <% end -%>
+  <% if actions.include?('destroy') -%>
 
   def destroy
     @<%= sco_underscored %>.destroy
     redirect_to :back
   end
   
-
-<% if actions.include?('sort') -%>
+  <% end -%>
+  <% if actions.include?('sort') -%>
   
   def sort  
     params[:<%= sco_underscored %>].each_with_index do |id, index|  
@@ -62,8 +73,8 @@ class <%= class_name %>Controller < Admin::AdminController
   end
 
 <% end -%>
-
 <% for action in non_restful_actions -%>
+
   def <%= action %>
   end
 

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

@@ -1,4 +1,3 @@
 - titles link_to(@<%= sco_underscored %>.<%= sco_parent_underscored %>, admin_<%= sco_parent_underscored %>_path(@<%= sco_underscored %>.<%= sco_parent_underscored %>)), link_to('<%= sco_titleized_plural %>', admin_<%= sco_parent_underscored %>_<%= sco_underscored_plural %>_path(@<%= sco_underscored %>.<%= sco_parent_underscored %>)), @<%= sco_underscored %>
 
-
 - toggle_show_edit 'Edit', :admin, @<%= sco_underscored %>

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

@@ -1,28 +1,35 @@
 class <%= class_name %>Controller < Admin::AdminController
 
-  before_filter :find_<%= sco_underscored %>, :only => [:show, :edit, :update, :destroy]
+  before_filter :find_<%= sco_underscored %>, :only => [<%= filter_actions %w( show edit update destroy) %>]
 
 
-<% if actions.include?('index') -%>
+  <% if actions.include?('index') -%>
   
   def index
     @<%= sco_underscored_plural %> = <%= sco_class %>.all
   end
   
-<% end -%>
-
+  <% end -%>
+  <% if actions.include?('show') -%>
+  
   def show
   end
 
+  <% end -%>
+  <% if actions.include?('new') -%>
 
   def new
     @<%= sco_underscored %> = <%= sco_class %>.new
   end
-
+  
+  <% end -%>
+  <% if actions.include?('edit') -%>
 
   def edit
   end
 
+  <% end -%>
+  <% if actions.include?('create') -%>
 
   def create
     @<%= sco_underscored %> = <%= sco_class %>.new(params[:<%= sco_underscored %>])
@@ -34,6 +41,8 @@ class <%= class_name %>Controller < Admin::AdminController
     end
   end
 
+  <% end -%>
+  <% if actions.include?('update') -%>
 
   def update
     if @<%= sco_underscored %>.update_attributes(params[:<%= sco_underscored %>])
@@ -44,14 +53,16 @@ class <%= class_name %>Controller < Admin::AdminController
     end
   end
 
+  <% end -%>
+  <% if actions.include?('destroy') -%>
 
   def destroy
     @<%= sco_underscored %>.destroy
     redirect_to :back
   end
   
-  
-<% if actions.include?('sort') -%>
+  <% end -%>
+  <% if actions.include?('sort') -%>
   
   def sort  
     params[:<%= sco_underscored %>].each_with_index do |id, index|  
@@ -60,13 +71,13 @@ class <%= class_name %>Controller < Admin::AdminController
     render :nothing => true  
   end
   
-<% end -%>
+  <% end -%>
+  <% for action in non_restful_actions -%>
 
-<% for action in non_restful_actions -%>
   def <%= action %>
   end
 
-<% end -%>
+  <% end -%>
 
   private
 

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

@@ -1,10 +1,12 @@
 - titles link_to('<%= sco_titleized_plural %>', admin_<%= sco_underscored_plural %>_path), @<%= sco_underscored %>
 
 - toggle_show_edit 'Edit', :admin, @<%= sco_underscored %>
-
-
+<% if has_child? -%>
+  
+  
 %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 %>
+= render :partial => 'shared/<%= sco_child_underscored_plural %>', :object => @<%= sco_underscored %>.<%= sco_child_underscored_plural %>
+<% end -%>

data/schofield.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{schofield}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Tauber"]
-  s.date = %q{2009-12-05}
+  s.date = %q{2009-12-06}
   s.description = %q{Create views and controllers from routes defined in admin namespace. Very, very basic and very specific to my needs.'}
   s.email = %q{marc@marctauber.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: schofield
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Marc Tauber
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-05 00:00:00 +00:00
+date: 2009-12-06 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency