generator-spec 0.4.7 → 0.4.8

data/README.markdown

@@ -89,16 +89,22 @@ require 'generators/canable'
 
 describe 'model_generator' do
   # include Rails model helpers for ActiveRecord
-  # available: MongoMapper, Mongoid and DataMapper
+  # available: 
+
+  # Other ORM options - :mongo_mapper, :mongoid and :data_mapper
+  # note: use_orm auto-includes the :model helper module
+  use_orm :active_record
   
-  include RSpec::Rails::Orm::ActiveRecord
+  # load helper modules and make available inside spec blocks
+  # here the module in rails_helpers/rails_migration is included
+  helpers :migration
   
   before :each do              
     # define generator to test
     setup_generator 'model_generator' do
       tests Canable::Generators::ModelGenerator
     end    
-    # ensure clean state before run
+    # ensure clean state before each run
     remove_model :account
   end
 
@@ -139,6 +145,8 @@ These mutations make it easy to setup the temporary Rails app in a specific pre-
 
 ### Examples: Rails helpers
 
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+
 describe 'controller' do
   include RSpec::Rails::Controller 
 
@@ -156,10 +164,9 @@ describe 'controller' do
   end
     
   it "should have an account_controller file that contains an AccountController class with an index method inside" do      
-      Rails.application.should have_controller :account_controller do |controller_file|
-        controller_file.should have_controller_class :account_controller do |klass|
-          klass.should have_method :index
-        end
+    Rails.application.should have_controller :account do |controller_file|
+      controller_file.should have_controller_class :account do |klass|
+        klass.should have_method :index
       end
     end
   end

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/generator-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{generator-spec}
-  s.version = "0.4.7"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-08-10}
+  s.date = %q{2010-08-11}
   s.description = %q{RSpec 2 library to assist in writing generator specs}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [

data/lib/generator_spec/main.rb

@@ -42,6 +42,28 @@ module RSpec::Core
   end
 end
 
+class Class
+  def use_orm orm
+    class_eval do
+      raise ArgumentError, "Unknown orm #{orm}" if ![:active_record, :mongoid, :mongo_mapper, :data_mapper].include?(orm)
+      include "RSpec::Rails::Orm::#{orm.to_s.camelize}".constantize
+    end
+  end
+  
+  def helpers *types
+    types.each{|type| include_helper type}
+  end    
+
+  protected
+  
+  def include_helper type
+    raise ArgumentError, "Can not specify for #{type}" if ![:migration, :model, :helper, :controller, :view, :observer, :mailer].include?(type)
+    class_eval do
+      include "RSpec::Rails::#{type.to_s.camelize}".constantize
+    end
+  end      
+end
+
 require 'generator_spec/require_generator'
 
 require 'generator_spec/matchers/content/content_matcher'

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

@@ -14,6 +14,9 @@ module RSpec
       nil
     end
 
+    def debug?
+      false
+    end
          
     def matches? content, &block            
       @content = content
@@ -28,8 +31,10 @@ module RSpec
 
     def is_match? content
       expr = get_expr(content) 
+      puts "match expression: #{expr}" if debug?
       match = (content =~ expr)
       @content_matches = [$1, $2, $3]
+      match
     end
 
     def handle_result content, match, &block 
@@ -71,7 +76,7 @@ module RSpec
     end
 
     def args_expr
-      args ? SPACES + opt(LPAR) + OPT_SPACES + "#{args}" + OPT_SPACES + opt(RPAR) : ''
+      args ? OPT_SPACES + opt(LPAR) + OPT_SPACES + "#{args}" + OPT_SPACES + opt(RPAR) : ''
     end
 
     def main_expr

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

@@ -16,8 +16,14 @@ module RSpec::RubyContentMatchers
     end
 
     def matches?(content)
-      @content = content
-      (content =~ /#{dot_expr}#{method}#{args_expr}/m)
+      @content = content                        
+      has_def = (content =~ /def(.*)#{method}/)
+      expr = if has_def
+        /#{dot_expr}#{method}#{args_expr}/m        
+      else
+        /#{dot_expr}?#{method}#{args_expr}/m
+      end
+      (content =~ expr)
     end          
   
     def failure_message
@@ -33,7 +39,7 @@ module RSpec::RubyContentMatchers
     protected
 
     def not_def
-      '[^def\s]?\s*'
+      '[^def\s]'
     end
 
     def dot_expr

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

@@ -26,7 +26,13 @@ module RSpec::RubyContentMatchers
     def do_list
       calls.each do |method|
         @method = method.to_s   
-        expr = /#{not_def}#{method}/m
+        expr = 
+        has_def = (content =~ /def(.*)#{method}/)
+        expr = if has_def
+          /#{not_def}\s*#{method}/m
+        else
+          /#{not_def}?\s*#{method}/m
+        end
         return false if (content =~ expr) == nil
       end
       true
@@ -36,7 +42,13 @@ module RSpec::RubyContentMatchers
       calls.each_pair do |method, args|
         @method = method.to_s
         @args = args
-        return false if (content =~ /#{not_def}#{method}\s+#{args_expr}/m) == nil
+        has_def = (content =~ /def(.*)#{method}/)
+        expr = if has_def
+          /#{not_def}\s*#{method}\s*#{args_expr}/m
+        else
+          /#{not_def}?\s*#{method}\s*#{args_expr}/m
+        end         
+        return false if (content =~ expr) == nil
       end
       true
     end    

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

@@ -18,6 +18,7 @@ module RSpec::FileMatchers
       file_exists = File.exists?(file)
       if block && file_exists
         read = File.read(file)
+        puts "file content: #{read}, #{file}"
         ruby_content = read.extend(RSpec::RubyContent::Helpers)
         yield ruby_content
       else

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

@@ -10,7 +10,13 @@ module RSpec::RubyContentMatchers
 
   def have_columns(columns = {})
     raise ArgumentError, "Columns must be passed as a :name => :type Hash" if !columns.kind_of? Hash
-    HaveCalls.new columns
+    col_hash = {}
+    columns.each_pair do |name, type|
+      method_call = "t.#{type}"
+      arg = ":#{name}"       
+      col_hash[method_call] = arg
+    end
+    HaveCalls.new col_hash
   end
 
   def have_change_column(name, type='string')

data/lib/generator_spec/rails_helpers/rails_view.rb

@@ -2,16 +2,24 @@ module RSpec::Rails
   module View
     include RSpec::Rails::App    
     
-    def create_view name, action='show', *args
+    def create_view name, action='show', *args, &block
       type, content = parse_args(*args)
       file = view_file_name(name, action, type)
+
+      # make dir
       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       
+
+      # set content to block
+      content = yield if block
+
+      # abort if no content given
+      return if !content    
+      
+      # write file content of view
+      File.open(file, 'w') do |f|  
+        f.puts content 
       end
     end  
 

data/spec/generator_spec/generators/controller_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require_generator :controller
 
 module RSpec::Core

data/spec/generator_spec/generators/helper_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 RSpec::Generator.debug = true
 

data/spec/generator_spec/generators/migration_generator_spec.rb

@@ -1,17 +1,24 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 RSpec::Generator.debug = true
 
 require_generator :migration
 
+class Class
+  def spec
+    RSpec::DSL
+  end
+end
+
 describe 'migration_generator' do
-  include RSpec::Rails::Orm::ActiveRecord
-  include RSpec::Rails::Migration
+  use_orm :active_record
+  helpers :migration, :helper
   
   before :each do              
     setup_generator 'migration_generator' do
       tests MigrationGenerator
-    end    
+    end        
+    remove_migration :create_users    
   end
 
   after :each do
@@ -19,13 +26,12 @@ describe 'migration_generator' do
     
   it "should generate create_user migration" do    
     with_generator do |g|
-      remove_migration :create_users
       g.run_generator [:create_users].args
       g.should generate_migration :create_users do |content|
         content.should have_migration :create_users 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
+              user_tbl.should have_columns :name => :string, :age => :integer, :admin => :boolean
               user_tbl.should_not have_timestamps              
             end
           end

data/spec/generator_spec/generators/model_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require_generator :model
 
 describe 'model_generator' do

data/spec/generator_spec/generators/observer_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require_generator :observer
 
 module RSpec::Core

data/spec/generator_spec/generators/view_generator_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require_generator :view
 
 module RSpec::Core
@@ -39,8 +39,8 @@ describe 'view_generator' do
         '# view content'
       end    
       g.run_generator [name, action, type].map(&:to_s)
-      g.should generate_view name, action, type do |content|
-        content.should match /Hello You/
+      g.should generate_view name, action, type do |file|
+        file.should match /Hello You/
       end
     end
   end

data/spec/generator_spec/matchers/content/class_self_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'class_self matcher' do    
   context "content without class << self" do
@@ -7,9 +7,7 @@ describe 'class_self matcher' do
         end}    
     
     it "should not have class << self" do            
-      not_class_self.should_not have_class_self do |content|
-        puts content
-      end
+      not_class_self.should_not have_class_self
     end
   end
   

data/spec/generator_spec/matchers/content/have_block_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'block matcher' do    
   context "content without block" do

data/spec/generator_spec/matchers/content/have_call_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'method call matcher' do    
   context "content without method call" do

data/spec/generator_spec/matchers/content/have_calls_spec.rb

@@ -1,21 +1,21 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'method calls matcher' do    
-  # context "content without calls" do
-  #   not_class_self = %q{
-  #       def x
-  #       end
-  # 
-  #       def y
-  #       end        
-  #       }    
-  #   
-  #   it "should not have calls to x or y" do            
-  #     not_class_self.should_not have_calls :x, :y do |content|
-  #       puts content
-  #     end
-  #   end
-  # end
+  context "content without calls" do
+    not_class_self = %q{
+        def x
+        end
+  
+        def y
+        end        
+        }    
+    
+    it "should not have calls to x or y" do            
+      not_class_self.should_not have_calls :x, :y do |content|
+        puts content
+      end
+    end
+  end
   
   context "content with calls to x and y" do  
     class_self = %q{
@@ -31,20 +31,17 @@ describe 'method calls matcher' do
     end
   end
 
-  # context "content with calls to x and y" do  
-  #   class_self = %q{
-  #       def x
-  #         x(2)
-  #         y 3
-  #       end}    
-  # 
-  #   it "should have calls: x(2) and y 3" do            
-  #     class_self.should have_calls :x => '2', :y => '3' do |content|
-  #       puts "content: #{content}"
-  #     end
-  #   end
-  # end
+  context "content with calls to x and y" do  
+    class_self = %q{
+        def x
+          x(2)
+          y 3
+        end}    
+  
+    it "should have calls: x(2) and y 3" do            
+      class_self.should have_calls :x => '2', :y => '3' do |content|
+        puts "content: #{content}"
+      end
+    end
+  end
 end
-
-
-

data/spec/generator_spec/matchers/content/have_class_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'module matcher' do    
   context "content without class Hello" do

data/spec/generator_spec/matchers/content/have_method_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'method matcher' do    
   context "content without method" do

data/spec/generator_spec/matchers/content/have_module_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'module matcher' do    
   context "content without module Hello" do

data/spec/generator_spec/matchers/content/have_region_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'region matcher' do    
   context "content with only protected region" do

data/spec/generator_spec/matchers/content/have_subclass_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'subclass matcher' do    
   context "content without subclass Greeting" do

data/spec/generator_spec/matchers/content/include_module_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'include module matcher' do    
   context "content without include Greeting" do

data/spec/generator_spec/matchers/content/inherit_from_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'inherit matcher' do    
   context "content with class that inherits from Greeting" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 7
-  version: 0.4.7
+  - 8
+  version: 0.4.8
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 +02:00
+date: 2010-08-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency