code-spec 0.2.3 → 0.2.4

data/Rakefile

@@ -9,6 +9,7 @@ begin
     gem.authors = ["Kristian Mandrup"]
     gem.add_development_dependency "rspec", "~> 2.0.0.beta.22"
     gem.add_dependency "require_all",       "~> 1.1.0"
+    gem.add_dependency "sugar-high",        "~> 0.2.10"
     gem.add_dependency "activesupport",     "~> 3.0.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/code-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{code-spec}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-09-16}
+  s.date = %q{2010-09-18}
   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 = [
@@ -42,6 +42,8 @@ Gem::Specification.new do |s|
      "lib/code_spec/matchers/include_module.rb",
      "lib/code_spec/matchers/inherit_from.rb",
      "lib/code_spec/matchers/match_lines.rb",
+     "lib/code_spec/matchers/multi/have_classes_modules.rb",
+     "lib/code_spec/matchers/multi/have_methods.rb",
      "spec/code-spec/fixtures/logfile.log",
      "spec/code-spec/matchers/class_self_spec.rb",
      "spec/code-spec/matchers/have_block_spec.rb",
@@ -56,6 +58,9 @@ Gem::Specification.new do |s|
      "spec/code-spec/matchers/include_module_spec.rb",
      "spec/code-spec/matchers/inherit_from_spec.rb",
      "spec/code-spec/matchers/match_content_spec.rb",
+     "spec/code-spec/matchers/multi/have_classes_spec.rb",
+     "spec/code-spec/matchers/multi/have_methods_spec.rb",
+     "spec/code-spec/matchers/multi/have_modules_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/kristianmandrup/code-spec}
@@ -77,6 +82,9 @@ Gem::Specification.new do |s|
      "spec/code-spec/matchers/include_module_spec.rb",
      "spec/code-spec/matchers/inherit_from_spec.rb",
      "spec/code-spec/matchers/match_content_spec.rb",
+     "spec/code-spec/matchers/multi/have_classes_spec.rb",
+     "spec/code-spec/matchers/multi/have_methods_spec.rb",
+     "spec/code-spec/matchers/multi/have_modules_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -87,15 +95,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       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<sugar-high>, ["~> 0.2.10"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
       s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
       s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
     s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
     s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
   end
 end

data/lib/code-spec.rb

@@ -1,6 +1,8 @@
-require 'rspec'
+require 'rspec/core'
 require 'require_all'      
 require 'active_support/inflector'      
+require 'sugar-high/arguments'
+require 'sugar-high/array'
 
 module RSpec
   module RubyContentMatchers

data/lib/code_spec/matchers/have_call.rb

@@ -31,7 +31,7 @@ module RSpec::RubyContentMatchers
       when String
         args_expr
       when Array 
-        args.inject("") do |res, arg|
+        args.flatten.inject("") do |res, arg|
           arg_val = (arg.kind_of?(String) && arg[0] == '#') ? arg[1..-1] : arg.inspect
           res << '(\s|,|\w|:)*' + arg_val
         end

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

@@ -0,0 +1,73 @@
+module RSpec::RubyContentMatchers
+  class HaveModules < RSpec::RubyContentMatcher
+    attr_reader :name, :names, :type, :postfix
+
+    def initialize(*names)
+      postfix = last_arg_value({:postfix => ''}, names)
+      @names = names.to_strings  
+      @postfix = postfix.to_s.camelize if postfix
+      @type = :module
+    end
+
+    def matches? content, &block
+      return false if names.empty?
+
+      @content = content
+
+      names.each do |name|       
+        @name = name.camelize     
+        @end_option = name        
+        match = is_match? content
+        return false if !match
+      end
+      true
+    end
+
+    def is_match? content
+      expr = get_expr(content) 
+      debug "match expression: #{expr}"
+      match = (content =~ expr)
+      @content_matches = [$1, $2, $3]
+      match
+    end
+  
+    def failure_message
+      super
+      "Expected there to be the #{type} #{name}"
+    end 
+    
+    def negative_failure_message
+      super
+      "Did not expected there to be the #{type} #{name}"
+    end
+
+    protected
+    
+    def main_expr
+      "#{type}" + SPACES + "#{name}#{postfix}" + SPACES + ANY_GROUP
+    end
+    
+    def alt_end
+      type
+    end
+  end
+
+  class HaveClasses < HaveModules
+
+    def initialize *names 
+      super *names
+      @type = :class
+    end            
+  end
+
+  # can take :postfix hash arg
+  def have_modules *names
+    HaveModules.new names
+  end       
+
+  # can take :postfix hash arg  
+  def have_classes *names
+    HaveClasses.new *names
+  end    
+  
+end  

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

@@ -0,0 +1,85 @@
+# This method tries to see if a specific method is contained in the generated file.
+# It can operate (should) on either a file name or the raw content 
+#
+#   generated_file_name.should have_method "hello" # 'my/path/say_hello.rb'.should have_method "hello"
+#
+#   say_hello_file_content.should have_method "hello"
+#
+module RSpec::RubyContentMatchers
+  class HaveMethods < RSpec::RubyContentMatcher
+    attr_reader :method, :type, :args, :names
+
+    def initialize *methods
+      options = last_option methods
+      @names = methods.to_strings
+      @type = options[:type]
+      @args = options[:args]
+    end
+
+    def matches? content, &block
+      return false if names.empty?
+
+      @content = content
+      names.each do |name|       
+        @method = name     
+        @end_option = name        
+        match = is_match? content
+        return false if !match
+      end
+      true
+    end
+
+    def is_match? content
+      expr = get_expr(content) 
+      debug "match expression: #{expr}"
+      match = (content =~ expr)
+      @content_matches = [$1, $2, $3]
+      match
+    end
+
+    def index
+      1
+    end          
+  
+    def failure_message
+      super
+      "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"
+    end
+
+    protected
+
+    def class_msg
+      (type == :class) ? 'class' : ''
+    end
+
+    def main_expr
+      'def' + SPACES + "#{self_expr}#{method}#{args_expr}" + ANY_GROUP
+    end
+
+    def args_expr
+      return super if args
+      any_args_expr
+    end
+       
+    def self_expr 
+      type == :class ? 'self.' : ''
+    end
+            
+    def alt_end
+      'def'
+    end
+  end
+  
+  def have_methods *methods
+    HaveMethods.new methods
+  end  
+
+  def have_class_methods *methods
+    have_methods *methods, :type => :class
+  end
+end

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

@@ -17,6 +17,7 @@ describe 'method call matcher with args' do
     }
     it "should have call to hello" do            
       call.should have_call :devise, :args => ['#confirm_me', "hello"]
