covenant 0.6.0 → 0.7.0

data/lib/covenant/version.rb

@@ -1,3 +1,3 @@
 module Covenant
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/covenant.rb

@@ -1,15 +1,27 @@
+require 'sourcify'
+
 module Covenant
   # Adds the Covenant DSL to base.
   #
   # @api public
   #
   # @param base where to add the Covenant DSL
-  def self.abide(base = Object)
-    case base
-    when Class
-      base.send :include, Covenant::DSL
-    else
-      base.extend Covenant::DSL
+  def self.abide(base = Object, as = [:assert, :asserting])
+    target = Class === base ? base : base.singleton_class
+
+    target.class_eval do
+      include Covenant::DSL
+
+      case as
+      when Array
+        as.each do |a|
+          alias_method a, :_assert
+        end
+      when Symbol, String
+        alias_method as, :_assert
+      else
+        raise ArgumentError, "cannot register `#{as.inspect}` as method names"
+      end
     end
   end
 
@@ -22,151 +34,57 @@ module Covenant
     # @param [#to_s] message the message that will be set if the test fails
     #
     # @return the wrapper object you can use to test your assertions
-    def assert(target = self, message = nil)
-      if block_given?
-        Covenant::Assertion.new(target, message).test(yield target)
-      else
-        Covenant::Assertion.new(target, message)
-      end
-    end
-
-    alias_method :asserting, :assert
+    def _assert(&block)
+      raise ArgumentError, "no block given" unless block_given?
 
-    # Ensures that the condition on target evaluates to a false value.
-    #
-    # @api public
-    #
-    # @param target the target on which to test the condition
-    # @param message the message that will be set if the test fails
-    #
-    # @return the wrapper object you can use to test your assertions
-    def deny(target = self, message = nil)
-      if block_given?
-        Covenant::Denial.new(target, message).test(yield target)
-      else
-        Covenant::Denial.new(target, message)
-      end
+      tap { yield self or raise AssertionFailed, ErrorMessage.new(block) }
     end
-
-    alias_method :denying, :deny
   end
 
-  class AssertionFailed < Exception; end
+  class AssertionFailed < StandardError; end
 
-  class Statement < BasicObject
-    def initialize(target, message)
-      @target  = target
-      @message = message
+  class ErrorMessage
+    def initialize(block)
+      @block = block
     end
 
-    def ==(other)
-      test(target == other, ErrorMessage.new(target, :==, [other]))
+    def to_s
+      "block did not return true:\n\n#{source_block}\n\n#{variable_block}"
     end
 
-    def !=(other)
-      test(target != other, ErrorMessage.new(target, :!=, [other]))
-    end
+    private
 
-    def method_missing(name, *args)
-      if target.respond_to?(name)
-        return test(target.send(name, *args),
-                    ErrorMessage.new(target, name, args))
-      end
-
-      query = "#{name}?"
+    attr_reader :block
 
-      if target.respond_to?(query)
-        return test(target.send(query, *args),
-                    ErrorMessage.new(target, query, args))
-      end
-
-      no_is    = name.to_s.sub(/^is_/, '')
-      is_query = "#{no_is}?"
-
-      if target.respond_to?(is_query)
-        return test(target.send(is_query, *args),
-                    ErrorMessage.new(target, is_query, args))
-      end
-
-      super
+    def indent(str)
+      "  " + str.gsub(/\n/, "\n  ").strip
     end
 
-    protected
-
-    attr_reader :target, :message
-
-    def raise_error(message)
-      msg = self.message || message
-
-      if msg
-        ::Kernel.raise AssertionFailed, msg
-      else
-        ::Kernel.raise AssertionFailed
-      end
+    def source
+      block.to_source
     end
 
-    class NullErrorMessage
-      def for_assertion; end
-      def for_denial; end
+    def source_block
+      "Source:\n\n#{indent(source)}"
     end
 
-    class ErrorMessage
-      attr_reader :target, :message, :args
-
-      def initialize(target, message, args)
-        @target  = target
-        @message = message
-        @args    = args
-      end
-
-      def for_assertion
-        error_message('should be true')
-      end
+    def variable_block
+      b = variables.
+       inject("") { |a, (var, val)|
+        a << "#{var} = #{val.inspect}\n"
+      }
 
-      def for_denial
-        error_message('should be false')
-      end
-
-      private
-
-      def error_message(expected)
-        argl = args.map(&:inspect).join(", ")
-
-        "#{target.inspect}.#{message} #{argl} #{expected}"
-      end
+      "Variables:\n\n" + indent(b)
     end
-  end
 
-  class Assertion < Statement
-    def test(condition, error_message = NullErrorMessage.new)
-      if condition
-        target
-      else
-        raise_error error_message.for_assertion
-      end
-    end
-  end
+    def variables
+      s  = source
+      b  = block.binding
+      lv = b.eval('local_variables')
 
-  class Denial < Statement
-    def test(condition, error_message = NullErrorMessage.new)
-      if ! condition
-        target
-      else
-        raise_error error_message.for_denial
-      end
+      lv.
+       select { |v| s =~ /\b#{v}\b/ }.
+       map    { |v| [v, b.eval(v.to_s)] }
     end
   end
 end
-
-=begin
-
-require 'benchmark'
-
-Covenant.abide self
-
-Benchmark.bm do |x|
-  x.report { 1_000_000.times { assert('aaa').start_with 'a' } }
-  x.report { 1_000_000.times { 'aaa'.start_with? 'a' } }
-end
-
-=end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covenant
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sourcify
+  requirement: &84448700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0.pre
+  type: :runtime
+  prerelease: false
+  version_requirements: *84448700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &86482920 !ruby/object:Gem::Requirement
+  requirement: &84448470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +32,7 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *86482920
+  version_requirements: *84448470
 description: 
 email:
 - gems@mojotech.com