haml-rails 0.2 → 0.3

data/.gitignore

@@ -1 +1,2 @@
-*.gem
+*.gem
+tmp/

data/README.md

@@ -8,4 +8,8 @@ To use it, add this line to your Gemfile:
 
 Pretty fancy, eh?
 
-Once you've done that, any time you generate a controller or scaffold, you'll get Haml instead of ERB templates. On top of that, when your Rails application loads, Haml will be loaded and initialized completely automatically! The modern world is just so amazing.
+Once you've done that, any time you generate a controller or scaffold, you'll get Haml instead of ERB templates. On top of that, when your Rails application loads, Haml will be loaded and initialized completely automatically! The modern world is just so amazing.
+
+### Contributors
+
+Haml generators originally from [rails3-generators](http://github.com/indirect/rails3-generators), and written by Paul Barry, Anuj Dutta, Louis T, and Chris Rhoden. Tests originally written by Louis T.

data/Rakefile

@@ -1,2 +1,11 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
+task :default => :test

data/haml-rails.gemspec

@@ -14,11 +14,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "haml-rails"
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "rails", "~>3.0.0.rc"
-  s.add_dependency "haml", "~>3.0"
-  s.add_development_dependency "bundler", ">= 1.0.0.rc.6"
+  s.add_dependency "rails", "~> 3.0.0"
+  s.add_dependency "haml",  "~> 3.0.18"
+
+  s.add_development_dependency "bundler", "~> 1.0.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").select{|f| f =~ /^bin/}
   s.require_path = 'lib'
-end
+end

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

@@ -1,14 +1,16 @@
-require 'generators/haml'
 require 'rails/generators/erb/controller/controller_generator'
 
 module Haml
   module Generators
     class ControllerGenerator < Erb::Generators::ControllerGenerator
-      extend TemplatePath
+      source_root File.expand_path("../templates", __FILE__)
+
     protected
+
       def handler
         :haml
       end
+
     end
   end
 end

data/lib/generators/haml/mailer/mailer_generator.rb

@@ -0,0 +1,16 @@
+require 'generators/haml/controller/controller_generator'
+
+module Haml
+  module Generators
+    class MailerGenerator < ControllerGenerator
+      source_root File.expand_path("../templates", __FILE__)
+
+    protected
+
+      def format
+        :text
+      end
+
+    end
+  end
+end

data/lib/generators/haml/mailer/templates/view.text.haml

@@ -0,0 +1,3 @@
+<%= class_name %>#<%= @action %>
+
+= @greeting + ", find me in <%= @path %>"

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

@@ -1,18 +1,14 @@
-require 'generators/haml'
 require 'rails/generators/erb/scaffold/scaffold_generator'
 
 module Haml
   module Generators
     class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
-      extend TemplatePath
+      source_root File.expand_path("../templates", __FILE__)
 
       def copy_view_files
-        views = available_views
-        views.delete("index") if options[:singleton]
-
-        views.each do |view|
+        available_views.each do |view|
           filename = filename_with_extensions(view)
-          template template_filename_with_extensions(view), File.join("app/views", controller_file_path, filename)
+          template "#{view}.html.haml", File.join("app/views", controller_file_path, filename)
         end
       end
 
@@ -21,23 +17,20 @@ module Haml
       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)
+          template "_form.html.haml", File.join("app/views", controller_file_path, filename)
         end
       end
 
-      protected
+    protected
 
-        def available_views
-          %w(index edit show new)
-        end
+      def available_views
+        %w(index edit show new)
+      end
 
-        def handler
-          :haml
-        end
+      def handler
+        :haml
+      end
 
-        def template_filename_with_extensions(name)
-          [name, format, handler, :erb].compact.join(".")
-        end
     end
   end
 end

data/lib/generators/haml/scaffold/templates/_form.html.haml

