rspec_rails3_gen 0.2.0 → 0.2.2

data/bin/rspec_controller

@@ -16,4 +16,4 @@ Signal.trap("INT") { puts; exit }
 require 'rails/generators'
 require 'generators/rspec/controller/controller_generator'
 
-RSpec::Generators::ControllerGenerator.start
+Rspec::Generators::ControllerGenerator.start

data/bin/rspec_integration_spec

@@ -18,4 +18,4 @@ require 'rails/version'
 require 'rails/generators'
 require 'generators/rspec/integration_spec/integration_spec_generator'
 
-RSpec::Generators::IntegrationSpecGenerator.start
+Rspec::Generators::IntegrationSpecGenerator.start

data/bin/rspec_model

@@ -16,4 +16,4 @@ Signal.trap("INT") { puts; exit }
 require 'rails/generators'
 require 'generators/rspec/model/model_generator'
 
-RSpec::Generators::ModelGenerator.start
+Rspec::Generators::ModelGenerator.start

data/bin/rspec_scaffold

@@ -18,4 +18,4 @@ require 'rails/version'
 require 'rails/generators'
 require 'generators/rspec/scaffold/scaffold_generator'
 
-RSpec::Generators::ScaffoldGenerator.start
+Rspec::Generators::ScaffoldGenerator.start

data/bin/rspec_skeleton

@@ -16,4 +16,4 @@ Signal.trap("INT") { puts; exit }
 require 'rails/generators'
 require 'generators/rspec/skeleton/skeleton_generator'
 
-RSpec::Generators::SkeletonGenerator.start
+Rspec::Generators::SkeletonGenerator.start

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

@@ -5,7 +5,7 @@ require 'generators/rspec_rails3_gen_base'
 # see 'hook_for'
 # ==================
 
-module RSpec
+module Rspec
   module Generators
     class ControllerGenerator < NamedBase
 
@@ -78,7 +78,7 @@ module RSpec
           
         # Controller spec, class, and helper.
         template 'controller_spec.rb', File.join('spec/controllers', class_path, "#{file_name}_controller_spec.rb")        
-        template 'helper_spec.rb.t', File.join('spec/helpers', class_path, "#{file_name}_helper_spec.rb")
+        template 'helper_spec.erb', File.join('spec/helpers', class_path, "#{file_name}_helper_spec.rb")
         
         # Spec and view template for each action.
         html_actions.each do |action|
@@ -87,6 +87,9 @@ module RSpec
           puts target_file
           template 'view_spec.rb', target_file
         end        
+        
+        actions_str = actions.join(' ')
+        generate "controller #{file_name} #{actions_str}"        
       end
 
       # hook into controller and helper generators to have them execute using same arguments!

data/lib/generators/rspec/default_values.rb

@@ -16,6 +16,10 @@ module Rails
         end
       end
 
+      def to_s
+        "#{name}:#{type}"
+      end
+
       def name_or_reference
         if ::Rails::VERSION::STRING >= '2.2'
           reference? ? :"#{name}_id" : name

data/lib/generators/rspec/integration_spec/integration_spec_generator.rb

@@ -1,7 +1,7 @@
 # Author: Kristian Mandrup
 # email: kmandrup@gmail.com
 require 'generators/rspec_rails3_gen_base'
-module RSpec
+module Rspec
   module Generators
     class IntegrationSpecGenerator < NamedBase
   

data/lib/generators/rspec/model/model_generator.rb

@@ -2,7 +2,7 @@ require 'rails/version'
 require File.dirname(__FILE__) + '/../default_values'
 require 'generators/rspec_rails3_gen_base'
 
-module RSpec
+module Rspec
   module Generators
     class ModelGenerator < NamedBase
       # argument :model_name, :type => :string, :required => true, :banner => 'ModelName'
@@ -32,7 +32,14 @@ module RSpec
         # use hook to execute model generator
         
         # create spec for model
-        template 'model_spec.rb',     "spec/models/#{file_name}_spec.rb"
+        template 'model_spec.rb',     "spec/models/#{file_name}_spec.rb"      
+        attribs = attributes.map{|a| a.to_s}.join(' ')
+        # puts "script/generate model #{file_name} #{attribs}"
+        no_fixture = options[:skip_fixture] ? '--skip-fixture' : ''
+        skip_migration = options[:skip_migration] ? '--skip-migration' : ''
+        flags = [no_fixture, skip_migration].join(' ')
+
+        generate "model #{file_name} #{attribs} #{flags}"
       
         # unless options[:skip_fixture]
         #   template 'fixtures.yml',  File.join('spec/fixtures', "#{table_name}.yml")
@@ -46,7 +53,9 @@ module RSpec
       end  
       
       # hook into generators for model, migration and fixture and have them execute with same arguments
-      hook_for :model, :migration, :fixture      
+      hook_for :model, :in => :rails
+      hook_for :migration, :in => :rails
+      hook_for :fixture, :in => :rails      
     end
     
   end

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

@@ -8,13 +8,20 @@ require 'generators/rspec_rails3_gen_base'
 # TODO: Make hooks for other generators work!!!
 # see 'hook_for'
 # ==================
-module RSpec
+module Rspec
   module Generators
     class ScaffoldGenerator < NamedBase
 
       class_option :default_file_extension, :type => :string, :aliases => "-fe", :default => 'html.erb',
                               :desc => "Default file extension for views"
 
+      class_option :skip_fixture, :type => :boolean, :aliases => "-F", :default => false,
+                              :desc => "Skip Fixture creation"
+
+      class_option :skip_migration, :type => :boolean, :aliases => "-M", :default => false,
+                              :desc => "Skip Migration creation"
+
+
       no_tasks do 
         attr_accessor :model_name
         attr_accessor :model_attributes
@@ -68,44 +75,56 @@ module RSpec
       def create_files      
         # Controller, helper, views, and spec directories.
     
-        empty_directory 'spec/controllers'
-        empty_directory 'spec/routing'
-        empty_directory 'spec/models'
-        empty_directory 'spec/helpers'
-        empty_directory 'spec/fixtures'
-        empty_directory 'spec/views'
-        empty_directory 'spec/integration'          
+        # empty_directory 'spec/controllers'
+        # empty_directory 'spec/routing'
+        # empty_directory 'spec/models'
+        # empty_directory 'spec/helpers'
+        # empty_directory 'spec/fixtures'
+        # empty_directory 'spec/views'
+        # empty_directory 'spec/integration'          
   
         # Controller spec, class, and helper.
-        template 'routing_spec.rb',
-          File.join('spec/routing', controller_class_path, "#{controller_file_name}_routing_spec.rb")
-
-        template 'controller_spec.rb',
-          File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
-
-
-        template 'helper_spec.rb',
-          File.join('spec/helpers', class_path, "#{controller_file_name}_helper_spec.rb")
-
-        # View specs
-        template "edit_erb_spec.rb",
-          File.join('spec/views', controller_class_path, controller_file_name, "edit.#{default_file_extension}_spec.rb")
-        template "index_erb_spec.rb",
-          File.join('spec/views', controller_class_path, controller_file_name, "index.#{default_file_extension}_spec.rb")
-        template "new_erb_spec.rb",
-          File.join('spec/views', controller_class_path, controller_file_name, "new.#{default_file_extension}_spec.rb")
-        template "show_erb_spec.rb",
-          File.join('spec/views', controller_class_path, controller_file_name, "show.#{default_file_extension}_spec.rb")
-
-        # route_resources controller_file_name
 
+        # template 'controller_spec.rb',
+        #   File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
+        # 
+        # 
+        # template 'helper_spec.erb',
+        #   File.join('spec/helpers', class_path, "#{controller_file_name}_helper_spec.rb")
+        # 
+        # # View specs
+        # template "edit_erb_spec.rb",
+        #   File.join('spec/views', controller_class_path, controller_file_name, "edit.#{default_file_extension}_spec.rb")
+        # template "index_erb_spec.rb",
+        #   File.join('spec/views', controller_class_path, controller_file_name, "index.#{default_file_extension}_spec.rb")
+        # template "new_erb_spec.rb",
+        #   File.join('spec/views', controller_class_path, controller_file_name, "new.#{default_file_extension}_spec.rb")
+        # template "show_erb_spec.rb",
+        #   File.join('spec/views', controller_class_path, controller_file_name, "show.#{default_file_extension}_spec.rb")
+
+        no_fixture = options[:skip_fixture] ? '--skip-fixture' : ''
+        skip_migration = options[:skip_migration] ? '--skip-migration' : ''
+        flags = [no_fixture, skip_migration].join(' ')
+        
+        actions_str = controller_actions.join(' ')        
+        generate "rspec:controller #{controller_file_name} #{actions_str}"
+        
+        attribs = model_attributes.map{|a| a.to_s}.join(' ')        
+        generate "rspec:model #{controller_file_name} #{attribs} #{flags}"  
+        
+        empty_directory 'spec/routing'
+        template 'routing_spec.rb', File.join('spec/routing', controller_class_path, "#{controller_file_name}_routing_spec.rb")                      
       end
   
       # tries to find generator within rspec first, then in rails
       # use :in, fx :in => :rails to be more specific!
       
       # TODO: Make hooks work!!!
-      # hook_for :integration_spec, :model, :migration, :scaffold, :layout
+      # hook_for :integration_spec
+      # hook_for :model
+      # hook_for :migration
+      # hook_for :scaffold
+      # hook_for :layout
 
       no_tasks do
         

data/lib/generators/rspec/skeleton/skeleton_generator.rb

@@ -3,7 +3,7 @@
 
 require 'generators/rspec_rails3_gen_base'
 
-module RSpec
+module Rspec
   module Generators
     class SkeletonGenerator < Base
     

data/lib/generators/rspec_rails3_gen_base.rb

@@ -1,7 +1,7 @@
 require 'rails/generators/base'
 require 'rails/generators/named_base'
 
-module RSpec
+module Rspec
   module Generators
     class Base < Rails::Generators::Base #:nodoc:
       def self.source_root

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec_rails3_gen
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 +01:00
+date: 2010-02-06 00:00:00 +01:00
 default_executable: rspec_skeleton
 dependencies: 
 - !ruby/object:Gem::Dependency