generator-spec 0.4.8 → 0.5.0

data/lib/generator_spec/rails_helpers/rails_app.rb

@@ -1,5 +1,12 @@
 module RSpec::Rails
-  module App 
+  module App
+    def create_empty_tmp *args
+      args.flatten.each do |arg|
+        dir = send :"#{arg}_dir"
+        FileUtils.mkdir_p dir
+      end
+    end
+     
     def root_dir
       ::Rails.root
     end
@@ -85,7 +92,7 @@ module RSpec::Rails
     end  
 
     def mailer_files              
-      rails_app_files :mailers
+      rails_app_files :mailers, '**/*_mailer.rb'
     end  
 
     def helper_files

data/lib/generator_spec/rails_helpers/rails_controller.rb

@@ -1,36 +1,44 @@
 module RSpec::Rails
-  module Controller     
-    include RSpec::Rails::App
-        
-    def create_controller name, content=nil
-      file = controller_file_name(name)
-      unless File.exist?(file)    
-        FileUtils.mkdir_p File.dirname(file)
-        content ||= yield if block_given?          
-        File.open(file, 'w') do |f|  
-          f.puts controller_content(name, content)
-        end
-      end
-    end  
+  module Controller
+    include RSpec::Rails::BaseHelper
 
-    def controller_content name, content=nil
-      %Q{class #{name.to_s.camelize}Controller < ActionController::Base
-        #{content}
-      end}        
+    def controller_file_name name, options=nil  
+      artifact_path name, :controller
     end
 
+    # CREATE
+    def create_controller name, options={}, &block
+      create_artifact(name, set(options, :controller), &block)
+    end  
+
+    # UPDATE
+    def insert_into_controller(name, options={}, &block)
+      insert_content(name, set(options, :controller), &block)      
+    end              
+
+    # READ
+    def read_controller(name, options={}, &block)
+      read_artifact(name, set(options, :controller), &block)      
+    end              
+
+    # DELETE
     def remove_controller name
-      file = controller_file_name(name)
-      FileUtils.rm_f(file) if File.exist?(file)
+      remove_artifact name, :controller
     end
 
     def remove_controllers *names
-      names.each{|name| remove_controller name }
+      remove_artifacts :controller, *names
     end     
-    
-    def controller_file_name name
-      File.join(controller_dir, "#{name}_controller.rb")
-    end        
-    
+
+
+    def controller_marker name, options=nil
+      "#{name.to_s.camelize}Controller < ActionController::Base"
+    end
+
+    def new_controller_content name, content=nil, &block
+      new_artifact_content name, :controller, content, &block
+    end
+
+    aliases_for :controller
   end
 end

data/lib/generator_spec/rails_helpers/rails_helper.rb

@@ -1,38 +1,40 @@
 module RSpec::Rails
-  module Helper   
-    include RSpec::Rails::App
+  module Helper
+    include RSpec::Rails::BaseHelper
+
+    def helper_file_name name, options=nil
+      artifact_path name, :helper
+    end
         
-    def create_helper name, content=nil
-      file =  helper_file_name(name)
-      unless File.exist?(file)    
-        FileUtils.mkdir_p File.dirname(file)
-        content ||= yield if block_given?
-        File.open(file, 'w') do |f|  
-          f.puts helper_content(name, content)
-        end
-      end
+    def create_helper name, options={}, &block
+      create_artifact(name, set(options, :helper), &block)
     end  
 
-    def helper_content name, content=nil
-      %Q{class #{name.to_s.camelize}Helper
-  #{content}
-end}        
-    end
+    def insert_into_helper(name, options={}, &block)
+      insert_content(name, set(options, :helper), &block)      
+    end              
+    alias_method :update_helper, :insert_into_helper
+
+    def read_helper(name, options={}, &block)
+      read_artifact(name, set(options, :helper), &block)      
+    end              
 
     def remove_helper name
-      file = helper_file_name(name)
-      FileUtils.rm_f(file) if File.exist?(file)
+      remove_artifact name, :helper
     end
 
     def remove_helpers *names
-      names.each{|name| remove_helper name }
+      remove_artifacts :helper, *names
+    end    
+
+    def helper_marker name, options=nil
+      "#{name.to_s.camelize}Helper"
+    end
+
+    def new_helper_content name, content=nil, &block
+      new_artifact_content name, :helper, content, &block
     end
     
-    protected
-    
-    def helper_file_name name
-      File.join(helper_dir, "#{name}_helper.rb")
-    end        
-    
+    aliases_for :helper    
   end
 end

data/lib/generator_spec/rails_helpers/rails_mailer.rb

@@ -1,31 +1,39 @@
 module RSpec::Rails
-  module Mailer 
-    include RSpec::Rails::App    
-    
-    def create_mailer name, content=nil
-      file = mailer_file_name(name)
-      unless File.exist?(file)    
-        FileUtils.mkdir_p File.dirname(file)  
-        content ||= yield if block_given?
-        return if !content          
-        File.open(file, 'w') do |f|  
-          f.puts content
-        end
-      end
+  module Mailer
+    include RSpec::Rails::BaseHelper
+
+    def mailer_file_name name, options=nil
+      artifact_path name, :mailer
+    end
+        
+    def create_mailer name, options={}, &block
+      create_artifact(name, set(options, :mailer), &block)
     end  
 
+    def insert_into_mailer(name, options={}, &block)
+      insert_content(name, set(options, :mailer), &block)      
+    end              
+
+    def read_mailer(name, options={}, &block)
+      read_artifact(name, set(options, :mailer), &block)      
+    end              
+
     def remove_mailer name
-      file = mailer_file_name(name)
-      FileUtils.rm_f(file) if File.exist?(file)
+      remove_artifact name, :mailer
     end
 
     def remove_mailers *names
-      names.each{|name| remove_mailer name }
-    end      
-    
-    def mailer_file_name name
-      File.join(mailer_dir, "#{name}.rb")
-    end        
+      remove_artifacts :mailer, *names
+    end     
+
+    def mailer_marker name, options=nil
+      "#{name.to_s.camelize} < ActionMailer::Base"
+    end
+
+    def new_mailer_content name, content=nil, &block
+      new_artifact_content name, :mailer, content, &block
+    end
     
+    aliases_for :mailer    
   end
 end

data/lib/generator_spec/rails_helpers/rails_migration.rb

@@ -1,36 +1,51 @@
 module RSpec::Rails
-  module Migration    
-    include RSpec::Rails::App
-    
-    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
+  module Migration
+    include RSpec::Rails::BaseHelper    
+
+    include Rails::Generators::MigrationHelper::ClassMethods
+
+    def migration_file_name name, options={}
+      number = options[:number]      
+      number = next_migration_number(migration_dir) if !number      
+      File.join(migration_dir, "#{number}_#{name}.rb")      
+    end
+
+    def create_migration name, options={}, &block
+      create_artifact(name, set(options, :migration), &block)
     end  
+    
+    def find_migration name, option=nil
+      migrations = Dir.glob("#{migration_dir}/[0-9]*_*.rb")
+      return nil if !migrations.empty?      
+      matching_migrations = migrations.grep(/\d+_#{name}\.rb$/)
+      return nil if matching_migrations.empty?
+      migration_file = (option == :last) ? matching_migrations.last : matching_migrations.first
+    end
+
+    def insert_into_migration(name, options={}, &block)
+      insert_content(name, set(options, :migration), &block)      
+    end
+
+    def read_migration(name, options={}, &block)
+      read_artifact(name, set(options, :migration), &block)      
+    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
+      remove_artifact :migration, name
     end
 
     def remove_migrations *names
-      names.each do |name| 
-        remove_migration name
-      end
-    end      
+      remove_artifacts :migration, *names
+    end     
+
+    def migration_marker name, options=nil
+      "#{name.to_s.camelize} < ActiveRecord::Migration"
+    end
+
+    def new_migration_content name, content=nil, &block
+      new_artifact_content name, :migration, content, &block
+    end    
     
-    def migration_file_name number, name
-      File.join(migration_dir, "#{number}_#{name}.rb")
-    end        
+    aliases_for :migration
   end
 end

data/lib/generator_spec/rails_helpers/rails_model.rb

@@ -1,30 +1,40 @@
 module RSpec::Rails
-  module Model  
-    include RSpec::Rails::App    
+  module Model
+    include RSpec::Rails::BaseHelper
+
+    def model_file_name name, options=nil
+      artifact_path name, :model
+    end        
       
-    def create_model name, type=nil, &block      
-      file = model_file_name(name)
-      unless File.exist?(file)    
-        FileUtils.mkdir_p File.dirname(file)
-        File.open(file, 'w') do |f|
-          raise "You must include an ORM helper in your model spec, fx: include RSpec::Rails::Orm::ActiveRecord" if !respond_to? :file_content
-          f.puts file_content(name, type)
-          yield f if block_given?
-        end
-      end
+    def create_model name, options={}, &block
+      create_artifact(name, set(options, :model), &block)
     end  
 
+    def insert_into_model(name, options={}, &block)
+      insert_content(name, set(options, :model), &block)      
+    end
+
+    def read_model(name, options={}, &block)
+      read_artifact(name, set(options, :model), &block)      
+    end
+
     def remove_model name
-      file = model_file_name(name)
-      FileUtils.rm_f(file) if File.exist?(file)
+      remove_artifact name, :model
     end
 
     def remove_models *names
-      names.each{|name| remove_model name }
-    end      
+      remove_artifacts :model, *names
+    end
+
+    def model_marker name, options={}
+      return send :orm_marker_name, options[:model_type] if respond_to?(:orm_marker_name)
+      name.camelize      
+    end
+
+    aliases_for :model
     
-    def model_file_name name
-      File.join(model_dir, "#{name}.rb")
-    end        
+    def orm_notify
+      ". You must specify an ORM with the macro use_orm, f.ex -- use_orm :active_record"
+    end    
   end
 end

data/lib/generator_spec/rails_helpers/rails_observer.rb

@@ -1,35 +1,39 @@
 module RSpec::Rails
-  module Observer   
-    include RSpec::Rails::App
-     
-    def create_observer name, content=nil
-      file =  observer_file_name(name)
-      unless File.exist?(file)    
-        FileUtils.mkdir_p File.dirname(file)
-        content ||= yield if block_given?
-        File.open(file, 'w') do |f|  
-          f.puts observer_content(name, content)
-        end
-      end
+  module Observer
+    include RSpec::Rails::BaseHelper
+
+    def observer_file_name name, options=nil
+      artifact_path name, :observer
+    end
+        
+    def create_observer name, options={}, &block
+      create_artifact(name, set(options, :observer), &block)
     end  
 
-    def observer_content name, content=nil
-      %Q{class #{name.to_s.camelize}Observer < ActiveRecord::Observer      
-  #{content}
-end}        
+    def insert_into_observer(name, options={}, &block)
+      insert_content(name, set(options, :observer), &block)      
+    end
+
+    def read_observer(name, options={}, &block)
+      read_artifact(name, set(options, :observer), &block)      
     end
 
     def remove_observer name
-      file = observer_file_name(name)
-      FileUtils.rm_f(file) if File.exist?(file)
+      remove_artifact name, :observer
     end
 
-    def remove_observers *names
-      names.each{|name| remove_observer name }
+    def remove_observers *names      
+      remove_artifacts :observer, *names
     end      
+
+    def observer_marker name, options=nil
+      "#{name.to_s.camelize}Observer < ActiveRecord::Observer"
+    end
+
+    def new_observer_content name, content=nil, &block
+      new_artifact_content name, :observer, content, &block
+    end
     
-    def observer_file_name name
-      File.join(observer_dir, "#{name}_observer.rb")
-    end        
+    aliases_for :observer    
   end
 end

data/lib/generator_spec/rails_helpers/rails_orm.rb

@@ -3,10 +3,14 @@ require 'generator_spec/rails_helpers/rails_model'
 module RSpec::Rails
   module Orm
     module Base
-      include RSpec::Rails::Model
+      include RSpec::Rails::Model 
 
       protected
 
+      def orm_marker_name type = :document
+        document_name type
+      end
+
       def document_name type  
         type_content = type == :document ? "#{orm_name}::Document" : "#{orm_name}::EmbeddedDocument"
       end
@@ -15,19 +19,21 @@ module RSpec::Rails
         "class #{name.to_s.camelize}"
       end
 
-      def file name
+      def file name, include_stmt, &block
         %Q{#{clazz name}
-          #{yield if block_given?}
-        end}
+  #{include_stmt}
+  #{yield if block}
+end}
       end
 
-      def file_w_include name
-        file name { "include #{yield}" if block_given?}
+      def file_w_include name, module_name, &block
+        file name, "include #{module_name}", &block 
       end
 
-      def file_w_inherit name
-        %Q{#{clazz name} < #{yield if block_given?}
-        end}
+      def file_w_inherit name, module_name, &block
+        %Q{#{clazz name} < #{module_name}
+  #{yield if block}         
+end}
       end 
       
       def field name, type = nil
@@ -39,8 +45,12 @@ module RSpec::Rails
     module ActiveRecord
       include RSpec::Rails::Orm::Base
 
-      def file_content name, type=nil
-        file_w_inherit(name) {'ActiveRecord::Base'}
+      def orm_marker_name type=nil
+        'ActiveRecord::Base'
+      end
+
+      def new_model_content name, type=nil, content
+        file_w_inherit(name, orm_marker_name(type)) { content }
       end
     end
 
@@ -49,9 +59,10 @@ module RSpec::Rails
 
       def orm_name
         'MongoMapper'
-      end
-      def file_content name, type = :document        
-        file_w_include(name) { document_name type } 
+      end      
+      
+      def new_model_content name, type = :document        
+        file_w_include(name, orm_marker_name(type)) { content }
       end
 
       def field_name
@@ -70,8 +81,8 @@ module RSpec::Rails
         'field'
       end
 
-      def file_content name, type = :document
-        file_w_include(name) { document_name type }
+      def new_model_content name, type = :document
+        file_w_include(name, orm_marker_name(type)) { content }
       end
 
       def field name, type = nil
@@ -87,8 +98,12 @@ module RSpec::Rails
         'DataMapper'
       end
 
-      def file_content name
-        file_w_include(name) { "#{orm_name}::Resource" }
+      def orm_marker_name type=nil
+        "#{orm_name}::Resource"
+      end
+
+      def new_model_content name
+        file_w_include(name, orm_marker_name(type)) { content }
       end
 
       def field_name