spicycode-micronaut 0.0.2 → 0.0.3

data/lib/micronaut/matchers/be_close.rb

@@ -1,37 +1,21 @@
 module Micronaut
   module Matchers
 
-    class BeClose #:nodoc:
-      def initialize(expected, delta)
-        @expected = expected
-        @delta = delta
-      end
-      
-      def matches?(given)
-        @given = given
-        (@given - @expected).abs < @delta
-      end
-      
-      def failure_message
-        "expected #{@expected} +/- (< #{@delta}), got #{@given}"
-      end
-      
-      def description
-        "be close to #{@expected} (within +- #{@delta})"
-      end
-    end
-    
     # :call-seq:
     #   should be_close(expected, delta)
     #   should_not be_close(expected, delta)
     #
-    # Passes if given == expected +/- delta
+    # Passes if actual == expected +/- delta
     #
     # == Example
     #
     #   result.should be_close(3.0, 0.5)
     def be_close(expected, delta)
-      Matchers::BeClose.new(expected, delta)
+      simple_matcher do |actual, matcher|
+        matcher.failure_message = "expected #{expected} +/- (< #{delta}), got #{actual}"
+        matcher.description = "be close to #{expected} (within +- #{delta})"
+        (actual - expected).abs < delta
+      end
     end
   end
 end

data/lib/micronaut/matchers/eql.rb

@@ -1,34 +1,11 @@
 module Micronaut
   module Matchers
   
-    class Eql #:nodoc:
-      def initialize(expected)
-        @expected = expected
-      end
-  
-      def matches?(given)
-        @given = given
-        @given.eql?(@expected)
-      end
-
-      def failure_message
-        return "expected #{@expected.inspect}, got #{@given.inspect} (using .eql?)", @expected, @given
-      end
-      
-      def negative_failure_message
-        return "expected #{@given.inspect} not to equal #{@expected.inspect} (using .eql?)", @expected, @given
-      end
-
-      def description
-        "eql #{@expected.inspect}"
-      end
-    end
-    
     # :call-seq:
     #   should eql(expected)
     #   should_not eql(expected)
     #
-    # Passes if given and expected are of equal value, but not necessarily the same object.
+    # Passes if actual and expected are of equal value, but not necessarily the same object.
     #
     # See http://www.ruby-doc.org/core/classes/Object.html#M001057 for more information about equality in Ruby.
     #
@@ -37,7 +14,12 @@ module Micronaut
     #   5.should eql(5)
     #   5.should_not eql(3)
     def eql(expected)
-      Matchers::Eql.new(expected)
+      simple_matcher do |actual, matcher|
+        matcher.failure_message          = "expected #{expected.inspect}, got #{actual.inspect} (using .eql?)", expected, actual
+        matcher.negative_failure_message = "expected #{actual.inspect} not to equal #{expected.inspect} (using .eql?)", expected, actual
+        matcher.description              = "eql #{expected.inspect}"
+        actual.eql?(expected)
+      end
     end
   end
 end

data/lib/micronaut/matchers/equal.rb

@@ -1,29 +1,6 @@
 module Micronaut
   module Matchers
   
-    class Equal #:nodoc:
-      def initialize(expected)
-        @expected = expected
-      end
-  
-      def matches?(given)
-        @given = given
-        @given.equal?(@expected)
-      end
-
-      def failure_message
-        return "expected #{@expected.inspect}, got #{@given.inspect} (using .equal?)", @expected, @given
-      end
-
-      def negative_failure_message
-        return "expected #{@given.inspect} not to equal #{@expected.inspect} (using .equal?)", @expected, @given
-      end
-      
-      def description
-        "equal #{@expected.inspect}"
-      end
-    end
-    
     # :call-seq:
     #   should equal(expected)
     #   should_not equal(expected)
@@ -37,7 +14,12 @@ module Micronaut
     #   5.should equal(5) #Fixnums are equal
     #   "5".should_not equal("5") #Strings that look the same are not the same object
     def equal(expected)
-      Matchers::Equal.new(expected)
+      simple_matcher do |actual, matcher|
+        matcher.failure_message          = "expected #{expected.inspect}, got #{actual.inspect} (using .equal?)", expected, actual
+        matcher.negative_failure_message = "expected #{actual.inspect} not to equal #{expected.inspect} (using .equal?)", expected, actual
+        matcher.description              = "equal #{expected.inspect}"
+        actual.equal?(expected)
+      end
     end
   end
 end

data/lib/micronaut/matchers/exist.rb

@@ -1,22 +1,16 @@
 module Micronaut
   module Matchers
-    class Exist
-      def matches?(given)
-        @given = given
-        @given.exist?
-      end
-      def failure_message
-        "expected #{@given.inspect} to exist, but it doesn't."
-      end
-      def negative_failure_message
-        "expected #{@given.inspect} to not exist, but it does."
-      end
-    end
     # :call-seq:
     #   should exist
     #   should_not exist
     #
-    # Passes if given.exist?
-    def exist; Exist.new; end
+    # Passes if actual.exist?
+    def exist
+      simple_matcher do |actual, matcher|
+        matcher.failure_message = "expected #{actual.inspect} to exist, but it doesn't."
+        matcher.negative_failure_message = "expected #{actual.inspect} to not exist, but it does."
+        actual.exist?
+      end
+    end
   end
 end

data/lib/micronaut/matchers/has.rb

@@ -1,34 +1,18 @@
 module Micronaut
   module Matchers
-    
-    class Has #:nodoc:
-      def initialize(sym, *args)
-        @sym = sym
-        @args = args
-      end
-      
-      def matches?(given)
-        given.__send__(predicate, *@args)
-      end
-      
-      def failure_message
-        "expected ##{predicate}(#{@args[0].inspect}) to return true, got false"
-      end
-      
-      def negative_failure_message
-        "expected ##{predicate}(#{@args[0].inspect}) to return false, got true"
+    def has(sym, *args) # :nodoc:
+      simple_matcher do |actual, matcher|
+        matcher.failure_message          = "expected ##{predicate(sym)}(#{args[0].inspect}) to return true, got false"
+        matcher.negative_failure_message = "expected ##{predicate(sym)}(#{args[0].inspect}) to return false, got true"
+        matcher.description              = "have key #{args[0].inspect}"
+        actual.__send__(predicate(sym), *args)
       end
-      
-      def description
-        "have key #{@args[0].inspect}"
-      end
-      
-      private
-        def predicate
-          "#{@sym.to_s.sub("have_","has_")}?".to_sym
-        end
-        
     end
- 
+    
+  private
+    def predicate(sym)
+      "#{sym.to_s.sub("have_","has_")}?".to_sym
+    end
+
   end
 end

data/lib/micronaut/matchers/include.rb

@@ -7,16 +7,19 @@ module Micronaut
         @expecteds = expecteds
       end
       
-      def matches?(given)
-        @given = given
+      def matches?(actual)
+        @actual = actual
         @expecteds.each do |expected|
-          case given
-          when Hash
-            expected.each_pair do |k,v|
-              return false unless given[k] == v
+          if actual.is_a?(Hash)
+            if expected.is_a?(Hash)
+              expected.each_pair do |k,v|
+                return false unless actual[k] == v
+              end
+            else
+              return false unless actual.has_key?(expected)
             end
           else
-            return false unless given.include?(expected)
+            return false unless actual.include?(expected)
           end
         end
         true
@@ -36,7 +39,7 @@ module Micronaut
       
       private
         def _message(maybe_not="")
-          "expected #{@given.inspect} #{maybe_not}to include #{_pretty_print(@expecteds)}"
+          "expected #{@actual.inspect} #{maybe_not}to include #{_pretty_print(@expecteds)}"
         end
         
         def _pretty_print(array)
@@ -58,7 +61,7 @@ module Micronaut
     #   should include(expected)
     #   should_not include(expected)
     #
-    # Passes if given includes expected. This works for
+    # Passes if actual includes expected. This works for
     # collections and Strings. You can also pass in multiple args
     # and it will only pass if all args are found in collection.
     #

data/lib/micronaut/matchers/match.rb

@@ -1,41 +1,22 @@
 module Micronaut
   module Matchers
     
-    class Match #:nodoc:
-      def initialize(regexp)
-        @regexp = regexp
-      end
-      
-      def matches?(given)
-        @given = given
-        return true if given =~ @regexp
-        return false
-      end
-      
-      def failure_message
-        return "expected #{@given.inspect} to match #{@regexp.inspect}", @regexp, @given
-      end
-      
-      def negative_failure_message
-        return "expected #{@given.inspect} not to match #{@regexp.inspect}", @regexp, @given
-      end
-      
-      def description
-        "match #{@regexp.inspect}"
-      end
-    end
-    
     # :call-seq:
     #   should match(regexp)
     #   should_not match(regexp)
     #
-    # Given a Regexp, passes if given =~ regexp
+    # Given a Regexp, passes if actual =~ regexp
     #
     # == Examples
     #
-    #   email.should match(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i)
+    #   email.should match(/^([^\s]+)((?:[-a-z0-9]+\.)+[a-z]{2,})$/i)
     def match(regexp)
-      Matchers::Match.new(regexp)
+      simple_matcher do |actual, matcher|
+        matcher.failure_message          = "expected #{actual.inspect} to match #{regexp.inspect}", regexp, actual
+        matcher.negative_failure_message = "expected #{actual.inspect} not to match #{regexp.inspect}", regexp, actual
+        matcher.description              = "match #{regexp.inspect}"
+        actual =~ regexp
+      end
     end
   end
 end

data/lib/micronaut/matchers/method_missing.rb

@@ -2,7 +2,7 @@ module Micronaut
   module Matchers
     def method_missing(sym, *args, &block) # :nodoc:
       return Matchers::Be.new(sym, *args) if sym.starts_with?("be_")
-      return Matchers::Has.new(sym, *args) if sym.starts_with?("have_")
+      return has(sym, *args) if sym.starts_with?("have_")
       super
     end
   end

data/lib/micronaut/matchers/operator_matcher.rb

@@ -1,40 +1,20 @@
 module Micronaut
   module Matchers
-    class BaseOperatorMatcher
-      def initialize(given)
-        @given = given
+    class OperatorMatcher
+      def initialize(actual)
+        @actual = actual
       end
-
-      def ==(expected)
-        __delegate_method_missing_to_given("==", expected)
-      end
-
-      def ===(expected)
-        __delegate_method_missing_to_given("===", expected)
-      end
-
-      def =~(expected)
-        __delegate_method_missing_to_given("=~", expected)
-      end
-
-      def >(expected)
-        __delegate_method_missing_to_given(">", expected)
-      end
-
-      def >=(expected)
-        __delegate_method_missing_to_given(">=", expected)
-      end
-
-      def <(expected)
-        __delegate_method_missing_to_given("<", expected)
-      end
-
-      def <=(expected)
-        __delegate_method_missing_to_given("<=", expected)
+      
+      ['==','===','<','<=','>=','>','=~'].each do |operator|
+        define_method operator do |expected|
+          ::Micronaut::Matchers.last_matcher = self
+          @operator, @expected = operator, expected
+          __delegate_operator(@actual, operator, expected)
+        end
       end
 
       def fail_with_message(message)
-        Micronaut::Expectations.fail_with(message, @expected, @given)
+        Micronaut::Expectations.fail_with(message, @expected, @actual)
       end
       
       def description
@@ -43,27 +23,24 @@ module Micronaut
 
     end
 
-    class PositiveOperatorMatcher < BaseOperatorMatcher #:nodoc:
+    class PositiveOperatorMatcher < OperatorMatcher #:nodoc:
 