+      call.should have_call :devise, :args => [['#confirm_me', "hello"]]
       call.should_not have_call :devise, :args => ['#hello']      
     end
   end 

data/spec/code-spec/matchers/multi/have_classes_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe 'classes matcher' do    
+  context "no class" do
+    no_class = %q{
+        module X
+          hello
+          hi
+        end
+    }    
+    
+    it "should not have class X" do            
+      no_class.should_not have_classes :x
+    end
+  end
+
+  context "content with class X" do  
+    class_x = %q{
+      class X
+        def hello
+          blip
+        end
+      end
+    }    
+    it "should have class x" do
+      class_x.should have_classes [:x]
+      class_x.should_not have_classes :x, :y
+    end
+  end
+  
+  context "content with class X and Y" do  
+    classs_x_y = %q{
+      class X
+        def hello
+          blip
+        end
+      end
+
+      class Y
+        def hello
+          blip
+        end
+      end
+    }    
+    it "should have classs x and y" do            
+      classs_x_y.should have_classes :x, :y
+    end
+  end
+end

data/spec/code-spec/matchers/multi/have_methods_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe 'method matcher' do    
+  context "content without method" do
+    no_method = %q{
+        class X
+          hello
+          hi
+        end}    
+    
+    it "should not have method hello" do            
+      no_method.should_not have_methods :hello, :hi do |content|
+        content.should_not be_empty
+      end
+    end
+  end
+
+  context "content with method hello" do  
+    with_method = %q{
+        def hello
+          blip
+        end
+    }    
+    it "should have method hello" do            
+      with_method.should have_methods :hello
+      with_method.should_not have_methods :hi
+      with_method.should_not have_methods :hello, :hi
+    end
+  end
+  
+  context "content with method hello" do  
+    with_method = %q{
+        def hello
+          blip
+        end
+
+        def hi
+          blip
+        end        
+    }    
+    it "should have method hello" do            
+      with_method.should have_methods :hello, :hi
+    end
+  end
+end

data/spec/code-spec/matchers/multi/have_modules_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe 'modules matcher' do    
+  context "no module" do
+    no_module = %q{
+        class X
+          hello
+          hi
+        end
+    }    
+    
+    it "should not have module X" do            
+      no_module.should_not have_modules :x
+    end
+  end
+
+  context "content with module X" do  
+    module_x = %q{
+      module X
+        def hello
+          blip
+        end
+      end
+    }    
+    it "should have module x" do
+      module_x.should have_modules :x
+      module_x.should_not have_modules :x, :y
+    end
+  end
+  
+  context "content with module X and Y" do  
+    modules_x_y = %q{
+      module X
+        def hello
+          blip
+        end
+      end
+
+      module Y
+        def hello
+          blip
+        end
+      end
+    }    
+    it "should have modules x and y" do            
+      modules_x_y.should have_modules :x, :y
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 +02:00
+date: 2010-09-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,9 +50,24 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: sugar-high
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 10
+        version: 0.2.10
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,7 +78,7 @@ dependencies:
         - 0
         version: 3.0.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 description: Code file RSpec 2 matchers that make it easy to spec Ruby code files, fx updated or generated by a Thor generator
 email: kmandrup@gmail.com
 executables: []
@@ -99,6 +114,8 @@ files:
 - lib/code_spec/matchers/include_module.rb
 - lib/code_spec/matchers/inherit_from.rb
 - lib/code_spec/matchers/match_lines.rb
+- lib/code_spec/matchers/multi/have_classes_modules.rb
+- lib/code_spec/matchers/multi/have_methods.rb
 - spec/code-spec/fixtures/logfile.log
 - spec/code-spec/matchers/class_self_spec.rb
 - spec/code-spec/matchers/have_block_spec.rb
@@ -113,6 +130,9 @@ files:
 - spec/code-spec/matchers/include_module_spec.rb
 - spec/code-spec/matchers/inherit_from_spec.rb
 - spec/code-spec/matchers/match_content_spec.rb
+- spec/code-spec/matchers/multi/have_classes_spec.rb
+- spec/code-spec/matchers/multi/have_methods_spec.rb
+- spec/code-spec/matchers/multi/have_modules_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/code-spec
@@ -160,4 +180,7 @@ test_files:
 - spec/code-spec/matchers/include_module_spec.rb
 - spec/code-spec/matchers/inherit_from_spec.rb
 - spec/code-spec/matchers/match_content_spec.rb
+- spec/code-spec/matchers/multi/have_classes_spec.rb
+- spec/code-spec/matchers/multi/have_methods_spec.rb
+- spec/code-spec/matchers/multi/have_modules_spec.rb
 - spec/spec_helper.rb