rails3-generators 0.8.2 → 0.9.0

data/.gitignore

@@ -1,7 +1,22 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
 ## PROJECT::GENERAL
 coverage
 rdoc
 pkg
 
 ## PROJECT::SPECIFIC
-.idea
+tmp/**/*

data/README.rdoc

@@ -1,10 +1,32 @@
 = rails3-generators
 
-Rails 3 compatible generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, Shoulda, Formtastic and SimpleForm
+Generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, Shoulda, Formtastic and SimpleForm
 
-== Note on Patches/Pull Requests
+== install
+
+  gem install rails3-generators
+
+and add the following to your project's Gemfile
+
+  gem 'rails3-generators'
 
-Fork the repo, add a generator, send a pull request. Pretty simple.
+== notes
+
+To avoid overriding the rails built-in Erb template generators this project uses the namespace Erubis for *.erb templates
+
+  config.generators do |g|
+    g.template_engine  :erubis
+  end
+
+== Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
 
 == Contributors
 
@@ -24,3 +46,4 @@ Shoulda: Peter Haza
 
 SimpleForm: Peter Gumeson
 
+and more[http://github.com/indirect/rails3-generators/contributors]

data/Rakefile

@@ -3,20 +3,58 @@ require 'rake'
 
 begin
   require 'jeweler'
+  
   Jeweler::Tasks.new do |gem|
+    version = File.exist?('VERSION') ? File.read('VERSION') : ""
+      
     gem.name = "rails3-generators"
     gem.summary = %Q{Rails 3 compatible generators}
     gem.description = %Q{Rails 3 compatible generators for DataMapper, Haml, Factory-girl, Authlogic, Mongomapper, Shoulda, Formtastic and SimpleForm}
     gem.email = "andre@arko.net"
     gem.homepage = "http://github.com/indirect/rails3-generators"
     gem.authors = ["Jose Valim", "Anuj Dutta", "Paul Berry", "Jeff Tucker", "Louis T.", "Jai-Gouk Kim", "Darcy Laycock", "Peter Haza", "Peter Gumeson"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    # gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.post_install_message =
+%Q{
+rails3-generators-#{version}
+Be sure to check out the wiki, http://wiki.github.com/indirect/rails3-generators/,
+for information about recent changes to this project.
+
+note: if you use erb templates add the follow to your generators block to take full advantage of this gem.
+g.template_engine :erubis
+
+}
+    
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :test => :check_dependencies
+
+task :default => :test
+
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.9.0

data/lib/generators/authlogic/session/session_generator.rb

@@ -11,7 +11,8 @@ module Authlogic
         template 'session.rb', File.join('app', 'models', class_path, "#{file_name}.rb")
       end
       
-      hook_for :test_framework
+      # HACK: make test_framework generator for this generator.
+      hook_for :test_framework, :as => :model
     end
   end
 end

data/lib/generators/erubis.rb

@@ -0,0 +1,9 @@
+module Erubis
+  module Generators
+    module TemplatePath
+      def source_root
+        @_haml_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'erubis', generator_name, 'templates'))
+      end
+    end
+  end
+end

data/lib/generators/erubis/controller/controller_generator.rb

@@ -0,0 +1,10 @@
+require 'generators/erubis'
+require 'rails/generators/erb/controller/controller_generator'
+
+module Erubis
+  module Generators
+    class ControllerGenerator < Erb::Generators::ControllerGenerator
+      extend TemplatePath
+    end
+  end
+end

data/lib/generators/erubis/controller/templates/view.html.erb

@@ -0,0 +1,2 @@
+<h1><%= class_name %>#<%= @action %></h1>
+<p>Find me in <%= @path %></p>

data/lib/generators/erubis/scaffold/scaffold_generator.rb

@@ -0,0 +1,25 @@
+require 'generators/erubis'
+require 'rails/generators/erb/scaffold/scaffold_generator'
+
+module Erubis
+  module Generators
+    class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
+      extend TemplatePath
+
+      hook_for :form_builder, :as => :scaffold
+
+      def copy_form_file
+        if options[:form_builder].nil?
+          filename = filename_with_extensions("_form")
+          template filename, File.join("app/views", controller_file_path, filename)
+        end
+      end
+
+      protected
+
+        def available_views
+          %w(index edit show new)
+        end
+    end
+  end
+end

data/lib/generators/erubis/scaffold/templates/_form.html.erb

@@ -0,0 +1,23 @@
+<%%= form_for(@<%= singular_name %>) do |f| %>
+  <%% if @<%= singular_name %>.errors.any? %>
+    <div id="error_explanation">
+      <h2><%%= pluralize(@<%= singular_name %>.errors.count, "error") %> prohibited this <%= singular_name %> from being saved:</h2>
+
+      <ul>
+      <%% @<%= singular_name %>.errors.full_messages.each do |msg| %>
+        <li><%%= msg %></li>
+      <%% end %>
+      </ul>
+    </div>
+  <%% end %>
+
+<% for attribute in attributes -%>
+  <div class="field">
+    <%%= f.label :<%= attribute.name %> %><br />
+    <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+  </div>
+<% end -%>
+  <div class="actions">
+    <%%= f.submit %>
+  </div>
+<%% end %>

data/lib/generators/{formtastic_erb → erubis}/scaffold/templates/index.html.erb

@@ -24,4 +24,4 @@
 
 <br />
 
-<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %>
+<%%= link_to 'New <%= human_name %>', new_<%= singular_name %>_path %>

data/lib/generators/{formtastic_erb → erubis}/scaffold/templates/show.html.erb

@@ -1,3 +1,5 @@
+<p id="notice"><%%= notice %></p>
+
 <% for attribute in attributes -%>
 <p>
   <b><%= attribute.human_name %>:</b>

data/lib/generators/formtastic.rb

@@ -0,0 +1,29 @@
+require 'rails/generators/named_base'
+
+module Formtastic
+  module Generators
+    class Base < Rails::Generators::NamedBase #:nodoc:
+
+      def self.source_root
+        @_simple_form_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'formtastic', generator_name, 'templates'))
+      end
+      protected
+
+        def format
+          :html
+        end
+
+        def handler
+          :erb
+        end
+
+        def filename_with_extensions(name)
+          [name, format, handler].compact.join(".")
+        end
+
+        def template_filename_with_extensions(name)
+          [name, format, handler, :erb].compact.join(".")
+        end
+    end
+  end
+end

data/lib/generators/formtastic/scaffold/scaffold_generator.rb

@@ -0,0 +1,25 @@
+require 'generators/formtastic'
+require 'rails/generators/resource_helpers'
+
+module Formtastic
+  module Generators
+    class ScaffoldGenerator < Base
+      include Rails::Generators::ResourceHelpers
+
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+
+      class_option :template_engine
+
+      def copy_form_file
+        filename = filename_with_extensions("_form")
+        template template_filename_with_extensions("_form"), File.join("app/views", controller_file_path, filename)
+      end
+
+      protected
+
+        def handler
+          options[:template_engine].to_s.gsub('erubis', 'erb')
+        end
+    end
+  end
+end

data/lib/generators/{formtastic_erb/scaffold/templates/_form.html.erb → formtastic/scaffold/templates/_form.html.erb.erb}

@@ -1,4 +1,4 @@
-<%% semantic_form_for @<%= singular_name %> do |form| %>
+<%%= semantic_form_for @<%= file_name %> do |form| %>
 <%- if attributes.empty? -%>
   <%% form.inputs %>
 <%- else -%>

data/lib/generators/{formtastic_haml/scaffold/templates/_form.haml.erb → formtastic/scaffold/templates/_form.html.haml.erb}

@@ -1,8 +1,8 @@
-- semantic_form_for @<%= singular_name %> do |form|
+= semantic_form_for @<%= file_name %> do |form|
 <%- if attributes.empty? -%>
   = form.inputs
 <%- else -%>
-  - form.inputs do
+  = form.inputs do
 <%- for attribute in attributes -%>
     = form.input :<%= attribute.name.gsub(/_id$/, '') %>, :label => '<%= attribute.name.titleize %>'
 <%- end -%>

data/lib/generators/haml/controller/controller_generator.rb

@@ -1,24 +1,16 @@
 require 'generators/haml'
-require 'rails/generators/named_base'
+require 'rails/generators/erb/controller/controller_generator'
 
 module Haml
   module Generators
-    class ControllerGenerator < Rails::Generators::NamedBase
+    class ControllerGenerator < Erb::Generators::ControllerGenerator
       extend TemplatePath
-      
-      argument :actions, :type => :array, :default => [], :banner => "action action"
 
-      def create_view_files
-        base_path = File.join("app/views", class_path, file_name)
-        empty_directory base_path
+      protected
 
-        actions.each do |action|
-          @action = action
-          @path   = File.join(base_path, "#{action}.html.haml")
-
-          template 'view.html.haml', @path
+        def handler
+          :haml
         end
-      end
     end
   end
-end
+end

data/lib/generators/haml/controller/templates/view.html.haml

@@ -0,0 +1,2 @@
+%h1 <%= class_name %>#<%= @action %>
+%p Find me in <%= @path %>

data/lib/generators/haml/install/install_generator.rb

@@ -0,0 +1,20 @@
+require 'generators/haml'
+
+module Haml
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      extend TemplatePath
+      
+      def copy_initializer_files
+        inside "config" do
+          empty_directory "initializers", :verbose => false
+
+          inside "initializers" do
+            template "haml.rb.tt", "haml.rb"
+          end
+        end
+      end
+      
+    end
+  end
+end

data/lib/generators/haml/install/templates/config/initializers/haml.rb.tt

@@ -0,0 +1,4 @@
+# Load Haml and Sass.
+Haml.init_rails(binding) if defined?(Haml)
+
+Haml::Template.options[:format] = :html5

data/lib/generators/haml/scaffold/scaffold_generator.rb

@@ -6,21 +6,38 @@ module Haml
     class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
       extend TemplatePath
 
-      def copy_layout_file
-        return unless options[:layout]
-        template "layout.haml.erb",
-                 File.join("app/views/layouts", controller_class_path, "#{controller_file_name}.html.haml")
-      end
-      
       def copy_view_files
         views = available_views
         views.delete("index") if options[:singleton]
 
         views.each do |view|
-          template "#{view}.haml.erb", File.join("app/views", controller_file_path, "#{view}.html.haml")
+          filename = filename_with_extensions(view)
+          template template_filename_with_extensions(view), File.join("app/views", controller_file_path, filename)
+        end
+      end
+
+      hook_for :form_builder, :as => :scaffold
+
+      def copy_form_file
+        if options[:form_builder].nil?
+          filename = filename_with_extensions("_form")
+          template template_filename_with_extensions("_form"), File.join("app/views", controller_file_path, filename)
         end
       end
 
+      protected
+
+        def available_views
+          %w(index edit show new)
+        end
+
+        def handler
+          :haml
+        end
+
+        def template_filename_with_extensions(name)
+          [name, format, handler, :erb].compact.join(".")
+        end
     end
   end
 end

data/lib/generators/simple_form.rb

@@ -0,0 +1,30 @@
+require 'rails/generators/named_base'
+
+module SimpleForm
+  module Generators
+    class Base < Rails::Generators::NamedBase #:nodoc:
+      # include Rails::Generators::ResourceHelpers
+      
+      def self.source_root
+        @_simple_form_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'simple_form', generator_name, 'templates'))
+      end
+      protected
+
+      def format
+        :html
+      end
+
+      def handler
+        :erb
+      end
+
+      def filename_with_extensions(name)
+        [name, format, handler].compact.join(".")
+      end
+      
+      def template_filename_with_extensions(name)
+        [name, format, handler, :erb].compact.join(".")
+      end
+    end
+  end
+end