@@ -0,0 +1,15 @@
+= form_for @<%= singular_table_name %> do |f|
+  -if @<%= singular_table_name %>.errors.any?
+    #error_explanation
+      %h2= "#{pluralize(@<%= singular_table_name %>.errors.count, "error")} prohibited this <%= singular_table_name %> from being saved:"
+      %ul
+        - @<%= singular_table_name %>.errors.full_messages.each do |msg|
+          %li= msg
+
+<% for attribute in attributes -%>
+  .field
+    = f.label :<%= attribute.name %>
+    = f.<%= attribute.field_type %> :<%= attribute.name %>
+<% end -%>
+  .actions
+    = f.submit 'Save'

data/lib/generators/haml/scaffold/templates/edit.html.haml

@@ -0,0 +1,7 @@
+%h1 Editing <%= singular_table_name %>
+
+= render 'form'
+
+= link_to 'Show', @<%= singular_table_name %>
+\|
+= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/index.html.haml

@@ -0,0 +1,23 @@
+%h1 Listing <%= plural_table_name %>
+
+%table
+  %tr
+<% for attribute in attributes -%>
+    %th <%= attribute.human_name %>
+<% end -%>
+    %th
+    %th
+    %th
+
+  - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
+    %tr
+<% for attribute in attributes -%>
+      %td= <%= singular_table_name %>.<%= attribute.name %>
+<% end -%>
+      %td= link_to 'Show', <%= singular_table_name %>
+      %td= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>)
+      %td= link_to 'Destroy', <%= singular_table_name %>, :confirm => 'Are you sure?', :method => :delete
+
+%br
+
+= link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path

data/lib/generators/haml/scaffold/templates/new.html.haml

@@ -0,0 +1,5 @@
+%h1 New <%= singular_table_name %>
+
+= render 'form'
+
+= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/show.html.haml

@@ -0,0 +1,11 @@
+%p#notice= notice
+
+<% for attribute in attributes -%>
+%p
+  %b <%= attribute.human_name %>:
+  = @<%= singular_table_name %>.<%= attribute.name %>
+<% end -%>
+
+= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>)
+\|
+= link_to 'Back', <%= index_helper %>_path

data/lib/haml-rails/version.rb

@@ -1,5 +1,5 @@
 module Haml
   module Rails
-    VERSION = "0.2"
+    VERSION = "0.3"
   end
 end

data/test/fixtures/routes.rb

@@ -0,0 +1,58 @@
+TestApp.routes.draw do |map|
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get :short
+  #       post :toggle
+  #     end
+  #
+  #     collection do
+  #       get :sold
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get :recent, :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => "welcome#index"
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id(.:format)))'
+end

data/test/lib/generators/haml/controller_generator_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+require 'lib/generators/haml/testing_helper'
+
+class Haml::Generators::ControllerGeneratorTest < Rails::Generators::TestCase
+  destination File.join(Rails.root)
+  tests Rails::Generators::ControllerGenerator
+  arguments %w(Account foo bar --template-engine haml)
+
+  setup :prepare_destination
+  setup :copy_routes
+
+  test "should invoke template engine" do
+    run_generator
+    assert_file "app/views/account/foo.html.haml", %r(app/views/account/foo\.html\.haml)
+    assert_file "app/views/account/bar.html.haml", %r(app/views/account/bar\.html\.haml)
+  end
+end

data/test/lib/generators/haml/mailer_generator_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+require 'lib/generators/haml/testing_helper'
+
+class Haml::Generators::MailerGeneratorTest < Rails::Generators::TestCase
+  destination File.join(Rails.root)
+  tests Rails::Generators::MailerGenerator
+  arguments %w(notifier foo bar --template-engine haml)
+
+  setup :prepare_destination
+  setup :copy_routes
+
+  test "should invoke template engine" do
+    run_generator
+    assert_file "app/views/notifier/foo.text.haml" do |view|
+      assert_match %r(app/views/notifier/foo\.text\.haml), view
+      assert_match /\= @greeting/, view
+    end
+
+    assert_file "app/views/notifier/bar.text.haml" do |view|
+      assert_match %r(app/views/notifier/bar\.text\.haml), view
+      assert_match /\= @greeting/, view
+    end
+  end
+end

