generator-spec 0.4.3 → 0.4.4

data/lib/{rspec_for_generators → generator_spec}/matchers/content/have_method.rb

@@ -6,8 +6,8 @@
 #   say_hello_file_content.should have_method "hello"
 #
 module RSpec::RubyContentMatchers
-  class HaveMethod
-    attr_reader :method, :type, :content
+  class HaveMethod < RSpec::RubyContentMatcher
+    attr_reader :method, :type
 
     def initialize(method, type=nil)
       @method = method.to_s
@@ -15,12 +15,12 @@ module RSpec::RubyContentMatchers
     end
 
     def matches?(content) 
-      @content = content 
+      super
       match_res = case type
       when :class
-        content =~ /def\s+self.#{method}\s*(\(.+\))?(.*?)(def|end)/m
+        content =~ /def\s+self.#{method}#{args_expr}(.*?)#{end_expr}/m
       else
-        content =~ /def\s+#{method}\s*(\(.+\))?(.*?)(def|end)/m
+        content =~ /def\s+#{method}#{args_expr}(.*?)#{end_expr}/m
       end   
       if block_given? && $2
         ruby_content = $2.strip.extend(RSpec::RubyContent::Helpers)
@@ -31,17 +31,26 @@ module RSpec::RubyContentMatchers
     end          
   
     def failure_message
-      puts "Content: #{content}" if RSpec::Generator.debug?      
+      super
       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                                      
-      puts "Content: #{content}" if RSpec::Generator.debug?      
+      super
       return "Did not expect there to be the class method #{method}, but there was" if type == :class
       "Did not expect there to be the method #{method}, but there was"
     end
-               
+
+    protected
+
+    def args_expr
+      '\s*(\(.+\))?'
+    end
+    
+    def end_expr
+      "(def|end|# #{method})"
+    end
   end
   
   def have_method(method, type = nil)

data/lib/{rspec_for_generators → generator_spec}/matchers/content/have_module.rb

@@ -1,13 +1,13 @@
 module RSpec::RubyContentMatchers
-  class HaveModule
-    attr_reader :module_name, :content
+  class HaveModule < RSpec::RubyContentMatcher
+    attr_reader :module_name
 
     def initialize(module_name)
       @module_name = module_name.to_s.camelize
     end
 
     def matches?(content)            
-      @content = content
+      super
       match_res =~ /module\s+#{module_name}\s+(.*)end/m
       if block_given? && match_res
         ruby_content = $2.strip.extend(RSpec::RubyContent::Helpers)
@@ -18,12 +18,12 @@ module RSpec::RubyContentMatchers
     end          
   
     def failure_message
-      puts "Content: #{content}" if RSpec::Generator.debug?      
+      super
       "Expected there to be the module #{module_name}"
     end 
     
     def negative_failure_message
-      puts "Content: #{content}" if RSpec::Generator.debug?      
+      super
       "Did no expected there to be the module #{module_name}"
     end
                
@@ -31,5 +31,6 @@ module RSpec::RubyContentMatchers
   
   def have_module(module_name)
     HaveModule.new(module_name)
-  end    
+  end       
+  alias_method :be_module, :have_module  
 end  

data/lib/generator_spec/matchers/content/have_region.rb

@@ -0,0 +1,49 @@
+module RSpec::RubyContentMatchers
+  class HaveRegion < RSpec::RubyContentMatcher
+    attr_reader :region
+
+    def initialize(region)
+      @region = region.to_s
+    end
+
+    def matches?(content) 
+      super
+      match_res = (content =~ /#{region}(.*)#{end_epxr}/m)
+      if block_given? && $1
+        ruby_content = $1.strip.extend(RSpec::RubyContent::Helpers)
+        yield ruby_content        
+      end
+      match_res
+    end          
+  
+    def failure_message 
+      super
+      "Expected there to be a #{region} region"
+    end 
+    
+    def negative_failure_message    
+      super
+      "Did no expected there to be a #{region} region"
+    end               
+    
+    protected
+    
+    def end_expr
+      '(private|protected|public|$)'
+    end
+  end
+  
+  def have_public
+    HaveRegion.new :public
+  end    
+
+  def have_protected
+    HaveRegion.new :protected
+  end    
+
+  def have_private
+    HaveRegion.new :private
+  end    
+end
+      
+

data/lib/{rspec_for_generators → generator_spec}/matchers/content/have_subclass.rb

@@ -1,6 +1,6 @@
 module RSpec::RubyContentMatchers
-  class HaveSubclass
-    attr_reader :klass, :superclass, :type, :content
+  class HaveSubclass < RSpec::RubyContentMatcher
+    attr_reader :klass, :superclass, :type
 
     def initialize(klass, superclass, type=nil)
       @klass      = klass.to_s.camelize
@@ -9,8 +9,8 @@ module RSpec::RubyContentMatchers
     end
 
     def matches?(content) 
-      @content = content
-      match_res = (content =~ /class\s+#{klass}#{type}\s+<\s+#{superclass}(.*)end$/m)
+      super
+      match_res = (content =~ /class\s+#{klass}#{type}\s+<\s+#{superclass}(.*)#{end_expr}/m)
       if block_given? && $1
         ruby_content = $1.strip.extend(RSpec::RubyContent::Helpers)
         yield ruby_content 
@@ -20,25 +20,37 @@ module RSpec::RubyContentMatchers
     end          
 
     def failure_message  
-      puts "Content: #{content}" if RSpec::Generator.debug?      
+      super
       "Expected there to be the subclass #{klass} of #{superclass}"
     end 
 
     def negative_failure_message
-      puts "Content: #{content}" if RSpec::Generator.debug?      
+      super
       "Did no expected there to be the subclass #{klass} of #{superclass}"
+    end   
+
+    protected
+
+    def end_expr
+      "(end$|# #{klass})"
     end
+    
   end
 
-  def have_migration(klass, superclass, type=nil)
+  def have_subclass(klass, superclass, type=nil)
     HaveSubclass.new(klass, superclass, type)
   end    
+  alias_method :be_subclass, :have_subclass
   
   def have_observer_class(klass)
     HaveSubclass.new(klass, 'ActiveRecord::Observer', :observer)
   end     
+  alias_method :be_observer, :have_observer_class
+  alias_method :be_observer_class, :have_observer_class
+
   
   def have_migration(klass)
     HaveSubclass.new(klass, 'ActiveRecord::Migration')
   end      
+  alias_method :be_migration, :have_migration  
 end

data/lib/{rspec_for_generators → generator_spec}/matchers/content/include_module.rb

@@ -1,13 +1,13 @@
 module RSpec::RubyContentMatchers
-  class IncludeModule
-    attr_reader :module_name, :content
+  class IncludeModule < RSpec::RubyContentMatcher
+    attr_reader :module_name
 
     def initialize module_name
       @module_name = module_name.to_s.camelize
     end
 
     def matches?(content)      
-      @content = content
+      super
       match_res = (content =~ /include\s+#{module_name}/)
       if block_given? && match_res
         ruby_content = content.extend(RSpec::RubyContent::Helpers)
@@ -18,12 +18,12 @@ module RSpec::RubyContentMatchers
     end          
   
     def failure_message
-      puts "Content: #{content}" if RSpec::Generator.debug?      
+      super
       "Expected there to be an inclusion of module #{module_name}"
     end 
     
     def negative_failure_message
-      puts "Content: #{content}" if RSpec::Generator.debug?      
+      super
       "Did not expect there to be an inclusion of module #{module_name}"
     end
                

data/lib/{rspec_for_generators → generator_spec}/matchers/content/inherit_from.rb

@@ -1,12 +1,13 @@
 module RSpec::RubyContentMatchers
-  class InheritFrom
+  class InheritFrom < RSpec::RubyContentMatcher
     attr_reader :klass
 
     def initialize klass
       @klass = klass.to_s.camelize
     end
 
-    def matches?(content)      
+    def matches?(content)
+      super      
       match_res =~ /class\s+(.*?)<\s+#{klass}(.*)end/
       if block_given? && match_res
         ruby_content = $2.strip.extend(RSpec::RubyContent::Helpers)
@@ -17,17 +18,20 @@ module RSpec::RubyContentMatchers
     end          
   
     def failure_message
+      super
       "Expected the class to inherit from #{klass}"
     end 
     
     def negative_failure_message
+      super
       "Did not expect the class to inherit from #{klass}"
     end
   end
   
   def inherit_from(klass)
     InheritFrom.new(klass)
-  end
+  end 
+  alias_method :be_subclass_of, :inherit_from
   
   def be_active_record    
     InheritFrom.new('ActiveRecord::Base')    

data/lib/{rspec_for_generators → generator_spec}/matchers/file/generate_directory.rb

@@ -68,6 +68,6 @@ module RSpec::FileMatchers
   def generate_dir(relative, type = nil)
     GenerateDir.new(relative, type)
   end
-
+  alias_method :have_dir, :generate_dir
 end
 

data/lib/{rspec_for_generators → generator_spec}/matchers/file/generate_file.rb

@@ -80,26 +80,32 @@ module RSpec::FileMatchers
   def generate_file(relative, type = nil)
     GenerateFile.new(relative, type)
   end
+  alias_method :have_file, :generate_file
 
   def generate_model(relative)
     GenerateFile.new(relative, :model)
   end
+  alias_method :have_model, :generate_model
 
   def generate_controller(relative) 
     puts "Generate controller: #{relative}"
     GenerateFile.new(relative, :controller)
   end
+  alias_method :have_controller, :generate_controller
 
   def generate_helper(relative)
     GenerateFile.new(relative, :helper)
   end
+  alias_method :have_helper, :generate_helper
 
   def generate_view(relative, action, ext)
     GenerateFile.new("#{relative}/#{action}.#{ext}", :view)
   end
+  alias_method :have_view, :generate_view
   
   def generate_observer(relative)
     GenerateFile.new(relative, :observer)
   end  
+  alias_method :have_observer, :generate_observer  
 end
 

data/lib/{rspec_for_generators → generator_spec}/matchers/file/generate_migration.rb

@@ -53,6 +53,6 @@ module RSpec
     def generate_migration(name)
       GenerateMigration.new(name)
     end
-
+    alias_method :have_migration, :generate_migration  
   end   
 end

data/lib/{rspec_for_generators → generator_spec}/matchers/helpers/migration.rb

@@ -1,7 +1,7 @@
 module RSpec::Generator
   module Helpers
     def check_migration(file_name, &block)
-      self.should generate_file(file_name, :migration) do |content|  
+      self.should generate_migration file_name do |content|  
         yield content if block
       end
     end

data/lib/generator_spec/rails_helpers/rails_app.rb

@@ -0,0 +1,159 @@
+module RSpec::Rails
+  module App 
+    def root_dir
+      ::Rails.root
+    end
+
+    def app_dir
+      File.join(root_dir, 'app')
+    end
+
+    def config_dir
+      File.join(root_dir, 'config')
+    end  
+
+    def db_dir
+      File.join(root_dir, 'db')
+    end
+
+    def locale_dir
+      File.join(root_dir, 'public')
+    end
+
+    def model_dir
+      File.join(app_dir, 'models')
+    end
+
+    def observer_dir
+      model_dir
+    end
+
+    def controller_dir
+      File.join(app_dir, 'controllers')
+    end
+
+    def mailer_dir
+      File.join(app_dir, 'mailers')
+    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      
+
+    def all_files
+      rails_files root_dir
+    end  
+
+    def app_files
+      rails_app_files
+    end  
+
+    def model_files
+      rails_app_files :models
+    end  
+
+    def controller_files              
+      rails_app_files :controllers
+    end  
+
+    def mailer_files              
+      rails_app_files :mailers
+    end  
+
+    def helper_files
+      rails_app_files :helpers
+    end  
+
+    def observer_files
+      rails_app_files :models, '**/*_observer.rb'
+    end  
+
+    def view_files                     
+      rails_app_files :views
+    end
+
+    def view_files_html              
+      rails_app_files :views, '**/*.html*'
+    end
+
+    def view_files_haml                 
+      rails_app_files :views, '**/*.haml*'
+    end
+
+    def initializer_files
+      rails_files initializer_dir
+    end  
+
+    def db_files          
+      rails_files db_dir
+    end
+
+    def migration_files          
+      rails_files migration_dir
+    end
+
+    def locale_files
+      rails_files locale_dir, '**/*.yml'
+    end
+
+    def javascript_files
+      rails_files javascript_dir, '**/*.js'
+    end
+  
+    def css_files
+      rails_files stylesheet_dir, '**/*.css'
+    end
+
+    def sass_files
+      rails_files stylesheet_dir, '**/*.sass'
+    end   
+    
+    protected
+
+    RB_FILES = '**/*.rb'
+
+    def rails_files dir, type=nil, pattern=nil
+      path = case type
+      when nil
+        "#{dir}/#{RB_FILES}"
+      when String          
+        "#{dir}/#{type}"
+      when Symbol
+        pattern ? "#{dir}/#{type}/#{pattern}" : "#{dir}/#{type}"
+      end
+      FileList[path]
+    end
+    
+    def rails_app_files type=nil, pattern='**/*.rb'
+      rails_files :app, type, pattern
+    end
+  end
+end