code-spec 0.2.1 → 0.2.2

data/Rakefile

@@ -7,9 +7,9 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/code-spec"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_development_dependency "rspec", ">= 2.0.0.beta.19"
-    gem.add_dependency "require_all", ">= 1.1.0"
-    gem.add_dependency "activesupport", ">= 3.0.0.rc"
+    gem.add_development_dependency "rspec", "~> 2.0.0.beta.22"
+    gem.add_dependency "require_all",       "~> 1.1.0"
+    gem.add_dependency "activesupport",     "~> 3.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/code-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{code-spec}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-08-19}
+  s.date = %q{2010-09-16}
   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 = [
@@ -32,11 +32,11 @@ Gem::Specification.new do |s|
      "lib/code_spec/matchers/have_block.rb",
      "lib/code_spec/matchers/have_call.rb",
      "lib/code_spec/matchers/have_calls.rb",
+     "lib/code_spec/matchers/have_class_module.rb",
      "lib/code_spec/matchers/have_class_self.rb",
      "lib/code_spec/matchers/have_comment.rb",
      "lib/code_spec/matchers/have_content.rb",
      "lib/code_spec/matchers/have_method.rb",
-     "lib/code_spec/matchers/have_module.rb",
      "lib/code_spec/matchers/have_region.rb",
      "lib/code_spec/matchers/have_subclass.rb",
      "lib/code_spec/matchers/include_module.rb",
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
      "spec/code-spec/fixtures/logfile.log",
      "spec/code-spec/matchers/class_self_spec.rb",
      "spec/code-spec/matchers/have_block_spec.rb",
+     "spec/code-spec/matchers/have_call_args.rb",
      "spec/code-spec/matchers/have_call_spec.rb",
      "spec/code-spec/matchers/have_calls_spec.rb",
      "spec/code-spec/matchers/have_class_spec.rb",
@@ -65,6 +66,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/code-spec/matchers/class_self_spec.rb",
      "spec/code-spec/matchers/have_block_spec.rb",
+     "spec/code-spec/matchers/have_call_args.rb",
      "spec/code-spec/matchers/have_call_spec.rb",
      "spec/code-spec/matchers/have_calls_spec.rb",
      "spec/code-spec/matchers/have_class_spec.rb",
@@ -83,18 +85,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-      s.add_runtime_dependency(%q<require_all>, [">= 1.1.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.rc"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_runtime_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-      s.add_dependency(%q<require_all>, [">= 1.1.0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0.rc"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-    s.add_dependency(%q<require_all>, [">= 1.1.0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0.rc"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+    s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
   end
 end
 

data/lib/code_spec/matchers/content_matcher.rb

@@ -22,7 +22,7 @@ module RSpec
       @content = content
       match = is_match? content                                                        
       content_to_yield = if indexes
-        content_matches[indexes.first] || content_matches[indexes.last]
+        content_matches[indexes.last] || content_matches[indexes.first]
       else
         content_matches[index]
       end          
@@ -75,7 +75,7 @@ module RSpec
       OPT_SPACES + OPT_ARGS
     end
 
-    def args_expr
+    def args_expr    
       args ? OPT_SPACES + opt(LPAR) + OPT_SPACES + "#{args}" + OPT_SPACES + opt(RPAR) : ''
     end
 

data/lib/code_spec/matchers/have_call.rb

@@ -7,27 +7,43 @@
 #
 module RSpec::RubyContentMatchers
   class HaveCall < RSpec::RubyContentMatcher
-    attr_reader :method, :args, :dot, :content
+    attr_accessor :method_name, :args, :dot, :content
 
-    def initialize(method, options = {})
-      @method = method.to_s
-      @args = case options
-      when Hash 
+    def initialize(method_name, options = {})
+      self.method_name = method_name.to_s
+      self.args = case options
+      when Hash         
+        self.dot = options[:dot]
         options[:args] 
       else 
-        options
+        (options == {}) ? nil : options
       end
-      @dot = options[:dot]
+      
+      self.args = ":#{args}" if args.kind_of? Symbol      
     end
 
     def matches?(content)
       @content = content 
-      has_def = (content =~ /def(.*)#{method}/)
-      expr = if has_def || dot == :form
-        /#{dot_expr}#{method}#{args_expr}/m        
+      def_pos = (content =~ /def(.*)#{method_name}/) || 999
+      call_pos = (content =~ /[^def]?#{method_name}/) || 999
+
+      arguments_expr = case args
+      when String
+        args_expr
+      when Array 
+        args.inject("") do |res, arg|
+          res << '(\s|,|\w|:)*' + arg.inspect
+        end
+      else
+        return nil
+      end
+
+      expr = if (def_pos < call_pos) || dot == :form
+        /#{dot_expr}#{method_name}#{arguments_expr}/m        
       else
-        /#{dot_expr}?#{method}#{args_expr}/m
-      end   
+        /#{dot_expr}?#{method_name}#{arguments_expr}/m
+      end
+      @expr = expr   
       debug "expr = #{expr}"
       debug "content = %{#{content}}"
       debug "content =~ #{expr}"      
@@ -36,12 +52,12 @@ module RSpec::RubyContentMatchers
   
     def failure_message
       super
-      "Expected there to be a call to #{method}#{args_msg}, but there wasn't"
+      "Expected there to be a call to #{method_name}#{args_msg}, but there wasn't. Regexp: #{@expr} did not match\n#{@content}"
     end 
     
     def negative_failure_message
       super
-      "Did not expect there to be a call to #{method}#{args_msg}, but there was"
+      "Did not expect there to be a call to #{method_name}#{args_msg}, but there was"
     end
              
     protected
@@ -63,16 +79,16 @@ module RSpec::RubyContentMatchers
                    
   end
   
-  def have_call(method, options = {})
-    HaveCall.new(method, options)
+  def have_call(method_name, options = {})
+    HaveCall.new(method_name, options)
   end  
 
-  def have_dot_call(method, options = {})
-    have_call method, options.merge(:dot => true)
+  def have_dot_call(method_name, options = {})
+    have_call method_name, options.merge(:dot => true)
   end  
   
-  def have_form_call(method, options = {})
-    have_call method, options.merge(:dot => :form)
+  def have_form_call(method_name, options = {})
+    have_call method_name, options.merge(:dot => :form)
   end  
   
 end

data/lib/code_spec/matchers/have_method.rb

@@ -51,16 +51,19 @@ module RSpec::RubyContentMatchers
             
     def alt_end
       'def'
-    end               
-    
+    end
   end
   
   def have_method(method, type = nil)
     HaveMethod.new(method, type)
   end  
 
+  def have_class_method(method)
+    have_method method, :class
+  end  
+
   def have_args_method(method, options = {})
-    HaveMethod.new(method, options[:type], options)
+    have_method method, options[:type], options
   end  
 
 end

data/lib/code_spec/matchers/have_subclass.rb

@@ -1,22 +1,23 @@
 module RSpec::RubyContentMatchers
   class HaveSubclass < RSpec::RubyContentMatcher
-    attr_reader :klass, :superclass, :type
+    attr_reader :klass, :superclass, :type, :full_class
 
     def initialize(klass, superclass, type=nil)
-      @klass      = klass.to_s.camelize       
+      @klass      = klass.to_s.camelize              
       super @klass
       @superclass = superclass.to_s.camelize
-      @type       = type.to_s.camelize if type      
+      @type       = type.to_s.camelize if type
+      @full_class = "#{@klass}#{@type}"
     end
 
     def failure_message  
       super
-      "Expected there to be the subclass #{klass} of #{superclass}"
+      "Expected there to be the subclass #{full_class} of #{superclass}"
     end 
 
     def negative_failure_message
       super
-      "Did no expected there to be the subclass #{klass} of #{superclass}"
+      "Did no expected there to be the subclass #{full_class} of #{superclass}"
     end   
 
     protected 
@@ -34,7 +35,5 @@ module RSpec::RubyContentMatchers
   def have_subclass(klass, superclass, type=nil)
     HaveSubclass.new(klass, superclass, type)
   end    
-  alias_method :be_subclass, :have_subclass
-  
-
+  alias_method :be_subclass, :have_subclass  
 end

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

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe 'method call matcher with args' do      
+  context "content with call hello" do  
+    call = %{
+        devise :database_authenticatable, :confirmable, :recoverable, :rememberable, :trackable, :validatable
+    }
+    it "should have call to hello" do            
+      call.should have_call :devise, :args => [:confirmable, :trackable]
+      call.should_not have_call :devise, :args => [:confirmable, :trackable_ids]      
+    end
+  end 
+end

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

@@ -16,7 +16,7 @@ describe 'method call matcher' do
     it "should have call to hello" do            
       call.should have_call :hello
     end
-  end
+  end 
   
   context "content with call hello" do  
     call = %q{
@@ -42,6 +42,33 @@ describe 'method call matcher' do
       clazz.should have_call :role_strategy, :args => ':admin_flag'
     end
   end
+  
+  context "Migration should have usual structure" do    
+    migration_klass = %q{
+      class DoColumns < ActiveRecord::Migration
+        def self.up  
+          create_table :users do |t|
+            t.string  :name
+            t.integer :age
+            t.boolean :admin
+          end
+        end
+  
+        def self.down
+          drop_table :users  
+        end
+      end}
+        
+    it "should have call to role_strategy with args :admin_flag" 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
+  
+    end
+  end
 end
 
 

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
-require 'rspec'
-require 'rspec/autorun'
+require 'rspec/core'
 require 'code-spec'
 
 def fixtures_dir

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +02:00
+date: 2010-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,15 +23,15 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 19
-        version: 2.0.0.beta.19
+        - 22
+        version: 2.0.0.beta.22
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -55,14 +55,13 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
         - 0
-        - rc
-        version: 3.0.0.rc
+        version: 3.0.0
   type: :runtime
   version_requirements: *id003
 description: Code file RSpec 2 matchers that make it easy to spec Ruby code files, fx updated or generated by a Thor generator
@@ -90,11 +89,11 @@ files:
 - lib/code_spec/matchers/have_block.rb
 - lib/code_spec/matchers/have_call.rb
 - lib/code_spec/matchers/have_calls.rb
+- lib/code_spec/matchers/have_class_module.rb
 - lib/code_spec/matchers/have_class_self.rb
 - lib/code_spec/matchers/have_comment.rb
 - lib/code_spec/matchers/have_content.rb
 - lib/code_spec/matchers/have_method.rb
-- lib/code_spec/matchers/have_module.rb
 - lib/code_spec/matchers/have_region.rb
 - lib/code_spec/matchers/have_subclass.rb
 - lib/code_spec/matchers/include_module.rb
@@ -103,6 +102,7 @@ files:
 - spec/code-spec/fixtures/logfile.log
 - spec/code-spec/matchers/class_self_spec.rb
 - spec/code-spec/matchers/have_block_spec.rb
+- spec/code-spec/matchers/have_call_args.rb
 - spec/code-spec/matchers/have_call_spec.rb
 - spec/code-spec/matchers/have_calls_spec.rb
 - spec/code-spec/matchers/have_class_spec.rb
@@ -149,6 +149,7 @@ summary: Code file RSpec 2 matchers
 test_files: 
 - spec/code-spec/matchers/class_self_spec.rb
 - spec/code-spec/matchers/have_block_spec.rb
+- spec/code-spec/matchers/have_call_args.rb
 - spec/code-spec/matchers/have_call_spec.rb
 - spec/code-spec/matchers/have_calls_spec.rb
 - spec/code-spec/matchers/have_class_spec.rb