data/test/lib/generators/haml/scaffold_generator_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+require 'lib/generators/haml/testing_helper'
+
+class Haml::Generators::ScaffoldGeneratorTest < Rails::Generators::TestCase
+  destination File.join(Rails.root)
+  tests Rails::Generators::ScaffoldGenerator
+  arguments %w(product_line title:string price:integer --template-engine haml)
+
+  setup :prepare_destination
+  setup :copy_routes
+
+  test "should invoke template engine" do
+    run_generator
+
+    %w(index edit new show _form).each { |view| assert_file "app/views/product_lines/#{view}.html.haml" }
+    assert_no_file "app/views/layouts/product_lines.html.haml"
+  end
+
+  test "should revoke template engine" do
+    run_generator
+    run_generator ["product_line"], :behavior => :revoke
+
+    assert_no_file "app/views/product_lines"
+    assert_no_file "app/views/layouts/product_lines.html.haml"
+  end
+
+  test "should invoke form builder" do
+    run_generator %w(product_line title:string price:integer --template-engine haml --form-builder some-form-builder)
+    assert_no_file "app/views/product_lines/_form.html.haml"
+  end
+end

data/test/lib/generators/haml/testing_helper.rb

@@ -0,0 +1 @@
+require_generators :haml => ['scaffold', 'controller', 'mailer']

data/test/test_helper.rb

@@ -0,0 +1,75 @@
+require 'rubygems'
+require 'test/unit'
+require 'rails/all'
+require 'rails/generators'
+require 'rails/generators/test_case'
+
+class TestApp < Rails::Application
+  config.root = File.dirname(__FILE__)
+end
+Rails.application = TestApp
+
+module Rails
+  def self.root
+    @root ||= File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'rails'))
+  end
+end
+Rails.application.config.root = Rails.root
+
+# Call configure to load the settings from
+# Rails.application.config.generators to Rails::Generators
+Rails::Generators.configure!
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+def copy_routes
+  routes = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'routes.rb'))
+  destination = File.join(Rails.root, "config")
+  FileUtils.mkdir_p(destination)
+  FileUtils.cp File.expand_path(routes), destination
+end
+
+# Asserts the given class exists in the given content. When a block is given,
+# it yields the content of the class.
+#
+#   assert_file "test/functional/accounts_controller_test.rb" do |controller_test|
+#     assert_class "AccountsControllerTest", controller_test do |klass|
+#       assert_match /context "index action"/, klass
+#     end
+#   end
+#
+def assert_class(klass, content)
+  assert content =~ /class #{klass}(\(.+\))?(.*?)\nend/m, "Expected to have class #{klass}"
+  yield $2.strip if block_given?
+end
+
+def generator_list
+  {
+    :rails        => ['scaffold', 'controller', 'mailer'],
+    :haml         => ['scaffold', 'controller', 'mailer']
+  }
+end
+
+def path_prefix(name)
+  case name
+  when :rails
+    'rails/generators'
+  else
+    'generators'
+  end
+end
+
+def require_generators(generator_list)
+  generator_list.each do |name, generators|
+    generators.each do |generator_name|
+      if name.to_s == 'rails' && generator_name.to_s == 'mailer'
+        require File.join(path_prefix(name), generator_name.to_s, "#{generator_name}_generator")
+      else
+        require File.join(path_prefix(name), name.to_s, generator_name.to_s, "#{generator_name}_generator")
+      end
+    end
+  end
+end
+alias :require_generator :require_generators
+
+require_generators generator_list

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: haml-rails
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - "Andr\xC3\xA9 Arko"
@@ -13,51 +14,55 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-15 00:00:00 -07:00
+date: 2010-10-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - rc
-        version: 3.0.0.rc
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 3
         - 0
