generator-spec 0.3.3 → 0.3.4

data/.rspec

@@ -0,0 +1 @@
+--format nested --color

data/README.markdown

@@ -44,7 +44,7 @@ Put a *require_generator* statement in each spec file, to ensure that particular
 
 This will load the generator : `generators/canabale_generator.rb`
 
-If the generator is namespaced, use a nested approach like so:
+If the generator is namespaced, use a nested approach like this:
 
 <pre>require_generators :canable => ['model', 'user']</pre>
 
@@ -120,7 +120,7 @@ describe 'model_generator' do
       name = 'account'
       create_model name     
       g.run_generator %w{account}
-      g.should generate_file name, :model do |content|
+      g.should generate_model name do |content|
         content.should have_class name do |klass|
           klass.should include_module 'Canable::Ables'
         end
@@ -129,6 +129,15 @@ describe 'model_generator' do
   end
 end</pre>
 
+## TODO
+
+Need to create specs to test matchers/helpers for generated:
+* migration
+* controller
+* helper
+* view
+* ...
+
 ## Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/generator-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{generator-spec}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-08-04}
+  s.date = %q{2010-08-05}
   s.description = %q{RSpec 2 library to assist in writing generator specs}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -19,18 +19,22 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     ".rspec",
      "LICENSE",
      "README.markdown",
      "Rakefile",
      "VERSION",
      "generator-spec.gemspec",
      "lib/generators/demo/demo_generator.rb",
+     "lib/generators/migration/migration_generator.rb",
+     "lib/generators/migration/templates/create_users.erb",
      "lib/rspec_for_generators.rb",
      "lib/rspec_for_generators/fixtures/routes.rb",
      "lib/rspec_for_generators/generator_spec_helper.rb",
      "lib/rspec_for_generators/main.rb",
      "lib/rspec_for_generators/matchers/content/have_block.rb",
      "lib/rspec_for_generators/matchers/content/have_call.rb",
+     "lib/rspec_for_generators/matchers/content/have_calls.rb",
      "lib/rspec_for_generators/matchers/content/have_class.rb",
      "lib/rspec_for_generators/matchers/content/have_method.rb",
      "lib/rspec_for_generators/matchers/content/have_module.rb",
@@ -48,22 +52,28 @@ Gem::Specification.new do |s|
      "lib/rspec_for_generators/matchers/migration/have_table.rb",
      "lib/rspec_for_generators/matchers/migration/have_tbl_column.rb",
      "lib/rspec_for_generators/matchers/migration/have_up_down.rb",
-     "lib/rspec_for_generators/rails_helpers/all.rb",
      "lib/rspec_for_generators/rails_helpers/rails_app.rb",
      "lib/rspec_for_generators/rails_helpers/rails_controller.rb",
      "lib/rspec_for_generators/rails_helpers/rails_helper.rb",
      "lib/rspec_for_generators/rails_helpers/rails_mailer.rb",
+     "lib/rspec_for_generators/rails_helpers/rails_migration.rb",
      "lib/rspec_for_generators/rails_helpers/rails_model.rb",
      "lib/rspec_for_generators/rails_helpers/rails_orm.rb",
      "lib/rspec_for_generators/rails_helpers/rails_view.rb",
      "lib/rspec_for_generators/rails_spec_helper.rb",
      "lib/rspec_for_generators/rspec_test_case.rb",
      "rspec_for_generators.gemspec",
-     "spec/rspec_for_generators/rspec_for_generators_spec.rb",
-     "spec/spec.opts",
+     "spec/rspec_for_generators/controller_generator_spec.rb",
+     "spec/rspec_for_generators/helper_generator_spec.rb",
+     "spec/rspec_for_generators/migration_generator_spec.rb",
+     "spec/rspec_for_generators/model_generator_spec.rb",
+     "spec/rspec_for_generators/view_generator_spec.rb",
      "spec/spec_helper.rb",
      "wiki/Custom Rails 3 Generators.textile",
-     "wiki/rails_view_helpers.textile"
+     "wiki/content_matchers.textile",
+     "wiki/file_matchers.textile",
+     "wiki/migration_matchers.textile",
+     "wiki/rails_helpers.textile"
   ]
   s.homepage = %q{http://github.com/kristianmandrup/rspec_for_generators}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -71,7 +81,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{RSpec 2 library for writing generator specs}
   s.test_files = [
-    "spec/rspec_for_generators/rspec_for_generators_spec.rb",
+    "spec/rspec_for_generators/controller_generator_spec.rb",
+     "spec/rspec_for_generators/helper_generator_spec.rb",
+     "spec/rspec_for_generators/migration_generator_spec.rb",
+     "spec/rspec_for_generators/model_generator_spec.rb",
+     "spec/rspec_for_generators/view_generator_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/lib/generators/demo/demo_generator.rb

@@ -7,7 +7,7 @@ class DemoGenerator < Rails::Generators::Base
     @source_root ||= File.expand_path("../../templates", __FILE__)
   end
 
-  def make_canable_able
+  def make_canable_able  
     if File.exist?(model_file_name)
       @model_file_txt  = File.open(model_file_name).read
       after_txt       = find_after_txt(model_file_txt)        

data/lib/generators/migration/migration_generator.rb

@@ -0,0 +1,13 @@
+class MigrationGenerator < Rails::Generators::Base
+  desc "Creates a migration" 
+
+  argument :name, :type => :string
+
+  def self.source_root
+    @source_root ||= File.expand_path("../templates", __FILE__)
+  end
+    
+  def create_migration
+    template "#{name}.erb", 'db/migrations/20100203_create_users.rb'
+  end
+end 

data/lib/generators/migration/templates/create_users.erb

@@ -0,0 +1,14 @@
+class <%= name.camelize %> < ActiveRecord::Migration
+  def self.up  
+    create_table :users do |t|
+      t.string  :name
+      t.integer :age
+      t.boolean :admin
+    end
+  end
+
+  def self.down
+    drop_table :users  
+  end
+
+end

data/lib/rspec_for_generators/generator_spec_helper.rb

@@ -25,7 +25,7 @@ alias :require_generator :require_generators
 module RSpec    
   module Generator
     class << self  
-      attr_accessor :generator, :test_method_name
+      attr_accessor :generator, :test_method_name, :remove_temp_dir
 
       def remove_rails_dir!
         FileUtils.rm_rf ::TmpRails.root
@@ -36,17 +36,17 @@ module RSpec
           config.root_dir = options == :custom ? TmpRails.root_dir(File.dirname(path) + '/../tmp', :custom) : TmpRails.root_dir(path)
         end
 
-        ::RSpec::Generators::TestCase.destination ::Rails.root      
-        ::Rails::Generators.configure! 
-        
         ::RSpec.configure do |config|
           config.after(:suite) do
-            ::RSpec::Generator.remove_rails_dir!
+            ::RSpec::Generator.remove_rails_dir! if remove_temp_dir
           end
         end        
+
+        ::RSpec::Generators::TestCase.destination ::Rails.root      
+        ::Rails::Generators.configure!         
       end
 
-      def run_generator *args, &block
+      def run_generator *args, &block 
         generator.run_generator *args
         if block
           block.arity < 1 ? generator.instance_eval(&block) : block.call(generator, self)  

data/lib/rspec_for_generators/matchers/content/have_block.rb

@@ -5,13 +5,14 @@ module RSpec::RubyContentMatchers
     def initialize(name, options={})
       @name = name
       @args = options[:args]
-      @block_args = options[:block_args]      
+      @block_args = options[:block_args]
     end
 
     def matches?(content)            
-      match_res = match(content)
-      if block_given? && $1
-        ruby_content = $1.strip.extend(RSpec::RubyContent::Helpers)
+      match_res = (content =~ /#{name}\s+#{args_expr}do\s+#{block_args_expr}(.*?)end/m)
+      block_content = $1 || $3
+      if block_given? && block_content
+        ruby_content = block_content.strip.extend(RSpec::RubyContent::Helpers)
         yield ruby_content 
       else
         match_res
@@ -28,16 +29,12 @@ module RSpec::RubyContentMatchers
     
     protected
 
-    def match content
-      content =~ /#{name}\s+#{args_expr}do\s+#{block_args_expr}(.*?)end/m
-    end
-
     def args_expr
-      args ? "\(?\s*#{args}\s*\)?\s+" : ''
+      args ? '(\()?\s*' + args + '\s*(\))?\s+' : ''
     end      
 
     def block_args_expr
-      args ? "\|\s*#{block_args}\s*\|" : ''
+      block_args ? '\|\s*' + block_args + '\s*\|' : ''
     end    
   end
   

data/lib/rspec_for_generators/matchers/content/have_call.rb

@@ -19,19 +19,19 @@ module RSpec::RubyContentMatchers
     end          
   
     def failure_message
-      return "Expected there to be the call to #{method} with args #{args}, but there wasn't" if args
-      "Expected there to be the call to #{method}, but there wasn't"
+      return "Expected there to be a call to #{method} with args #{args}, but there wasn't" if args
+      "Expected there to be a call to #{method}, but there wasn't"
     end 
     
     def negative_failure_message                                      
-      return "Did not expect there to be the call to #{method} with args #{args}, but there was" if args
-      "Did not expect there to be the call to #{method}, but there was"
+      return "Did not expect there to be a call to #{method} with args #{args}, but there was" if args
+      "Did not expect there to be a call to #{method}, but there was"
     end
              
     protected
     
     def args_expr
-      args ? "\(?\s*#{args}\s*\)?\s+" : ''
+      args ? "(\()?\s*#{args}\s*(\))?" : ''
     end      
                
   end

data/lib/rspec_for_generators/matchers/content/have_calls.rb

@@ -0,0 +1,40 @@
+module RSpec::RubyContentMatchers
+  class HaveCalls
+    attr_reader :calls
+    attr_accessor :method, :args    
+
+    def initialize(calls)
+      @calls = calls
+    end
+
+    def matches?(content)
+      calls.each_pair do |method, args|
+        @method = method
+        @args = args
+        return false if (content =~ /#{method}\s+#{args_expr}/m) == nil
+      end
+      true
+    end          
+  
+    def failure_message
+      return "Expected there to be a call to #{method} with args #{args}, but there wasn't" if args
+      "Expected there to be a call to #{method}, but there wasn't"
+    end 
+    
+    def negative_failure_message                                      
+      return "Did not expect there to be a call to #{method} with args #{args}, but there was" if args
+      "Did not expect there to be a call to #{method}, but there was"
+    end
+             
+    protected
+    
+    def args_expr
+      args ? "(\()?\s*#{args}\s*(\))?" : ''
+    end      
+               
+  end
+  
+  def have_calls(calls)
+    HaveCalls.new(calls)
+  end  
+end

data/lib/rspec_for_generators/matchers/content/have_method.rb

@@ -7,29 +7,36 @@
 #
 module RSpec::RubyContentMatchers
   class HaveMethod
-    attr_reader :method
+    attr_reader :method, :type
 
-    def initialize(method, type)
-      @type = type
+    def initialize(method, type=nil)
       @method = method.to_s
+      @type = type      
     end
 
-    def matches?(content)      
-      case @type
+    def matches?(content)  
+      match_res = case type
       when :class
-        content =~ /def\s+self.#{method}\s*(\(.+\))?(.*?)/m
+        content =~ /def\s+self.#{method}\s*(\(.+\))?(.*?)(def|end)/m
       else
-        content =~ /def\s+#{method}\s*(\(.+\))?(.*?)/m
-      end
+        content =~ /def\s+#{method}\s*(\(.+\))?(.*?)(def|end)/m
+      end   
+      if block_given? && $2
+        ruby_content = $2.strip.extend(RSpec::RubyContent::Helpers)
+        ruby_content << "\nend" if !(ruby_content =~ /\nend$/)
+        yield ruby_content 
+      else
+        match_res
+      end      
     end          
   
     def failure_message
-      return "Expected there to be the class method #{method}, but there wasn't" if @type == :class
+      return "Expected there to be the class method #{method}, but there wasn't" if type == :class
       "Expected there to be the method #{method}, but there wasn't"        
     end 
     
     def negative_failure_message                                      
-      return "Did not expect there to be the method #{method}, but there was" if @type == :class
+      return "Did not expect there to be the method #{method}, but there was" if type == :class
       "Did not expect there to be the method #{method}, but there was"
     end
                

data/lib/rspec_for_generators/matchers/file/generate_file.rb

@@ -66,6 +66,25 @@ module RSpec::FileMatchers
   def generate_file(relative, type = nil)
     GenerateFile.new(relative, type)
   end
-  alias_method :generate_directory, :generate_file
+
+  def generate_model(relative)
+    GenerateFile.new(relative, :model)
+  end
+
+  def generate_controller(relative)
+    GenerateFile.new(relative, :controller)
+  end
+
+  def generate_helper(relative)
+    GenerateFile.new(relative, :helper)
+  end
+
+  def generate_view(relative)
+    GenerateFile.new(relative, :view)
+  end
+  
+  def generate_observer(relative)
+    GenerateFile.new(relative, :observer)
+  end  
 end
 

data/lib/rspec_for_generators/matchers/file/generate_migration.rb

@@ -8,42 +8,50 @@
 module RSpec
   module FileMatchers
     class GenerateMigration
+      include RSpec::Rails::Migration
 
-      def initialize(relative)
-        @relative = relative      
+      attr_reader :name
+
+      def initialize(name)
+        @name = name      
       end
 
-      def matches?(generator)                      
-        ex = migration_file_name(relative, generator)
-        if block && ex
-          read = File.read(@expected)
+      def matches?(generator)
+        expected = migration_file_name(name, generator)
+        if block_given? && expected
+          read = File.read(expected)
           ruby_content = read.extend(RSpec::RubyContent::Helpers)
           yield ruby_content
         else
-          ex
+          expected
         end
       end          
     
       def failure_message
-        "Expected migration #{relative} to have been generated, but it was not"
+        "Expected migration #{name} to have been generated, but it was not"
       end
 
       def negative_failure_message
-        "Did not expect migration #{relative} to have been generated, but it was"
+        "Did not expect migration #{name} to have been generated, but it was"
       end
       
       protected
       
       def migration_file_name(relative, generator) #:nodoc:
-        absolute = File.expand_path(relative, generator.class.destination_root)
-        dirname, file_name = File.dirname(absolute), File.basename(absolute).sub(/\.rb$/, '')
-        Dir.glob("#{dirname}/[0-9]*_*.rb").grep(/\d+_#{file_name}.rb$/).first
+        dirname = migration_dir
+        file_name = relative.sub(/\.rb$/, '')
+        migrations = Dir.glob("#{dirname}/[0-9]*_*.rb")
+        if !migrations.empty? 
+          migrations.grep(/\d+_#{file_name}\.rb$/).first 
+        else 
+          false
+        end
       end
       
     end
   
-    def generate_migration(relative)
-      GenerateMigration.new(relative)
+    def generate_migration(name)
+      GenerateMigration.new(name)
     end
 
   end   

data/lib/rspec_for_generators/matchers/helpers/migration.rb

@@ -11,92 +11,79 @@ end
 
 module RSpec::RubyContent
   module Helpers
-    def check_up(&block)
-      self.should have_method('up', :class) do |content|
-        yield content if block          
-      end            
+    def check_up &block
+      self.should have_up, &block
     end
     alias_method :up, :check_up      
 
-    def check_down(&block)
-      self.should have_method('down', :class) do |content|
-        yield content if block          
-      end            
+    def check_down &block
+      self.should have_down, &block 
     end
     alias_method :down, :check_down      
 
-    def check_create_table(name, &block)
-      self.should match /create_table\s+:#{name}\s+(.*)end/m
-      if block_given?
-        ruby_content = $2.strip.extend(RSpec::RubyContent::Helpers)
-        yield ruby_content
-      end
+    def check_create_table name, &block
+      self.should create_table name, &block
     end
     alias_method :creates_table, :check_create_table      
 
-    def check_change_table(name, &block)
-      self.should match /change_table\s+:#{name}\s+(.*)end/m
-      if block_given?
-        ruby_content = $2.strip.extend(RSpec::RubyContent::Helpers)
-        yield ruby_content
-      end
+    def check_change_table name, &block
+      self.should change_table name, &block
     end
     alias_method :changes_table, :check_change_table      
 
     def check_drop_table name
-      self.should match /drop_table\s+:#{name}/
+      self.should drop_table name, &block
     end
     alias_method :drops_table, :check_drop_table
 
     def check_rename_table name
-      self.should match /rename_table\s+:#{name}/
+      self.should rename_table name, &block
     end
     alias_method :renames_table, :check_rename_table
     
     def check_remove_column name
-      self.should match /t.remove\s+:#{name}/
+      self.should remove_colum name, &block
     end
     alias_method :removes_column, :check_remove_column
 
     def check_add_column name, type='string'
-      self.should match /t.#{type}\s+:#{name}/
+      self.should add_column name, type, &block
     end
     alias_method :adds_column, :check_add_column
 
     def check_change_column name, type='string'
-      self.should match /t.change\s+:#{name}\s*,\s*:#{type}/
+      self.should change_column name, type, &block
     end
     alias_method :changes_column, :check_change_column
 
     def check_add_tbl_column tbl_name, name, type='string'
-      self.should match /add_column\s+:#{tbl_name}\s*,\s*:#{name},#{type}/
+      self.should add_tbl_column tbl_name, name, type
     end
     alias_method :adds_tbl_column, :check_add_tbl_column      
 
     def check_change_tbl_column tbl_name, name, type='string'
-      self.should match /change_column\s+:#{tbl_name}\s*,\s*:#{name}\s*,\s*#{type}/
+      self.should change_tbl_column tbl_name, name, type
     end
     alias_method :changes_tbl_column, :check_change_tbl_column      
 
     def check_rename_tbl_column tbl_name, new_name
-      self.should match /rename_column\s+:#{tbl_name}\s*,\s*:#{new_name}/
+      self.should rename_tbl_column tbl_name, new_name
     end
     alias_method :renames_tbl_column, :check_rename_tbl_column      
 
     def check_remove_tbl_column tbl_name, name
-      self.should match /remove_column\s+:#{tbl_name}\s*,\s*:#{name}/
+      self.should remove_tbl_column tbl_name, name
     end
     alias_method :removes_tbl_column, :check_remove_tbl_column      
 
     def check_add_tbl_index tbl_name, name
-      self.should match /add_index\s+:#{tbl_name}\s*,\s*:#{name}/
+      self.should add_tbl_index tbl_name, name
     end
     alias_method :adds_tbl_index, :check_add_tbl_index      
 
     def check_remove_tbl_index tbl_name, name
-      self.should match /remove_index\s+:#{tbl_name}\s*,\s*:#{name}/
+      self.should remove_tbl_index tbl_name, name
     end
     alias_method :removes_tbl_index, :check_remove_tbl_index
-
   end
 end

data/lib/rspec_for_generators/matchers/migration/have_column.rb

@@ -6,8 +6,18 @@ module RSpec::RubyContentMatchers
   def have_add_column(name, type='string')
     HaveCall.new("t.#{type}", ":#{name}")
   end
+  alias_method :have_column, :have_add_column
+
+  def have_columns(columns = {})
+    raise ArgumentError, "Columns must be passed as a :name => :type Hash" if !columns.kind_of? Hash
+    HaveCalls.new columns
+  end
 
   def have_change_column(name, type='string')
     HaveCall.new("t.change", ":#{name}\s*,\s*:#{type}")
   end
+
+  def have_timestamps
+    HaveCall.new("t.timestamps")
+  end
 end

data/lib/rspec_for_generators/matchers/migration/have_migration.rb

@@ -1,5 +1,31 @@
-module RSpec::FileMatchers
-  def have_migration(name)
-    GenerateFile.new(name, :migration)
+module RSpec::RubyContentMatchers
+  class HaveMigration
+    attr_reader :klass
+
+    def initialize(klass)
+      @klass = klass.to_s.camelize      
+    end
+
+    def matches?(content) 
+      match_res = (content =~ /class\s+#{klass}\s+<\s+ActiveRecord::Migration(.*)end$/m)
+      if block_given? && $1
+        ruby_content = $1.strip.extend(RSpec::RubyContent::Helpers)
+        yield ruby_content 
+      else
+        match_res
+      end
+    end          
+
+    def failure_message
+      "Expected there to be the migration class #{klass}"
+    end 
+
+    def negative_failure_message
+      "Did no expected there to be the migration class #{klass}"
+    end
   end
+
+  def have_migration(klass)
+    HaveMigration.new(klass)
+  end    
 end

data/lib/rspec_for_generators/matchers/migration/have_up_down.rb

@@ -1,10 +1,10 @@
 module RSpec::RubyContentMatchers  
-  def have_up(method, type = nil)
-    HaveMethod.new up, :class
+  def have_up &block
+    HaveMethod.new 'up', :class, &block
   end  
 
-  def have_down(method, type = nil)
-    HaveMethod.new up, :class
+  def have_down &block
+    HaveMethod.new 'down', :class, &block
   end  
 end
 

data/lib/rspec_for_generators/rails_helpers/rails_app.rb

@@ -1,52 +1,118 @@
 module RSpec::Rails
   module App 
-    def self.debug!
-      self.extend(Debug)        
-    end      
+    module Dirs   
+      def app_dir
+        File.join(::Rails.root, 'app')
+      end
+
+      def config_dir
+        File.join(::Rails.root, 'config')
+      end  
+
+      def db_dir
+        File.join(::Rails.root, 'db')
+      end
+
+      def locale_dir
+        File.join(::Rails.root, 'public')
+      end
+
+      def model_dir
+        File.join(app_dir, 'models')
+      end
+
+      def controller_dir
+        File.join(app_dir, 'controllers')
+      end
+
+      def migration_dir
+        File.join(db_dir, 'migrations')
+      end
+
+      def helper_dir
+        File.join(app_dir, 'helpers')
+      end  
+
+      def view_dir
+        File.join(app_dir, 'views')
+      end
+
+      def initializer_dir
+        File.join(config_dir, 'initializers')
+      end  
+
+      def migration_dir
+        File.join(db_dir, 'migrations')
+      end
+
+      def locale_dir
+        File.join(config_dir, 'locales')
+      end
+
+      def stylesheet_dir
+        File.join(public_dir, 'stylesheets')
+      end
+
+      def javascript_dir
+        File.join(public_dir, 'javascripts')
+      end      
+    end
     
-    module Debug
-      def rails_files
+    module Files 
+      def all
         FileList["#{::Rails.root}/**/*.rb"]
       end  
 
-      def rails_app_files
+      def app_files
         FileList["#{::Rails.root}/app/**/*.rb"]
       end  
 
-      def rails_model_files
+      def model_files
         FileList["#{::Rails.root}/app/models/**/*.rb"]
       end  
 
-      def rails_controller_files
+      def controller_files
         FileList["#{::Rails.root}/app/controllers/**/*.rb"]
       end  
 
-      def rails_helper_files
+      def helper_files
         FileList["#{::Rails.root}/app/helpers/**/*.rb"]
       end  
 
-      def rails_view_files
-        FileList["#{::Rails.root}/app/views/**/*.yml"]
+      def view_files
+        FileList["#{::Rails.root}/app/views/**/*"]
+      end
+
+      def view_files_html
+        FileList["#{::Rails.root}/app/views/**/*.html*"]
       end
 
-      def rails_initializer_files
+      def view_files_haml
+        FileList["#{::Rails.root}/app/views/**/*.haml*"]
+      end
+
+      def initializer_files
         FileList["#{::Rails.root}/config/initializers/**/*.rb"]
       end  
 
-      def rails_migration_files
-        FileList["#{::Rails.root}/db/migration/**/*.rb"]
+      def migration_files
+        FileList["#{migration_dir}/**/*.rb"]
       end
 
-      def rails_locale_files
+      def locale_files
         FileList["#{::Rails.root}/config/locales/**/*.yml"]
       end
 
-      def rails_javascript_files
-        FileList["#{::Rails.root}/public/javascripts/**/*.yml"]
+      def javascript_files
+        FileList["#{javascript_dir}/**/*.js"]
+      end
+    
+      def css_files
+        FileList["#{stylesheet_dir}/**/*.css"]
       end
 
-      def rails_stylesheet_files
-        FileList["#{::Rails.root}/public/stylesheets/**/*.yml"]
+      def sass_files
+        FileList["#{stylesheet_dir}/**/*.css"]
       end
     end
   end

data/lib/rspec_for_generators/rails_helpers/rails_migration.rb

@@ -0,0 +1,36 @@
+module RSpec::Rails
+  module Migration    
+    include RSpec::Rails::App::Dirs
+    
+    def create_migration number, name, &block      
+      file = migration_file_name(number, name)
+      unless File.exist?(file)    
+        FileUtils.mkdir_p File.dirname(file)
+        File.open(file, 'w') do |f|  
+          f.puts file_content(name)
+          yield f if block_given?
+        end
+      end
+    end  
+
+    def remove_migration name
+      migrations = Dir.glob("#{migration_dir}/[0-9]*_*.rb")
+      migration_file = if !migrations.empty? 
+        migrations.grep(/\d+_#{name}\.rb$/).first 
+      else 
+        false
+      end
+      FileUtils.rm_f(migration_file) if migration_file
+    end
+
+    def remove_migrations *names
+      names.each do |name| 
+        remove_migration name
+      end
+    end      
+    
+    def migration_file_name number, name
+      File.join(migration_dir, "#{number}_#{name}.rb")
+    end        
+  end
+end

data/lib/rspec_for_generators/rails_spec_helper.rb

@@ -1,4 +1,4 @@
-require 'rspec_for_generators/rails_helpers/all'
+require_all File.dirname(__FILE__) + '/rails_helpers'
 
 module TmpRails
   class << self    

data/spec/rspec_for_generators/migration_generator_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require_generator :migration
+
+describe 'migration_generator' do
+  include RSpec::Rails::Orm::ActiveRecord
+  include RSpec::Rails::Migration
+  
+  before :each do              
+    RSpec::Generator.setup_generator 'migration_generator' do
+      tests MigrationGenerator
+    end    
+  end
+
+  after :each do
+  end
+    
+  it "should generate create_user migration" do
+    RSpec::Generator.with_generator do |g|
+      name = 'create_users'
+      remove_migration 'create_users'
+      g.run_generator [name]
+      g.should generate_migration name do |content|
+        content.should have_migration name do |klass|
+          klass.should have_up do |up|
+            up.should have_create_table :users do |user_tbl|
+              user_tbl.should have_columns :name => :string, :age => :string
+            end
+          end
+
+          klass.should have_down do |up|
+            up.should have_drop_table :users
+          end
+        end
+      end
+    end
+  end
+end
+
+
+

data/spec/spec_helper.rb

@@ -2,5 +2,10 @@ require 'rspec'
 require 'rspec/autorun'     
 require 'rspec_for_generators'
 
+RSpec::Generator.remove_temp_dir = true
 RSpec::Generator.configure_root_dir __FILE__
 
+class RSpec::Core::ExampleGroup
+  
+end
+

data/wiki/content_matchers.textile

@@ -0,0 +1,72 @@
+The RSpec 2 generator matchers are used to match on file content that are the result of running the generator under test. 
+These matchers can be used to test if the resulting file contains content/ruby code as expected (or specified).  
+
+* have_class name, &block
+* have_module name, &block
+* have_method name, &block, type:Symbol (:class)
+* include_module name
+* inherit_from name, &block
+* have_call name, [args]
+* have_block name, [options] 
+
+h3. Example use of matchers
+
+<pre>
+g.should generate_model name do |content|
+  content.should have_class name do |klass_content|
+    klass_content.should include_module 'Canable::Ables'
+  end
+end
+</pre>
+
+h4. have_class
+
+<pre>have_class MyClass do |class_content|
+  class_content.should ...
+end
+</pre>
+
+h4. have_module
+
+<pre>have_module MyModule do |module_content|
+  module_content.should ...
+end
+</pre>
+
+h4. have_method
+
+<pre>have_method :song do |song|
+  song.should ...
+end
+</pre>
+
+h4. have_method
+
+<pre>have_method :song do |song|
+  song.should ...
+end
+</pre>
+
+h4. include_module
+
+<pre>include_module 'UserRoles'</pre>
+
+h4. inherit_from
+
+<pre>inherit_from 'ActiveRecord::Base' do |klass|
+  klass.should ...
+end
+</pre>
+
+h4. have_call
+
+<pre>have_call 'move', :args => ':north'</pre>
+
+Note: Currently not tested. Any issues?
+
+h4. have_block
+
+<pre>have_block 'move', :args => ':north', :block_args => 'place'</pre>
+
+Note: Currently not tested. Any issues?
+

data/wiki/file_matchers.textile

@@ -0,0 +1,17 @@
+* generate_file name, type:Symbol, &block
+* generate_dir name, type:Symbol, &block
+
+*generate_file* can take any of the symbols below as a type argument and perform matchings on 
+that file in the appropriate location for that type of file in the Rails 3 app.
+
+* :model, :controller, :view, :helper, :observer, :migration
+* :javascript, :stylesheet, :initializer, :locale
+
+The following are some convenience matchers that acts as wrappers on generate_file
+
+* generate_model name, &block
+* generate_controller name, &block
+* generate_helper name, &block
+* generate_view name, &block
+* generate_observer name, &block
+* generate_migration name, &block

data/wiki/{rails_view_helpers.textile → migration_matchers.textile}

@@ -1,74 +1,3 @@
-The Rails 3 spec helpers can be used to setup the temporary Rails 3 app used for the specs. 
-Use the `create` methods to setup an application layout of expected files expected/required by the generator to test it.
-
-The `remove` methods can be used to cleanup before or after a test run, f.ex using the RSpec `before(:each)` and `after(:each)` blocks.  
-
-h3. View helpers
-
-* create_view name, content
-* create_view name, &block
-* remove_view name
-* remove_views *names
-
-h3. Model helpers
-
-* create_model name, content
-* create_model name, &block
-* remove_model name
-* remove_models *names
-
-h3. Controller helpers
-
-* create_controller name, content
-* create_controller name, &block
-* remove_controller name
-* remove_controller *names
-
-h3. Mailer helpers
-
-* create_mailer name, content
-* create_mailer name, &block
-* remove_mailer name
-* remove_mailers *names
-
-h3. Helper helpers
-
-* create_helper name, content
-* create_helper name, &block
-* remove_helper name
-* remove_helpers *names
-
---
-
-The RSpec 2 generator matchers are used to match on file content that are the result of running the generator under test. 
-These matchers can be used to test if the resulting file contains content/ruby code as expected (or specified).  
-
-* generate_file name, type:Symbol, &block
-* generate_dir name, type:Symbol, &block
-* generate_migration name, &block
-
-* have_class name, &block
-* have_module name, &block
-* have_method name, &block, type:Symbol (:class)
-* include_module name, &block
-* inherit_from name, &block
-
-*generate_file* can take any of the symbols below as a type argument and perform matchings on 
-that file in the appropriate location in the Rails 3 app.
-
-* :model, :controller, :view, :helper, :observer, :migration
-* :javascript, :stylesheet, :initializer, :locale
-
-h3. Example use of matchers
-
-<pre>
-g.should generate_file name, :model do |content|
-  content.should have_class name do |klass|
-    klass.should include_module 'Canable::Ables'
-  end
-end
-</pre>
-
 h2. Migration file
 
 There are a bunch of ways to match the layout of a generated migration file as the following demonstrates.
@@ -89,7 +18,7 @@ g.should have_migration(:create_users) do |content|
 end 
 </pre>
 
-Migration file matcher
+Migration class matcher
 
 * have_migration name, &block
 

data/wiki/rails_helpers.textile

@@ -0,0 +1,42 @@
+The Rails 3 spec helpers can be used to setup the temporary Rails 3 app used for the specs. 
+Use the `create` methods to setup an application layout of expected files expected/required by the generator to test it.
+
+The `remove` methods can be used to cleanup before or after a test run, f.ex using the RSpec `before(:each)` and `after(:each)` blocks.  
+
+h3. View helpers
+
+* create_view name, content
+* create_view name, &block
+* remove_view name
+* remove_views *names
+
+h3. Model helpers
+
+* create_model name, content
+* create_model name, &block
+* remove_model name
+* remove_models *names
+
+h3. Controller helpers
+
+* create_controller name, content
+* create_controller name, &block
+* remove_controller name
+* remove_controller *names
+
+h3. Mailer helpers
+
+* create_mailer name, content
+* create_mailer name, &block
+* remove_mailer name
+* remove_mailers *names
+
+h3. Helper helpers
+
+* create_helper name, content
+* create_helper name, &block
+* remove_helper name
+* remove_helpers *names
+
+
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 +02:00
+date: 2010-08-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,18 +123,22 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rspec
 - LICENSE
 - README.markdown
 - Rakefile
 - VERSION
 - generator-spec.gemspec
 - lib/generators/demo/demo_generator.rb
+- lib/generators/migration/migration_generator.rb
+- lib/generators/migration/templates/create_users.erb
 - lib/rspec_for_generators.rb
 - lib/rspec_for_generators/fixtures/routes.rb
 - lib/rspec_for_generators/generator_spec_helper.rb
 - lib/rspec_for_generators/main.rb
 - lib/rspec_for_generators/matchers/content/have_block.rb
 - lib/rspec_for_generators/matchers/content/have_call.rb
+- lib/rspec_for_generators/matchers/content/have_calls.rb
 - lib/rspec_for_generators/matchers/content/have_class.rb
 - lib/rspec_for_generators/matchers/content/have_method.rb
 - lib/rspec_for_generators/matchers/content/have_module.rb
@@ -152,22 +156,28 @@ files:
 - lib/rspec_for_generators/matchers/migration/have_table.rb
 - lib/rspec_for_generators/matchers/migration/have_tbl_column.rb
 - lib/rspec_for_generators/matchers/migration/have_up_down.rb
-- lib/rspec_for_generators/rails_helpers/all.rb
 - lib/rspec_for_generators/rails_helpers/rails_app.rb
 - lib/rspec_for_generators/rails_helpers/rails_controller.rb
 - lib/rspec_for_generators/rails_helpers/rails_helper.rb
 - lib/rspec_for_generators/rails_helpers/rails_mailer.rb
+- lib/rspec_for_generators/rails_helpers/rails_migration.rb
 - lib/rspec_for_generators/rails_helpers/rails_model.rb
 - lib/rspec_for_generators/rails_helpers/rails_orm.rb
 - lib/rspec_for_generators/rails_helpers/rails_view.rb
 - lib/rspec_for_generators/rails_spec_helper.rb
 - lib/rspec_for_generators/rspec_test_case.rb
 - rspec_for_generators.gemspec
-- spec/rspec_for_generators/rspec_for_generators_spec.rb
-- spec/spec.opts
+- spec/rspec_for_generators/controller_generator_spec.rb
+- spec/rspec_for_generators/helper_generator_spec.rb
+- spec/rspec_for_generators/migration_generator_spec.rb
+- spec/rspec_for_generators/model_generator_spec.rb
+- spec/rspec_for_generators/view_generator_spec.rb
 - spec/spec_helper.rb
 - wiki/Custom Rails 3 Generators.textile
-- wiki/rails_view_helpers.textile
+- wiki/content_matchers.textile
+- wiki/file_matchers.textile
+- wiki/migration_matchers.textile
+- wiki/rails_helpers.textile
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/rspec_for_generators
 licenses: []
@@ -201,5 +211,9 @@ signing_key:
 specification_version: 3
 summary: RSpec 2 library for writing generator specs
 test_files: 
-- spec/rspec_for_generators/rspec_for_generators_spec.rb
+- spec/rspec_for_generators/controller_generator_spec.rb
+- spec/rspec_for_generators/helper_generator_spec.rb
+- spec/rspec_for_generators/migration_generator_spec.rb
+- spec/rspec_for_generators/model_generator_spec.rb
+- spec/rspec_for_generators/view_generator_spec.rb
 - spec/spec_helper.rb

data/lib/rspec_for_generators/rails_helpers/all.rb

@@ -1,6 +0,0 @@
-require 'rspec_for_generators/rails_helpers/rails_app'
-require 'rspec_for_generators/rails_helpers/rails_orm'
-require 'rspec_for_generators/rails_helpers/rails_controller'
-require 'rspec_for_generators/rails_helpers/rails_helper'
-require 'rspec_for_generators/rails_helpers/rails_view'
-require 'rspec_for_generators/rails_helpers/rails_mailer'

data/spec/spec.opts

@@ -1 +0,0 @@
---color