stefanpenner-my_scaffold 1.2.0 → 1.2.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
 :major: 1
 :minor: 2
+:patch: 1

data/generators/my_scaffold/my_scaffold_generator.rb

@@ -1,64 +1,8 @@
-#--
-# ShouldaScaffoldGeneratorConfig based on rubygems code.
-# Thank you Chad Fowler, Rich Kilmer, Jim Weirich and others.
-#++
-class MyScaffoldGeneratorConfig
-  
-  DEFAULT_TEMPLATING = 'haml'
-  DEFAULT_FUNCTIONAL_TEST_STYLE = 'basic'
-  
-  def initialize()
-    @config = load_file(config_file)
-    
-    @templating = @config[:templating] || DEFAULT_TEMPLATING
-    @functional_test_style = @config[:functional_test_style] || DEFAULT_FUNCTIONAL_TEST_STYLE
-  end
-  
-  attr_reader :templating, :functional_test_style
-   
-  private
-   
-  def load_file(filename)
-    begin
-      YAML.load(File.read(filename)) if filename and File.exist?(filename)
-    rescue ArgumentError
-      warn "Failed to load #{config_file_name}"
-    rescue Errno::EACCES
-      warn "Failed to load #{config_file_name} due to permissions problem."
-    end or {}
-  end
-  
-  def config_file
-     File.join(find_home, '.my_generator')
-  end
-  
-  ##
-  # Finds the user's home directory.
-  
-  def find_home
-    ['HOME', 'USERPROFILE'].each do |homekey|
-      return ENV[homekey] if ENV[homekey]
-    end
-
-    if ENV['HOMEDRIVE'] && ENV['HOMEPATH'] then
-      return "#{ENV['HOMEDRIVE']}:#{ENV['HOMEPATH']}"
-    end
-
-    begin
-      File.expand_path("~")
-    rescue
-      if File::ALT_SEPARATOR then
-          "C:/"
-      else
-          "/"
-      end
-    end
-  end
-end
-
 class MyScaffoldGenerator < Rails::Generator::NamedBase
-  default_options :skip_timestamps => false, :skip_migration => false, :skip_layout => true
-
+  default_options :skip_timestamps => false, 
+                  :skip_migration  => false, 
+				  :skip_layout     => true
+ 
   attr_reader   :controller_name,
                 :controller_class_path,
                 :controller_file_path,
@@ -68,119 +12,142 @@ class MyScaffoldGenerator < Rails::Generator::NamedBase
                 :controller_underscore_name,
                 :controller_singular_name,
                 :controller_plural_name
+ 
+  alias_method  :controller_file_name,  
+                :controller_underscore_name
 
-  alias_method  :controller_file_name,  :controller_underscore_name
-  alias_method  :controller_table_name, :controller_plural_name
-
+  alias_method  :controller_table_name, 
+                :controller_plural_name
+ 
   def initialize(runtime_args, runtime_options = {})
     super
     
-    @configuration = MyScaffoldGeneratorConfig.new
+	options[:templating] = 'haml'
+	options[:functional_test_style] = 'basic'
     
     @controller_name = @name.pluralize
-
-    base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
-    @controller_class_name_without_nesting, @controller_underscore_name, @controller_plural_name = inflect_names(base_name)
-    @controller_singular_name=base_name.singularize
-
+ 
+    base_name, 
+	@controller_class_path, 
+	@controller_file_path, 
+	@controller_class_nesting, 
+	@controller_class_nesting_depth = extract_modules(@controller_name)
+    
+	@controller_class_name_without_nesting, 
+	@controller_underscore_name, 
+	@controller_plural_name = inflect_names(base_name)
+    
+	@controller_singular_name = base_name.singularize
+ 
     if @controller_class_nesting.empty?
       @controller_class_name = @controller_class_name_without_nesting
     else
       @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
   end
-
+ 
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper")
-      m.class_collisions(class_path, "#{class_name}")
+      m.class_collisions(controller_class_path, 
+	  					 "#{controller_class_name}Controller", 
+						 "#{controller_class_name}Helper")
 
+      m.class_collisions(class_path, 
+	                     "#{class_name}")
+ 
       # Controller, helper, views, and test directories.
-      m.directory(File.join('app/models', class_path))
-      m.directory(File.join('app/controllers', controller_class_path))
-      m.directory(File.join('app/helpers', controller_class_path))
-      m.directory(File.join('app/views', controller_class_path, controller_file_name))
+      m.directory(File.join('app/models',        class_path))
+      m.directory(File.join('app/controllers',   controller_class_path))
+      m.directory(File.join('app/helpers',       controller_class_path))
+      m.directory(File.join('app/views',         controller_class_path, controller_file_name))
       m.directory(File.join('app/views/layouts', controller_class_path))
-      m.directory(File.join('test/functional', controller_class_path))
-      m.directory(File.join('test/unit', class_path))
-
+      m.directory(File.join('test/functional',   controller_class_path))
+      m.directory(File.join('test/unit',         class_path))
+ 
       m.directory('public/stylesheets/blueprint')
-
-      for view in scaffold_views
-        m.template(
-          "#{templating}/#{view}.html.#{templating}",
-          File.join('app/views', controller_class_path, controller_file_name, "#{view}.html.#{templating}")
-        )
+ 
+      scaffold_views.each do |view|
+        m.template("#{templating}/#{view}.html.#{templating}",
+                   File.join('app/views', 
+				             controller_class_path, 
+							 controller_file_name, 
+							 "#{view}.html.#{templating}"))
       end
-
+ 
       # Layout and stylesheet.
       m.template("#{templating}/layout.html.#{templating}", 
                  File.join('app/views/layouts', 
                            controller_class_path, 
                            "#{controller_file_name}.html.#{templating}"))
-
-      %w(print screen ie).each do |stylesheet|
-        m.template("blueprint/#{stylesheet}.css", "public/stylesheets/blueprint/#{stylesheet}.css")
+ 
+      %w(print 
+	     screen 
+		 ie).each do |stylesheet|
+        m.template("blueprint/#{stylesheet}.css", 
+		           "public/stylesheets/blueprint/#{stylesheet}.css")
       end
-
+ 
       m.template('controller.rb', 
                  File.join('app/controllers', 
                             controller_class_path, 
-                            "#{controller_file_name}_controller.rb")
-
+                            "#{controller_file_name}_controller.rb"))
+ 
       m.template("functional_test/#{functional_test_style}.rb", 
                   File.join('test/functional', 
                             controller_class_path, 
                             "#{controller_file_name}_controller_test.rb"))
-
+ 
       m.template('helper.rb',          
                  File.join('app/helpers',     
                  controller_class_path, 
                  "#{controller_file_name}_helper.rb"))
-
+ 
       m.route_resources controller_file_name
-
+ 
       m.dependency 'my_model', [name] + @args, :collision => :skip
     end
   end
-
+ 
   def templating
-    options[:templating] || @configuration.templating
+    options[:templating] 
   end
-
+ 
   def functional_test_style
-    options[:functional_test_style] || @configuration.functional_test_style
+    options[:functional_test_style]
   end
-
+ 
   protected
-    # Override with your own usage banner.
-    def banner
-      "Usage: #{$0} scaffold ModelName [field:type, field:type]"
-    end
-
-    def add_options!(opt)
-      opt.separator ''
-      opt.separator 'Options:'
-      opt.on("--skip-timestamps",
-             "Don't add timestamps to the migration file for this model") { |v| options[:skip_timestamps] = v }
-
-      opt.on("--skip-migration",
-             "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
-
-      opt.on("--templating [erb|haml]", 
-             "Specify the templating to use (haml by default)") { |v| options[:templating] = v }
-
-      opt.on("--functional-test-style [basic|should_be_restful]", 
-             "Specify the style of the functional test (should_be_restful by default)") { |v| options[:functional_test_style] = v }
+  def banner
+    "Usage: #{$0} my_scaffold ModelName [field:type, field:type]"
+  end
+ 
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+
+    opt.on("--skip-timestamps",
+           "Don't add timestamps to the migration file for this model") { |v| options[:skip_timestamps] = v }
+ 
+    opt.on("--skip-migration",
+           "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
+ 
+ 
+    opt.on("--functional-test-style [basic]", 
+           "Specify the style of the functional test (should_be_restful by default)") { |v| options[:functional_test_style] = v }
       
-     end
-
-    def scaffold_views
-      %w[ index show new edit _form ]
-    end
-
-    def model_name
-      class_name.demodulize
-    end
+   end
+ 
+  def scaffold_views
+    %w[ index 
+        show 
+    	new 
+		edit 
+		_form ]
+  end
+ 
+  def model_name
+    class_name.demodulize
+  end
 end
+

data/test/environment.rb

@@ -0,0 +1,30 @@
+# Be sure to restart your server when you modify this file
+
+# Uncomment below to force Rails into production mode when
+# you don't control web/app server and can't set it the proper way
+# ENV['RAILS_ENV'] ||= 'production'
+
+# Specifies gem version of Rails to use when vendor/rails is not present
+RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+
+# Bootstrap the Rails environment, frameworks, and default configuration
+require File.join(File.dirname(__FILE__), 'boot')
+
+Rails::Initializer.run do |config|
+  config.time_zone = 'UTC'
+ 
+  config.gem 'mocha'
+
+  config.gem 'thoughtbot-shoulda', :lib => 'shoulda',
+                                   :source => "http://gems.github.com"
+
+  config.gem 'thoughtbot-factory_girl', :lib => 'factory_girl',
+                                        :source => "http://gems.github.com"
+
+  config.gem 'my_scaffold'
+
+  config.action_controller.session = {
+    :session_key => '_rails_test_session',
+    :secret      => 'a8e3520f0ba3cd7472d3c92ea082962ad2b775f13d03fc82122a68a7d58bf2eef8a5413b077b15b3e8bce847a36327c11f5b26197ed1f06a833c67e5bb778cf2'
+  }
+end

data/test/my_scaffold_test.rb

@@ -4,4 +4,4 @@ class MyScaffoldTest < Test::Unit::TestCase
   should "probably rename this file and start testing for real" do
     flunk "hey buddy, you should probably rename this file and start testing for real"
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stefanpenner-my_scaffold
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Stefan Penner
@@ -40,16 +40,8 @@ files:
 - generators/my_scaffold/templates/blueprint/print.css
 - generators/my_scaffold/templates/blueprint/screen.css
 - generators/my_scaffold/templates/controller.rb
-- generators/my_scaffold/templates/erb
-- generators/my_scaffold/templates/erb/_form.html.erb
-- generators/my_scaffold/templates/erb/edit.html.erb
-- generators/my_scaffold/templates/erb/index.html.erb
-- generators/my_scaffold/templates/erb/layout.html.erb
-- generators/my_scaffold/templates/erb/new.html.erb
-- generators/my_scaffold/templates/erb/show.html.erb
 - generators/my_scaffold/templates/functional_test
 - generators/my_scaffold/templates/functional_test/basic.rb
-- generators/my_scaffold/templates/functional_test/should_be_restful.rb
 - generators/my_scaffold/templates/haml
 - generators/my_scaffold/templates/haml/_form.html.haml
 - generators/my_scaffold/templates/haml/edit.html.haml
@@ -60,6 +52,7 @@ files:
 - generators/my_scaffold/templates/helper.rb
 - generators/my_scaffold/USAGE
 - lib/my_scaffold.rb
+- test/environment.rb
 - test/my_scaffold_test.rb
 - test/test_helper.rb
 has_rdoc: true

data/generators/my_scaffold/templates/erb/_form.html.erb

@@ -1,8 +0,0 @@
-<%%= form.error_messages %>
-
-<dl>
-<% for attribute in attributes -%>
-  <dt><%%= form.label :<%= attribute.name %> %></dt>
-  <dd><%%= form.<%= attribute.field_type %> :<%= attribute.name %> %></dd>
-<% end -%>
-</dl>

data/generators/my_scaffold/templates/erb/edit.html.erb

@@ -1,12 +0,0 @@
-<h1>Editing <%= singular_name.humanize %></h1>
-
-<%% form_for(@<%= singular_name %>) do |form| %>
-  <%%= render :partial => 'form', :locals => {:form => form} %>
-  <p><%%= form.submit 'Update' %></p>
-<%% end %>
-
-<p>
-  <%%= link_to 'Show', @<%= singular_name %> %>
-  |
-  <%%= link_to 'Back', <%= plural_name %>_path %>
-</p>

data/generators/my_scaffold/templates/erb/index.html.erb

@@ -1,22 +0,0 @@
-<h1> Listing <%= plural_name.humanize %></h1>
-
-<table>
-  <tr>
-<% for attribute in attributes -%>
-    <th><%= attribute.column.human_name %></th>
-<% end -%>
-  </tr>
-
-  <%% for <%= singular_name %> in @<%= plural_name %> %>
-  <tr>
-<% for attribute in attributes -%>
-    <td><%%= h <%= singular_name %>.<%= attribute.name %> %></td>
-<% end -%>
-    <td><%%= link_to 'Show', <%= singular_name %> %></td>
-    <td><%%= link_to 'Edit', edit_<%= singular_name %>_path(<%= singular_name %>) %></td>
-    <td><%%= link_to 'Destroy', <%= singular_name %>, :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-  <%% end %>
-</table>
-
-<p><%%= link_to 'New <%= singular_name.humanize %>', new_<%= singular_name %>_path %></p>

data/generators/my_scaffold/templates/erb/layout.html.erb

@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-  <head>
-    <title><%%= "#{controller.controller_name}: #{controller.action_name}" %></title>
-    <%%= stylesheet_link_tag 'blueprint/screen', :media => 'screen' %>
-    <%%= stylesheet_link_tag 'blueprint/print', :media => 'print' %>
-    <%%= "<!--[if IE]>#{stylesheet_link_tag 'blueprint/ie', :media => 'screen'}<![endif]-->" %>
-  </head>
-  <body>
-    <div class="container">
-      <div id="content" class="column span-24">
-        <%% flash.each do |key, value| -%>
-          <div class="<%%= key %>">
-            <%%= h(value) %>
-          </div>
-        <%% end %>
-
-        <%%= yield %>
-      </div>
-    </div>
-  </body>
-</html>

data/generators/my_scaffold/templates/erb/new.html.erb

@@ -1,8 +0,0 @@
-<h1>New <%= singular_name.humanize %></h1>
-
-<%% form_for(@<%= singular_name %>) do |form| %>
-  <%%= render :partial => 'form', :locals => {:form => form} %>
-  <p><%%= form.submit 'Create' %></p>
-<%% end %>
-
-<p><%%= link_to 'Back', <%= plural_name %>_path %></p>

data/generators/my_scaffold/templates/erb/show.html.erb

@@ -1,12 +0,0 @@
-<dl>
-<% for attribute in attributes -%>
-  <dt><%= attribute.column.human_name %></dt>
-  <dd><%%= h @<%= singular_name %>.<%= attribute.name %> %></dd>
-<% end -%>
-</dl>
-
-<p>
-  <%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>)%>
-  |
-  <%%= link_to 'Back', <%= plural_name %>_path %>
-</p>

data/generators/my_scaffold/templates/functional_test/should_be_restful.rb

@@ -1,13 +0,0 @@
-require File.dirname(__FILE__) + '/../../test_helper'
-
-class <%= controller_class_name %>ControllerTest < ActionController::TestCase
-
-  def setup
-    @<%= file_name %> = Factory(:<%= file_name %>)
-  end
-
-  should_be_restful do |resource|
-    resource.formats = [:html, :xml]
-    resource.destroy.flash = nil
-  end
-end