spectre-core 1.8.4 → 1.12.0

data/lib/spectre/assertion.rb

@@ -1,3 +1,5 @@
+require_relative '../spectre'
+
 require 'ostruct'
 require_relative 'logger'
 
@@ -6,19 +8,19 @@ module Spectre
   module Assertion
     class ::Object
       def should_be(val)
-          raise AssertionFailure.new("The value '#{self.to_s.trim}' should be '#{val.to_s.trim}'", val, self) unless self.to_s == val.to_s
+        raise AssertionFailure.new("The value '#{self.to_s.trim}' should be '#{val.to_s.trim}'", val, self) unless self.to_s == val.to_s
       end
 
       def should_be_empty
-        raise AssertionFailure.new("The value '#{self.to_s.trim}' should be empty", nil, self) unless self == nil
+        raise AssertionFailure.new("The value '#{self.to_s.trim}' should be empty", nil, self) unless self.nil?
       end
 
       def should_not_be(val)
-          raise AssertionFailure.new("The value '#{self.to_s.trim}' should not be '#{val.to_s.trim}'", val, self) unless self.to_s != val.to_s
+        raise AssertionFailure.new("The value '#{self.to_s.trim}' should not be '#{val.to_s.trim}'", val, self) unless self.to_s != val.to_s
       end
 
       def should_not_exist
-          raise AssertionFailure.new("The value '#{self.to_s.trim}' should not exist, but it does", val, self) unless self.to_s != nil
+        raise AssertionFailure.new("The value '#{self.to_s.trim}' should not exist, but it does", val, self) unless self.to_s != nil
       end
 
       def should_not_be_empty
@@ -34,7 +36,6 @@ module Spectre
       end
     end
 
-
     class ::NilClass
       def should_be(val)
         raise AssertionFailure.new("There is nothing, but the value should be '#{val.to_s.trim}'", val, nil) unless val == nil
@@ -55,7 +56,6 @@ module Spectre
       end
     end
 
-
     class ::Hash
       def should_contain(other)
         raise AssertionFailure.new(other, self) unless self.merge(other) == self
@@ -64,8 +64,25 @@ module Spectre
       def should_not_contain(other)
         raise AssertionFailure.new(other, self) unless self.merge(other) != self
       end
+
+      def should_be_empty
+        raise AssertionFailure.new("The object should be empty", nil, self) unless self.empty?
+      end
+
+      def should_not_be_empty
+        raise AssertionFailure.new("The object should not be empty", nil, self) if self.empty?
+      end
     end
 
+    class ::OpenStruct
+      def should_be_empty
+        raise AssertionFailure.new("The object should be empty", nil, self) unless self.to_h.empty?
+      end
+
+      def should_not_be_empty
+        raise AssertionFailure.new("The object should not be empty", nil, self) if self.to_h.empty?
+      end
+    end
 
     class ::Array
       def should_contain(val)
@@ -76,7 +93,7 @@ module Spectre
           val = OpenStruct.new(val)
         end
 
-        raise AssertionFailure.new("The list [#{list.join(', ').trim}] should contain '#{val.trim}'", val, list) unless list.include? val
+        raise AssertionFailure.new("The list [#{list.join(', ').trim}] should contain '#{val.to_s.trim}'", val, list) unless list.include? val
       end
 
       def should_not_contain(val)
@@ -87,19 +104,18 @@ module Spectre
           val = OpenStruct.new(val)
         end
 
-        raise AssertionFailure.new("The list [#{list.join(', ').trim}] should not contain '#{val.trim}'", val, list) if list.include? val
+        raise AssertionFailure.new("The list [#{list.join(', ').trim}] should not contain '#{val.to_s.trim}'", val, list) if list.include? val
       end
 
       def should_be_empty
-        raise AssertionFailure.new('empty list', self) unless self.length == 0
+        raise AssertionFailure.new('empty list', self) unless self.empty?
       end
 
       def should_not_be_empty
-        raise AssertionFailure.new('no empty list', self) unless self.length > 0
+        raise AssertionFailure.new('no empty list', self) if self.empty?
       end
     end
 
-
     class ::String
       def should_be(val)
         raise AssertionFailure.new("The text '#{self.trim}' should be '#{val.to_s.trim}'", val, self) unless self == val
@@ -110,7 +126,7 @@ module Spectre
       end
 
       def should_not_be(val)
-          raise AssertionFailure.new("The text '#{self.trim}' should not be '#{val.to_s.trim}'", val, self) unless self != val
+        raise AssertionFailure.new("The text '#{self.trim}' should not be '#{val.to_s.trim}'", val, self) unless self != val
       end
 
       def should_not_be_empty
@@ -118,8 +134,10 @@ module Spectre
       end
 
       def should_contain(value)
+        raise AssertionFailure.new("`value' must not be nil") if value.nil?
+
         predicate = proc { |x| self.include? x.to_s }
-        evaluation = SingleEvaluation.new value
+        evaluation = SingleEvaluation.new(value)
         success = evaluation.call(predicate)
 
         return if success
@@ -143,7 +161,6 @@ module Spectre
       alias :& :and
     end
 
-
     class Evaluation
       def initialize value, other
         @value = value
@@ -162,10 +179,9 @@ module Spectre
       alias :& :and
     end
 
-
     class SingleEvaluation < Evaluation
       def initialize value
-        super value, nil
+        super(value, nil)
       end
 
       def call predicate
@@ -177,10 +193,9 @@ module Spectre
       end
     end
 
-
     class OrEvaluation < Evaluation
       def initialize value, other
-        super value, other
+        super(value, other)
       end
 
       def call predicate
@@ -192,10 +207,9 @@ module Spectre
       end
     end
 
-
     class AndEvaluation < Evaluation
       def initialize value, other
-        super value, other
+        super(value, other)
       end
 
       def call predicate
@@ -207,7 +221,6 @@ module Spectre
       end
     end
 
-
     class AssertionFailure < ExpectationFailure
       attr_reader :expected, :actual
 
@@ -222,27 +235,16 @@ module Spectre
     class << self
       @@success = nil
 
-      def eval_assertion predicate, val
-        if val.is_a? Proc
-          val.call(predicate)
-        else
-          predicate.call(val)
-        end
-      end
-
       def expect desc
         begin
           Logger.log_process("expect #{desc}")
           yield
           Logger.log_status(desc, Logger::Status::OK)
-
         rescue Interrupt => e
           raise e
-
         rescue AssertionFailure => e
           Logger.log_status(desc, Logger::Status::FAILED)
           raise AssertionFailure.new(e.message, e.expected, e.actual, desc), cause: nil
-
         rescue Exception => e
           Logger.log_status(desc, Logger::Status::ERROR)
           raise AssertionFailure.new("An unexpected error occured during expectation: #{e.message}", nil, nil, desc), cause: e
@@ -250,15 +252,21 @@ module Spectre
       end
 
       def observe desc = nil
+        prefix = "observing"
+        prefix += " '#{desc}'" if desc
+
         begin
-          Logger.log_info("observing #{desc}") if desc
+          Logger.log_info(prefix) if desc
           yield
           @@success = true
-
+          @@logger.info("#{prefix} finished with success")
         rescue Interrupt => e
           raise e
-
         rescue Exception => e
+          error_message = "#{prefix} finished with failure: #{e.message}"
+          error_message += "\n" + e.backtrace.join("\n") if @@debug
+
+          @@logger.info(error_message)
           @@success = false
         end
       end
@@ -272,6 +280,11 @@ module Spectre
       end
     end
 
+    Spectre.register do |config|
+      @@logger = ::Logger.new(config['log_file'], progname: 'spectre/assertion')
+      @@debug = config['debug']
+    end
+
     Spectre.delegate :expect, :observe, :success?, :fail_with, to: self
   end
 end

data/lib/spectre/bag.rb

@@ -1,19 +1,21 @@
-require 'ostruct'
-
-module Spectre
-  module Bag
-    class << self
-      @@bag
-
-      def bag
-        @@bag
-      end
-    end
-
-    Spectre.register do |config|
-      @@bag = OpenStruct.new
-    end
-
-    Spectre.delegate :bag, to: Bag
-  end
-end
+require_relative '../spectre'
+
+require 'ostruct'
+
+module Spectre
+  module Bag
+    class << self
+      @@bag
+
+      def bag
+        @@bag
+      end
+    end
+
+    Spectre.register do |config|
+      @@bag = OpenStruct.new
+    end
+
+    Spectre.delegate :bag, to: self
+  end
+end