covenant 0.0.1 → 0.6.0

data/lib/covenant/version.rb

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

data/lib/covenant.rb

@@ -1,7 +1,3 @@
-require 'covenant/assertions/is_a'
-require 'covenant/assertions/is'
-require 'covenant/assertions/query'
-
 module Covenant
   # Adds the Covenant DSL to base.
   #
@@ -34,6 +30,8 @@ module Covenant
       end
     end
 
+    alias_method :asserting, :assert
+
     # Ensures that the condition on target evaluates to a false value.
     #
     # @api public
@@ -49,16 +47,48 @@ module Covenant
         Covenant::Denial.new(target, message)
       end
     end
+
+    alias_method :denying, :deny
   end
 
   class AssertionFailed < Exception; end
 
-  class Statement
-    include Assertions
-
+  class Statement < BasicObject
     def initialize(target, message)
-      @target = target
-      @message   = message
+      @target  = target
+      @message = message
+    end
+
+    def ==(other)
+      test(target == other, ErrorMessage.new(target, :==, [other]))
+    end
+
+    def !=(other)
+      test(target != other, ErrorMessage.new(target, :!=, [other]))
+    end
+
+    def method_missing(name, *args)
+      if target.respond_to?(name)
+        return test(target.send(name, *args),
+                    ErrorMessage.new(target, name, args))
+      end
+
+      query = "#{name}?"
+
+      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
     end
 
     protected
@@ -69,30 +99,74 @@ module Covenant
       msg = self.message || message
 
       if msg
-        raise AssertionFailed, msg
+        ::Kernel.raise AssertionFailed, msg
       else
-        raise AssertionFailed
+        ::Kernel.raise AssertionFailed
+      end
+    end
+
+    class NullErrorMessage
+      def for_assertion; end
+      def for_denial; end
+    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 for_denial
+        error_message('should be false')
+      end
+
+      private
+
+      def error_message(expected)
+        argl = args.map(&:inspect).join(", ")
+
+        "#{target.inspect}.#{message} #{argl} #{expected}"
       end
     end
   end
 
   class Assertion < Statement
-    def test(condition, message = nil, _ = nil)
+    def test(condition, error_message = NullErrorMessage.new)
       if condition
         target
       else
-        raise_error message
+        raise_error error_message.for_assertion
       end
     end
   end
 
   class Denial < Statement
-    def test(condition, _ = nil, message = nil)
+    def test(condition, error_message = NullErrorMessage.new)
       if ! condition
         target
       else
-        raise_error message
+        raise_error error_message.for_denial
       end
     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.0.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76572980 !ruby/object:Gem::Requirement
+  requirement: &86482920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *76572980
+  version_requirements: *86482920
 description: 
 email:
 - gems@mojotech.com
@@ -30,9 +30,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/covenant.rb
-- lib/covenant/assertions/is.rb
-- lib/covenant/assertions/is_a.rb
-- lib/covenant/assertions/query.rb
 - lib/covenant/version.rb
 homepage: https://github.com/mojotech/covenant
 licenses: []

data/lib/covenant/assertions/is.rb

@@ -1,21 +0,0 @@
-module Covenant
-  module Assertions
-    module Is
-      def method_missing(name, *args)
-        strip = name.to_s.sub(/^is_/, '')
-        query = "#{strip}?"
-        argl  = args.map(&:inspect).join(", ")
-
-        if target.respond_to?(query)
-          test target.send(query, *args),
-               "#{target.inspect} must be #{strip} #{argl}",
-               "#{target.inspect} must not be #{strip} #{argl}"
-        else
-          super
-        end
-      end
-
-      Covenant::Assertions.send :include, self
-    end
-  end
-end

data/lib/covenant/assertions/is_a.rb

@@ -1,18 +0,0 @@
-module Covenant
-  module Assertions
-    module IsA
-      def is_a(type)
-        type.is_a?(Class) or
-         raise ArgumentError, "#{type.inspect} must be a Class"
-
-        test target.is_a?(type),
-             "#{target.inspect} must be a #{type.name}",
-             "#{target.inspect} must not be a #{type.name}"
-      end
-
-      alias_method :is_an, :is_a
-
-      Covenant::Assertions.send :include, self
-    end
-  end
-end

data/lib/covenant/assertions/query.rb

@@ -1,20 +0,0 @@
-module Covenant
-  module Assertions
-    module Query
-      def method_missing(name, *args)
-        query = "#{name}?"
-        argl  = args.map(&:inspect).join(", ")
-
-        if target.respond_to?(query)
-          test target.send(query, *args),
-               "#{target.inspect} must #{name} #{argl}",
-               "#{target.inspect} must not #{name} #{argl}"
-        else
-          super
-        end
-      end
-
-      Covenant::Assertions.send :include, self
-    end
-  end
-end