masterview_generator 0.3.0 → 0.3.1

data/masterview_generator.rb

@@ -9,9 +9,9 @@ class ScaffoldingSandbox
   def sandbox_binding
     binding
   end
-  
+
   def default_input_block
-    Proc.new { |record, column| 
+    Proc.new { |record, column|
       "  <div class=\"record\">\n    <div class=\"label\"><label for=\"#{record}_#{column.name}\">#{column.human_name}:</label></div>\n    <div class=\"field\">#{input(record, column.name)}</div>\n  </div>\n" }
   end
 end
@@ -30,7 +30,7 @@ end
 
 class ShowScaffoldingSandbox < ScaffoldingSandbox
   def default_input_block
-    Proc.new { |record, column| 
+    Proc.new { |record, column|
      "  <div class=\"record\">\n    <div class=\"label\"><label>#{column.human_name}:</label></div>\n    <div class=\"field\" mv:content=\"h @#{record}.send(:#{column.name})\">#{record} #{column.human_name}</div>\n  </div>\n" }
   end
 end
@@ -57,7 +57,7 @@ class ActionView::Helpers::InstanceTag
   def to_date_select_tag(options = {})
     date_select options
   end
-  
+
   def to_datetime_select_tag(options = {})
     datetime_select options
   end
@@ -67,12 +67,29 @@ module Rails
   module Generator
     module Commands
       class Create < Base
+        # Ask the user interactively whether to force collision.
+        def mv_force_file_collision?(destination)
+          $stdout.print "overwrite #{destination}? [Ynaq] "
+          case $stdin.gets
+          when /a/i
+            $stdout.puts "forcing #{spec.name}"
+            options[:collision] = :force
+          when /q/i
+            $stdout.puts "aborting #{spec.name}"
+            raise SystemExit
+          when /n/i then :skip
+          else :force
+          end
+        rescue
+          retry
+        end
+
         def string_to_file(content, relative_destination, file_options = {}, &block)
           template_mio = MasterView::IOMgr.template.path(relative_destination)
 
           # If source and destination are identical then we're done.
           if template_mio.identical?(content)
-            return logger.identical(relative_destination) 
+            return logger.identical(relative_destination)
           end
 
           # Check for and resolve file collisions.
@@ -81,7 +98,7 @@ module Rails
             # Make a choice whether to overwrite the file.  :force and
             # :skip already have their mind made up, but give :ask a shot.
             choice = case (file_options[:collision] || options[:collision]).to_sym #|| :ask
-              when :ask   then force_file_collision?(relative_destination)
+              when :ask   then mv_force_file_collision?(relative_destination)
               when :force then :force
               when :skip  then :skip
               else raise "Invalid collision option: #{options[:collision].inspect}"
@@ -109,7 +126,7 @@ module Rails
           #if file_options[:chmod]
           #  FileUtils.chmod(file_options[:chmod], destination)
           #end
-          
+
           # Optionally add file to subversion
           #system("svn add #{destination}") if options[:svn]
         end
@@ -180,7 +197,7 @@ module Rails
       end
 
       class Update < Create
-        def multi_include_template(relative_source, relative_destination, template_options = {}, multi_assign_options = {})          
+        def multi_include_template(relative_source, relative_destination, template_options = {}, multi_assign_options = {})
           return if relative_source.is_a?(StringIO) && relative_destination.is_a?(StringIO)
            begin
              dest_file = destination_path(relative_destination)
@@ -240,19 +257,19 @@ class MasterviewGenerator < Rails::Generator::NamedBase
     if full_options[:single_file]
       com = <<-END
       <!--
-           These stylesheets below are for design time use to allow working with only one visible section at a time, especially 
+           These stylesheets below are for design time use to allow working with only one visible section at a time, especially
            when trying to use absolute positioning. You may comment/uncomment which ever section you wish to work with.
-	   You may comment all of them out to work with all at design time. These stylesheets will not be used at runtime
+           You may comment all of them out to work with all at design time. These stylesheets will not be used at runtime
       -->
       END
 
       dts << com
 
-      dts << html_comment( '<link rel="stylesheet" type="text/css" href="../../masterview/extra/show_only_new.css" mv:preview="remove" mv:replace=""/>', 
+      dts << html_comment( '<link rel="stylesheet" type="text/css" href="../../masterview/extra/show_only_new.css" mv:preview="remove" mv:replace=""/>',
                            full_options[:showSection] != :new )
       dts << html_comment( '<link rel="stylesheet" type="text/css" href="../../masterview/extra/show_only_edit.css" mv:preview="remove" mv:replace=""/>', true)
       dts << html_comment( '<link rel="stylesheet" type="text/css" href="../../masterview/extra/show_only_show.css" mv:preview="remove" mv:replace=""/>', true)
-      dts << html_comment( '<link rel="stylesheet" type="text/css" href="../../masterview/extra/show_only_list.css" mv:preview="remove" mv:replace=""/>', 
+      dts << html_comment( '<link rel="stylesheet" type="text/css" href="../../masterview/extra/show_only_list.css" mv:preview="remove" mv:replace=""/>',
                            full_options[:showSection] != :list )
       dts << html_comment( '<link rel="stylesheet" type="text/css" href="../../masterview/extra/show_only_destroy.css" mv:preview="remove" mv:replace=""/>', true)
     end
@@ -269,7 +286,7 @@ class MasterviewGenerator < Rails::Generator::NamedBase
   def design_time_javascript
     dtj = ''
     # todo make this relative to whereever IOMgr.template is
-    if full_options[:single_file]      
+    if full_options[:single_file]
       dtj << %Q[    <script type="text/javascript" mv:replace="" src="../../masterview/extra/mvpreview.js"></script>\n]
       dtj << %Q[    <script type="text/javascript" mv:replace="">\n]
       dtj << %Q[      mvpreview.preparePage( '#{controller_file_name}', {showOneSection: '#{controller_file_name}_list', single_file: true } );\n]
@@ -350,8 +367,8 @@ class MasterviewGenerator < Rails::Generator::NamedBase
 
       # MasterView
       if full_options[:single_file]
-        m.multi_include_template "masterview.rhtml","#{controller_masterview_name}/masterview.html", {}, 
-         { 
+        m.multi_include_template "masterview.rhtml","#{controller_masterview_name}/masterview.html", {},
+         {
           'form_inclusion' =>
             { :insert => 'form_scaffold.rhtml',
             :sandbox => lambda { create_multi_sandbox('ScaffoldingSandbox') },
@@ -359,14 +376,14 @@ class MasterviewGenerator < Rails::Generator::NamedBase
             :end_mark => 'eoform',
             :mark_id => singular_name
           },
-          'list_head_inclusion' => 
+          'list_head_inclusion' =>
             { :insert => 'list_head_scaffold.rhtml',
             :sandbox => lambda { create_multi_sandbox('ListHeadScaffoldingSandbox') },
             :begin_mark => 'listhead',
             :end_mark => 'eolisthead',
             :mark_id => singular_name
           },
-          'list_line_inclusion' => 
+          'list_line_inclusion' =>
             { :insert => 'list_line_scaffold.rhtml',
             :sandbox => lambda { create_multi_sandbox('ListLineScaffoldingSandbox') },
             :begin_mark => 'listline',
@@ -383,15 +400,15 @@ class MasterviewGenerator < Rails::Generator::NamedBase
          }
       else #multi file
         m.multi_file_multi_include_template "masterview.rhtml",
-          { 
+          {
             :list => "#{controller_masterview_name}/list.html",
             :new => "#{controller_masterview_name}/new.html",
             :edit => "#{controller_masterview_name}/edit.html",
             :show => "#{controller_masterview_name}/show.html",
             :destroy => "#{controller_masterview_name}/destroy.html",
           },
-          {}, 
-          { 
+          {},
+          {
           'form_inclusion' =>
             { :insert => 'form_scaffold.rhtml',
             :sandbox => lambda { create_multi_sandbox('ScaffoldingSandbox') },
@@ -399,14 +416,14 @@ class MasterviewGenerator < Rails::Generator::NamedBase
             :end_mark => 'eoform',
             :mark_id => singular_name
             },
-          'list_head_inclusion' => 
+          'list_head_inclusion' =>
             { :insert => 'list_head_scaffold.rhtml',
             :sandbox => lambda { create_multi_sandbox('ListHeadScaffoldingSandbox') },
             :begin_mark => 'listhead',
             :end_mark => 'eolisthead',
             :mark_id => singular_name
             },
-          'list_line_inclusion' => 
+          'list_line_inclusion' =>
             { :insert => 'list_line_scaffold.rhtml',
             :sandbox => lambda { create_multi_sandbox('ListLineScaffoldingSandbox') },
             :begin_mark => 'listline',
@@ -524,8 +541,8 @@ class MasterviewGenerator < Rails::Generator::NamedBase
     def suffix
       "_#{singular_name}" if options[:suffix]
     end
-    
-    def model_name 
+
+    def model_name
       class_name.demodulize
     end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: masterview_generator
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2006-11-07 00:00:00 -06:00
+  version: 0.3.1
+date: 2006-11-20 00:00:00 -06:00
 summary: A (x)html friendly template engine for rails with the power of layouts, and partials. MasterView Generator for creating templates and scaffolding.
 require_paths: 
 - .