generator-spec 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/generator-spec.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{generator-spec}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

data/lib/rspec_for_generators/generator_spec_helper.rb

@@ -7,6 +7,12 @@ require 'rspec_for_generators/rails_spec_helper'
 # Call configure to load the settings from
 # Rails.application.config.generators to Rails::Generators
 
+class Array
+  def args
+    flatten.map(&:to_s)
+  end
+end
+
 # require the generators
 def require_generators *generator_list     
   req = RSpec::Generator::Require

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

@@ -1,6 +1,6 @@
 module RSpec::RubyContentMatchers
   class HaveBlock
-    attr_reader :name, :args, :block_args
+    attr_reader :name, :args, :block_args, :content
 
     def initialize(name, options={})
       @name = name.to_s
@@ -9,21 +9,23 @@ module RSpec::RubyContentMatchers
     end
 
     def matches?(content)            
-      match_res = (content =~ /#{name}\s+#{args_expr}do\s+#{block_args_expr}(.*?)end/m)
+      @content = content 
+      match_res = (content =~ /#{name}\s+#{args_expr}do\s+#{block_args_expr}(.*?)end/m) != nil
       block_content = $1 || $3
       if block_given? && block_content
         ruby_content = block_content.strip.extend(RSpec::RubyContent::Helpers)
         yield ruby_content 
-      else
-        match_res
       end
+      match_res
     end          
   
-    def failure_message
+    def failure_message   
+      puts "Content: #{content}" if RSpec::Generator.debug?      
       return "Expected there to be a block #{name} with arguments #{args}, but there wasn't"
     end 
     
-    def negative_failure_message                                      
+    def negative_failure_message  
+      puts "Content: #{content}" if RSpec::Generator.debug?                                          
       return "Did not expect there to be a block #{name} with arguments #{args}, but there was"
     end               
     

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

@@ -7,7 +7,7 @@
 #
 module RSpec::RubyContentMatchers
   class HaveCall
-    attr_reader :method, :args
+    attr_reader :method, :args, :content
 
     def initialize(method, args = nil)
       @method = method.to_s
@@ -15,15 +15,18 @@ module RSpec::RubyContentMatchers
     end
 
     def matches?(content)
-      content =~ /#{method}\s+#{args_expr}/m
+      @content = content
+      (content =~ /#{method}#{args_expr}/m) != nil
     end          
   
     def failure_message
+      puts "Content: #{content}" if RSpec::Generator.debug?      
       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"
+      "Expected there to be a call to #{method}, but there wasn't"      
     end 
     
-    def negative_failure_message                                      
+    def negative_failure_message               
+      puts "Content: #{content}" if RSpec::Generator.debug?                             
       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
@@ -31,7 +34,7 @@ module RSpec::RubyContentMatchers
     protected
     
     def args_expr
-      args ? "(\()?\s*#{args}\s*(\))?" : ''
+      args ? "\s+(\()?\s*#{args}\s*(\))?" : ''
     end      
                
   end

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

@@ -1,13 +1,13 @@
 module RSpec::RubyContentMatchers
   class HaveCalls
-    attr_reader :calls
-    attr_accessor :method, :args    
+    attr_reader :calls, :method, :args, :content
 
     def initialize(calls)
       @calls = calls
     end
 
     def matches?(content)
+      @content = content
       calls.each_pair do |method, args|
         @method = method.to_s
         @args = args
@@ -17,11 +17,13 @@ module RSpec::RubyContentMatchers
     end          
   
     def failure_message
+      puts "Content: #{content}" if RSpec::Generator.debug?            
       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                                      
+    def negative_failure_message 
+      puts "Content: #{content}" if RSpec::Generator.debug?                                           
       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

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

@@ -1,27 +1,29 @@
 module RSpec::RubyContentMatchers
   class HaveClass
-    attr_reader :klass, :type
+    attr_reader :klass, :type, :content
 
     def initialize(klass, type=nil)
       @klass = klass.to_s.camelize
       @type  = type.to_s.camelize if type
     end
 
-    def matches?(content)      
+    def matches?(content) 
+      @content = content     
       match_res = (content =~ /class\s+#{klass}#{type}\s+(.*)end/m)
       if block_given? && $1
         ruby_content = $1.strip.extend(RSpec::RubyContent::Helpers)
-        yield ruby_content 
-      else
-        match_res
+        yield ruby_content        
       end
+      match_res
     end          
   
-    def failure_message
+    def failure_message 
+      puts "Content: #{content}" if RSpec::Generator.debug?
       "Expected there to be the class #{klass}"
     end 
     
-    def negative_failure_message
+    def negative_failure_message    
+      puts "Content: #{content}" if RSpec::Generator.debug?      
       "Did no expected there to be the class #{klass}"
     end
                

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

@@ -7,14 +7,15 @@
 #
 module RSpec::RubyContentMatchers
   class HaveMethod
-    attr_reader :method, :type
+    attr_reader :method, :type, :content
 
     def initialize(method, type=nil)
       @method = method.to_s
       @type = type      
     end
 
-    def matches?(content)  
+    def matches?(content) 
+      @content = content 
       match_res = case type
       when :class
         content =~ /def\s+self.#{method}\s*(\(.+\))?(.*?)(def|end)/m
@@ -24,19 +25,20 @@ module RSpec::RubyContentMatchers
       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
+        yield ruby_content         
       end      
+      match_res
     end          
   
     def failure_message
+      puts "Content: #{content}" if RSpec::Generator.debug?      
       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
+      puts "Content: #{content}" if RSpec::Generator.debug?      
+      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
                

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

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

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

@@ -1,6 +1,6 @@
 module RSpec::RubyContentMatchers
   class HaveSubclass
-    attr_reader :klass, :superclass, :type
+    attr_reader :klass, :superclass, :type, :content
 
     def initialize(klass, superclass, type=nil)
       @klass      = klass.to_s.camelize
@@ -9,6 +9,7 @@ module RSpec::RubyContentMatchers
     end
 
     def matches?(content) 
+      @content = content
       match_res = (content =~ /class\s+#{klass}#{type}\s+<\s+#{superclass}(.*)end$/m)
       if block_given? && $1
         ruby_content = $1.strip.extend(RSpec::RubyContent::Helpers)
@@ -18,11 +19,13 @@ module RSpec::RubyContentMatchers
       end
     end          
 
-    def failure_message
+    def failure_message  
+      puts "Content: #{content}" if RSpec::Generator.debug?      
       "Expected there to be the subclass #{klass} of #{superclass}"
     end 
 
     def negative_failure_message
+      puts "Content: #{content}" if RSpec::Generator.debug?      
       "Did no expected there to be the subclass #{klass} of #{superclass}"
     end
   end

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

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

data/spec/rspec_for_generators/helper_generator_spec.rb

@@ -32,12 +32,12 @@ describe 'helper_generator' do
 
   it "should decorate an existing Account helper file with a 'help_me' method" do
     with_generator do |g|  
-      name = 'account'
-      create_helper name do
+      name = :account
+      create_helper :account do
         '# helper content'
       end    
-      g.run_generator [name]
-      g.should generate_helper name do |content|
+      g.run_generator [:account].args
+      g.should generate_helper :account do |content|
         content.should have_helper_class name do |klass|
           klass.should have_method :help_me
         end

data/spec/rspec_for_generators/migration_generator_spec.rb

@@ -1,4 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+RSpec::Generator.debug = true
+
 require_generator :migration
 
 describe 'migration_generator' do
@@ -16,14 +19,14 @@ describe 'migration_generator' do
     
   it "should generate create_user migration" do    
     with_generator do |g|
-      name = :create_users
-      remove_migration :create_users
-      g.run_generator [name.to_s]
-      g.should generate_migration name do |content|
-        content.should have_migration name do |klass|
+      # 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_timestamps              
             end
           end
 

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'rspec'
 require 'rspec/autorun'     
 require 'rspec_for_generators'
 
-RSpec::Generator.remove_temp_dir = true
+RSpec::Generator.remove_temp_dir = false # true
 RSpec::Generator.configure_root_dir __FILE__
   
 module Rails

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Kristian Mandrup