-        version: "3.0"
+        - 18
+        version: 3.0.18
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc
-        - 6
-        version: 1.0.0.rc.6
+        version: 1.0.0
   type: :development
   version_requirements: *id003
 description: Haml-rails provides Haml generators for Rails 3. It also enables Haml as the templating engine for you, so you don't have to screw around in your own application.rb when your Gemfile already clearly indicated what templating engine you have installed. Hurrah.
@@ -75,17 +80,24 @@ files:
 - README.md
 - Rakefile
 - haml-rails.gemspec
-- lib/generators/haml.rb
 - lib/generators/haml/controller/controller_generator.rb
 - lib/generators/haml/controller/templates/view.html.haml
+- lib/generators/haml/mailer/mailer_generator.rb
+- lib/generators/haml/mailer/templates/view.text.haml
 - lib/generators/haml/scaffold/scaffold_generator.rb
-- lib/generators/haml/scaffold/templates/_form.html.haml.erb
-- lib/generators/haml/scaffold/templates/edit.html.haml.erb
-- lib/generators/haml/scaffold/templates/index.html.haml.erb
-- lib/generators/haml/scaffold/templates/new.html.haml.erb
-- lib/generators/haml/scaffold/templates/show.html.haml.erb
+- lib/generators/haml/scaffold/templates/_form.html.haml
+- lib/generators/haml/scaffold/templates/edit.html.haml
+- lib/generators/haml/scaffold/templates/index.html.haml
+- lib/generators/haml/scaffold/templates/new.html.haml
+- lib/generators/haml/scaffold/templates/show.html.haml
 - lib/haml-rails.rb
 - lib/haml-rails/version.rb
+- test/fixtures/routes.rb
+- test/lib/generators/haml/controller_generator_test.rb
+- test/lib/generators/haml/mailer_generator_test.rb
+- test/lib/generators/haml/scaffold_generator_test.rb
+- test/lib/generators/haml/testing_helper.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/indirect/haml-rails
 licenses: []
@@ -96,16 +108,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -114,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: haml-rails
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: let your Gemfile do the configuring

data/lib/generators/haml.rb

@@ -1,9 +0,0 @@
-module Haml
-  module Generators
-    module TemplatePath
-      def source_root
-        File.expand_path("../haml/#{generator_name}/templates", __FILE__)
-      end
-    end
-  end
-end

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

@@ -1,15 +0,0 @@
-= form_for @<%= singular_name %> do |f|
-  -if @<%= singular_name %>.errors.any?
-    #errorExplanation
-      %h2= "#{pluralize(@<%= singular_name %>.errors.count, "error")} prohibited this <%= singular_name %> from being saved:"
-      %ul
-        - @<%= singular_name %>.errors.full_messages.each do |msg|
-          %li= msg
-
-<% for attribute in attributes -%>
-  .field
-    = f.label :<%= attribute.name %>
-    = f.<%= attribute.field_type %> :<%= attribute.name %>
-<% end -%>
-  .actions
-    = f.submit 'Save'

data/lib/generators/haml/scaffold/templates/edit.html.haml.erb

@@ -1,7 +0,0 @@
-%h1 Editing <%= singular_name %>
-
-= render 'form'
-
-= link_to 'Show', @<%= singular_name %>
-\|
-= link_to 'Back', <%= plural_name %>_path

data/lib/generators/haml/scaffold/templates/index.html.haml.erb

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

data/lib/generators/haml/scaffold/templates/new.html.haml.erb

@@ -1,5 +0,0 @@
-%h1 New <%= singular_name %>
-
-= render 'form'
-
-= link_to 'Back', <%= plural_name %>_path

data/lib/generators/haml/scaffold/templates/show.html.haml.erb

@@ -1,9 +0,0 @@
-<% for attribute in attributes -%>
-%p
-  %b <%= attribute.human_name %>:
-  = @<%= singular_name %>.<%= attribute.name %>
-<% end -%>
-
-= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>)
-\|
-= link_to 'Back', <%= plural_name %>_path