-      def __delegate_method_missing_to_given(operator, expected)
-        @expected = expected
-        @operator = operator
-        ::Micronaut::Matchers.last_matcher = self
-        return true if @given.__send__(operator, expected)
-        return fail_with_message("expected: #{expected.inspect},\n     got: #{@given.inspect} (using #{operator})") if ['==','===', '=~'].include?(operator)
-        return fail_with_message("expected: #{operator} #{expected.inspect},\n     got: #{operator.gsub(/./, ' ')} #{@given.inspect}")
+      def __delegate_operator(actual, operator, expected)
+        return true if actual.__send__(operator, expected)
+        if ['==','===', '=~'].include?(operator)
+          fail_with_message("expected: #{expected.inspect},\n     got: #{actual.inspect} (using #{operator})") 
+        else
+          fail_with_message("expected: #{operator} #{expected.inspect},\n     got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
+        end
       end
 
     end
 
-    class NegativeOperatorMatcher < BaseOperatorMatcher #:nodoc:
+    class NegativeOperatorMatcher < OperatorMatcher #:nodoc:
 
-      def __delegate_method_missing_to_given(operator, expected)
-        @expected = expected
-        @operator = operator
-        ::Micronaut::Matchers.last_matcher = self
-        return true unless @given.__send__(operator, expected)
-        return fail_with_message("expected not: #{operator} #{expected.inspect},\n         got: #{operator.gsub(/./, ' ')} #{@given.inspect}")
+      def __delegate_operator(actual, operator, expected)
+        return true unless actual.__send__(operator, expected)
+        return fail_with_message("expected not: #{operator} #{expected.inspect},\n         got: #{operator.gsub(/./, ' ')} #{actual.inspect}")
       end
 
     end

data/lib/micronaut/matchers/raise_error.rb

@@ -47,20 +47,16 @@ module Micronaut
       def verify_message
         case @expected_message
         when nil
-          return true
+          true
         when Regexp
-          return @expected_message =~ @given_error.message
+          @expected_message =~ @given_error.message
         else
-          return @expected_message == @given_error.message
+          @expected_message == @given_error.message
         end
       end
       
       def failure_message
-        if @eval_block
-          return @given_error.message
-        else
-          return "expected #{expected_error}#{given_error}"
-        end
+        @eval_block ? @given_error.message : "expected #{expected_error}#{given_error}"
       end
 
       def negative_failure_message

data/lib/micronaut/matchers/respond_to.rb

@@ -26,7 +26,8 @@ module Micronaut
       end
       
       def description
-        "respond to ##{@names.to_s}"
+        # Ruby 1.9 returns the same thing for array.to_s as array.inspect, so just use array.inspect here
+        "respond to #{@names.inspect}"
       end
     end
     

data/lib/micronaut/matchers/throw_symbol.rb

@@ -21,9 +21,13 @@ module Micronaut
             end
             @caught_symbol = @expected_symbol unless @caught_arg == :nothing_thrown
           end
-        rescue NameError => e
-          raise e unless e.message =~ /uncaught throw/
-          @caught_symbol = e.name.to_sym
+
+        # Ruby 1.8 uses NameError with `symbol'
+        # Ruby 1.9 uses ArgumentError with :symbol
+        rescue NameError, ArgumentError => e
+          raise e unless e.message =~ /uncaught throw (`|\:)([a-zA-Z0-9_]*)(')?/
+          @caught_symbol = $2.to_sym
+
         ensure
           if @expected_symbol.nil?
             return !@caught_symbol.nil?
@@ -31,6 +35,8 @@ module Micronaut
             if @expected_arg.nil?
               return @caught_symbol == @expected_symbol
             else
+              # puts [@caught_symbol, @expected_symbol].inspect
+              # puts [@caught_arg, @expected_arg].inspect
               return @caught_symbol == @expected_symbol && @caught_arg == @expected_arg
             end
           end

data/lib/micronaut/matchers.rb

@@ -1,6 +1,5 @@
 require 'micronaut/matchers/generated_descriptions'
 require 'micronaut/matchers/errors'
-require 'micronaut/matchers/method_missing'
 require 'micronaut/matchers/simple_matcher'
 require 'micronaut/matchers/be'
 require 'micronaut/matchers/be_close'
@@ -20,7 +19,7 @@ require 'micronaut/matchers/operator_matcher'
 
 module Micronaut
 
-  # We ship with a number of useful Expression Matchers. An Expression Matcher
+  # We ship (courtesy of OSS and RMicronaut) with a number of useful Expression Matchers. An Expression Matcher
   # is any object that responds to the following methods:
   #
   #   matches?(actual)
@@ -136,6 +135,14 @@ module Micronaut
   #   end
   #
   module Matchers
-  
+    
+    private
+    def method_missing(sym, *args, &block) # :nodoc:
+      return Matchers::Be.new(sym, *args) if sym.starts_with?("be_")
+      return has(sym, *args) if sym.starts_with?("have_")
+      super
+    end
+      
   end
+  
 end

data/lib/micronaut/mocking/with_mocha.rb

@@ -5,7 +5,6 @@ module Micronaut
   module Mocking
     module WithMocha
       include Mocha::Standalone
-    
       def setup_mocks
         mocha_setup
       end

data/lib/micronaut.rb

@@ -1,10 +1,10 @@
 require 'micronaut/mocking/with_mocha'
-require 'micronaut/exceptions'
 require 'micronaut/matchers'
 require 'micronaut/expectations'
 require 'micronaut/example_world'
 require 'micronaut/example_runner'
-require 'micronaut/example_group'
+require 'micronaut/behaviour_group_class_methods'
+require 'micronaut/behaviour_group'
 require 'micronaut/extensions/kernel'
 
 module Micronaut
@@ -30,7 +30,7 @@ module Micronaut
 
     new_backtrace = []
     backtrace.each_with_index do |line, index|
-      break if line.rindex(MICRONAUT_DIR, 0) && index > 2
+      break if line.rindex(MICRONAUT_DIR, 0)
       new_backtrace << line
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire: micronaut
 bindir: bin
 cert_chain: []
 
-date: 2008-11-21 00:00:00 -08:00
+date: 2008-11-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,16 +38,19 @@ files:
 - lib/autotest/discover.rb
 - lib/autotest/micronaut.rb
 - lib/micronaut
-- lib/micronaut/example_group.rb
+- lib/micronaut/behaviour_group.rb
+- lib/micronaut/behaviour_group_class_methods.rb
 - lib/micronaut/example_runner.rb
 - lib/micronaut/example_world.rb
-- lib/micronaut/exceptions.rb
 - lib/micronaut/expectations
 - lib/micronaut/expectations/differs
 - lib/micronaut/expectations/differs/default.rb
+- lib/micronaut/expectations/errors.rb
+- lib/micronaut/expectations/extensions
+- lib/micronaut/expectations/extensions/object.rb
+- lib/micronaut/expectations/extensions/string_and_symbol.rb
+- lib/micronaut/expectations/extensions.rb
 - lib/micronaut/expectations/handler.rb
-- lib/micronaut/expectations/object_extensions.rb
-- lib/micronaut/expectations/string_and_symbol_extensions.rb
 - lib/micronaut/expectations/wrap_expectation.rb
 - lib/micronaut/expectations.rb
 - lib/micronaut/extensions
@@ -79,7 +82,7 @@ files:
 - examples/example_helper.rb
 - examples/lib
 - examples/lib/micronaut
-- examples/lib/micronaut/example_group_example.rb
+- examples/lib/micronaut/behaviour_group_example.rb
 - examples/lib/micronaut/example_runner_example.rb
 - examples/lib/micronaut/expectations
 - examples/lib/micronaut/expectations/differs
@@ -89,7 +92,28 @@ files:
 - examples/lib/micronaut/expectations/fail_with_example.rb
 - examples/lib/micronaut/expectations/wrap_expectation_example.rb
 - examples/lib/micronaut/matchers
+- examples/lib/micronaut/matchers/be_close_example.rb
+- examples/lib/micronaut/matchers/be_example.rb
+- examples/lib/micronaut/matchers/change_example.rb
+- examples/lib/micronaut/matchers/description_generation_example.rb
+- examples/lib/micronaut/matchers/eql_example.rb
+- examples/lib/micronaut/matchers/equal_example.rb
+- examples/lib/micronaut/matchers/exist_example.rb
+- examples/lib/micronaut/matchers/handler_example.rb
+- examples/lib/micronaut/matchers/has_example.rb
+- examples/lib/micronaut/matchers/have_example.rb
+- examples/lib/micronaut/matchers/include_example.rb
+- examples/lib/micronaut/matchers/match_example.rb
+- examples/lib/micronaut/matchers/matcher_methods_example.rb
+- examples/lib/micronaut/matchers/operator_matcher_example.rb
+- examples/lib/micronaut/matchers/raise_error_example.rb
+- examples/lib/micronaut/matchers/respond_to_example.rb
+- examples/lib/micronaut/matchers/satisfy_example.rb
+- examples/lib/micronaut/matchers/simple_matcher_example.rb
+- examples/lib/micronaut/matchers/throw_symbol_example.rb
 - examples/lib/micronaut_example.rb
+- examples/resources
+- examples/resources/example_classes.rb
 has_rdoc: true
 homepage: http://spicycode.com
 post_install_message: