code-spec 0.2.8 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/code-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{code-spec}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-10-21}
+  s.date = %q{2010-10-22}
   s.description = %q{Code file RSpec 2 matchers that make it easy to spec Ruby code files, fx updated or generated by a Thor generator}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [

data/lib/code_spec/matchers/content_matcher.rb

@@ -17,6 +17,14 @@ module RSpec
     def debug?
       false
     end
+
+    def display_content
+      "\ncontent:#{content}"
+    end
+
+    def display msg
+      "#{msg}#{display_content}\nRegexp: #{@expr}\n#{@special_error}"
+    end
          
     def matches? content, &block
       @content = content
@@ -30,7 +38,8 @@ module RSpec
     end
 
     def is_match? content
-      expr = get_expr(content) 
+      expr = get_expr(content)
+      @expr = expr 
       debug "match expression: #{expr}"
       match = (content =~ expr)
       @content_matches = [$1, $2, $3]

data/lib/code_spec/matchers/have_block.rb

@@ -45,12 +45,12 @@ module RSpec::RubyContentMatchers
   
     def failure_message   
       super
-      return "Expected there to be a block #{name}#{args_msg}#{block_args_msg}, but there wasn't"
+      display "Expected there to be a block #{name}#{args_msg}#{block_args_msg}, but there wasn't"
     end 
     
     def negative_failure_message  
       super
-      return "Did not expect there to be a block #{name}#{args_msg}, but there was"
+      display "Did not expect there to be a block #{name}#{args_msg}, but there was"
     end               
     
     protected

data/lib/code_spec/matchers/have_call.rb

@@ -10,16 +10,16 @@ module RSpec::RubyContentMatchers
     attr_accessor :method_name, :args, :dot, :content
 
     def initialize(method_name, options = {})
-      self.method_name = method_name.to_s
-      self.args = case options
+      @method_name = method_name.to_s
+      @args = case options
       when Hash         
-        self.dot = options[:dot]
+        @dot = options[:dot]
         options[:args] 
       else 
         (options == {}) ? nil : options
       end
       
-      self.args = ":#{args}" if args.kind_of? Symbol      
+      @args = ":#{args}" if args.kind_of? Symbol      
     end
 
     def matches?(content)
@@ -27,7 +27,7 @@ module RSpec::RubyContentMatchers
       def_pos = (content =~ /def(.*)#{method_name}/) || 999
       call_pos = (content =~ /[^def]?#{method_name}/) || 999
 
-      arguments_expr = case args
+      arguments_expr = case @args
       when String
         args_expr
       when Array 
@@ -35,7 +35,10 @@ module RSpec::RubyContentMatchers
           arg_val = (arg.kind_of?(String) && arg[0] == '#') ? arg[1..-1] : arg.inspect
           res << '(\s|,|\w|:)*' + arg_val
         end
+      when NilClass
+        ""
       else
+        @special_error = "Unknown arguments: #{args.inspect}"
         return nil
       end
 
@@ -53,12 +56,12 @@ module RSpec::RubyContentMatchers
   
     def failure_message
       super
-      "Expected there to be a call to #{method_name}#{args_msg}, but there wasn't. Regexp: #{@expr} did not match\n#{@content}"
+      display "Expected there to be a call to #{method_name}#{args_msg}, but there wasn't."
     end 
     
     def negative_failure_message
       super
-      "Did not expect there to be a call to #{method_name}#{args_msg}, but there was"
+      display "Did not expect there to be a call to #{method_name}#{args_msg}, but there was"
     end
              
     protected

data/lib/code_spec/matchers/have_class_module.rb

@@ -11,12 +11,12 @@ module RSpec::RubyContentMatchers
   
     def failure_message
       super
-      "Expected there to be the #{type} #{name}"
+      display "Expected there to be the #{type} #{name}"
     end 
     
     def negative_failure_message
       super
-      "Did not expected there to be the #{type} #{name}"
+      display "Did not expected there to be the #{type} #{name}"
     end
 
     protected

data/lib/code_spec/matchers/have_class_self.rb

@@ -14,12 +14,12 @@ module RSpec::RubyContentMatchers
   
     def failure_message
       super
-      return "Expected there to be a: class << self"
+      display "Expected there to be a: class << self"
     end 
     
     def negative_failure_message
       super
-      "Did not expect there to be a: class << self"
+      display "Did not expect there to be a: class << self"
     end
 
     protected

data/lib/code_spec/matchers/have_comment.rb

@@ -13,12 +13,12 @@ module RSpec::RubyContentMatchers
   
     def failure_message
       super
-      "Expected there to be the comment '# #{comment}'" 
+      display "Expected there to be the comment '# #{comment}'" 
     end 
     
     def negative_failure_message
       super
-      "Did not expect there to be the comment '# #{comment}'" 
+      display "Did not expect there to be the comment '# #{comment}'" 
     end
 
     protected

data/lib/code_spec/matchers/have_content.rb

@@ -14,11 +14,11 @@ module RSpec::RubyContentMatchers
     end
     
     def failure_message
-      "Expected the file #{file_path} to have content" 
+      display "Expected the file #{file_path} to have content" 
     end 
     
     def negative_failure_message
-      "Did not expect the file #{file_path} to have content" 
+      display "Did not expect the file #{file_path} to have content" 
     end    
   end
 

data/lib/code_spec/matchers/have_method.rb

@@ -22,12 +22,12 @@ module RSpec::RubyContentMatchers
   
     def failure_message
       super
-      "Expected there to be the #{class_msg} method #{method}, but there wasn't"
+      display "Expected there to be the #{class_msg} method #{method}, but there wasn't"
     end 
     
     def negative_failure_message                                      
       super
-      "Did not expect there to be the #{class_msg} method #{method}, but there was"
+      display "Did not expect there to be the #{class_msg} method #{method}, but there was"
     end
 
     protected

data/lib/code_spec/matchers/have_region.rb

@@ -9,12 +9,12 @@ module RSpec::RubyContentMatchers
   
     def failure_message 
       super
-      "Expected there to be a #{region} region"
+      display "Expected there to be a #{region} region"
     end 
     
     def negative_failure_message    
       super
-      "Did no expected there to be a #{region} region"
+      display "Did no expected there to be a #{region} region"
     end               
     
     protected

data/lib/code_spec/matchers/have_subclass.rb

@@ -12,12 +12,12 @@ module RSpec::RubyContentMatchers
 
     def failure_message  
       super
-      "Expected there to be the subclass #{full_class} of #{superclass}"
+      display "Expected there to be the subclass #{full_class} of #{superclass}"
     end 
 
     def negative_failure_message
       super
-      "Did no expected there to be the subclass #{full_class} of #{superclass}"
+      display "Did no expected there to be the subclass #{full_class} of #{superclass}"
     end   
 
     protected 

data/lib/code_spec/matchers/include_module.rb

@@ -14,12 +14,12 @@ module RSpec::RubyContentMatchers
   
     def failure_message
       super
-      "Expected there to be an inclusion of module #{module_name}"
+      display "Expected there to be an inclusion of module #{module_name}"
     end 
     
     def negative_failure_message
       super
-      "Did not expect there to be an inclusion of module #{module_name}"
+      display "Did not expect there to be an inclusion of module #{module_name}"
     end
                
   end

data/lib/code_spec/matchers/inherit_from.rb

@@ -13,12 +13,12 @@ module RSpec::RubyContentMatchers
   
     def failure_message
       super
-      "Expected the class to inherit from #{klass}"
+      "Expected the class to inherit from #{klass}\ncontent:#{content}"
     end 
     
     def negative_failure_message
       super
-      "Did not expect the class to inherit from #{klass}"
+      "Did not expect the class to inherit from #{klass}\ncontent:#{content}"
     end
     
     protected

data/lib/code_spec/matchers/multi/have_classes_modules.rb

@@ -38,12 +38,12 @@ module RSpec::RubyContentMatchers
   
     def failure_message
       super
-      "Expected there to be the #{type} #{name}"
+      display "Expected there to be the #{type} #{name}"
     end 
     
     def negative_failure_message
       super
-      "Did not expected there to be the #{type} #{name}"
+      display "Did not expected there to be the #{type} #{name}"
     end
 
     protected

data/spec/code-spec/matchers/have_call_spec.rb

@@ -63,7 +63,6 @@ describe 'method call matcher' do
       migration_klass.should have_class_method :up
   
       migration_klass.should have_class_method :down do |down|
-        puts down
         down.should have_call 'drop_table', :users
       end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +02:00
+date: 2010-10-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency