active_mocker 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64d309a30e487afad4c2626da86f5d5a99d28837
-  data.tar.gz: 583c4618977589f04cfb27a34b90edf1b73a4432
+  metadata.gz: 6e14ca018eff8f1c0f6c575322ae1cf79d48a3c9
+  data.tar.gz: 71fd81a8740ccd5d08a71186b096a1bef03a0b97
 SHA512:
-  metadata.gz: 195803c199368d5b89d0122ee28d060853640a7a0dfeae93d9ec3bd074c79d1d99df8c7c33dc956c04fb72a68651b652d006c5ccccf91f4cd7b03320641d1f2b
-  data.tar.gz: 89352aca6e35d772696bec48de7ffc334e8c367e2ec551da5b24066236e288cacfab23393c583a5bcb6022b8b35df52837f7576e1b2da658c4f9cd690c3f4b49
+  metadata.gz: 4c9e9c1b8bfd686ed562218d52f8324fd50f642ce29f105a61ea384745dcadf99d4764a18352771e1b387232d056186aba8b5bc62f5623078cba43ec86db7185
+  data.tar.gz: 217ec8087dedb24510a5ecd6e95b2b1e1da24853b830c922292fe8f74ccdafc7c23bde72a0e788e2dfa8c6e6c559d1c094540574f521e73f3f4500af614bc152

data/lib/active_mocker/display_errors.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require "colorize"
 module ActiveMocker
   class DisplayErrors
     attr_reader :errors, :model_count, :out
@@ -28,43 +29,92 @@ module ActiveMocker
       @uniq_errors ||= errors.flatten.compact.uniq.sort_by(&:class_name)
     end
 
+    def any_errors?
+      uniq_errors.count > 0
+    end
+
     def display_errors
       uniq_errors.each do |e|
         next unless ENV["DEBUG"] || !(e.level == :debug)
-        if ActiveMocker::Config.error_verbosity == 3
-          out.puts "#{e.class_name} has the following errors:"
-          out.puts e.message.colorize(e.level_color)
-          out.puts e.level
-          out.puts e.original_error.message.colorize(e.level_color) if e.original_error?
-          out.puts e.original_error.backtrace if e.original_error?
-          out.puts e.original_error.class.name.colorize(e.level_color) if e.original_error?
-        elsif ActiveMocker::Config.error_verbosity == 2
-          out.puts "#{e.class_name} has the following errors:"
-          out.puts e.message.colorize(e.level_color)
-        end
-      end
-      if ActiveMocker::Config.error_verbosity > 0 && uniq_errors.count > 0
-        out.puts "Error Summary"
-        error_summary
-      end
-      failure_count_message
-      if ActiveMocker::Config.error_verbosity > 0 && uniq_errors.count > 0
-        out.puts "To see more/less detail set error_verbosity = 0, 1, 2, 3"
+
+        display_verbosity_three(e) || display_verbosity_two(e)
       end
+
+      display_verbosity_one
     end
 
     def error_summary
-      error_count = uniq_errors.count { |e| [:red].include?(e.level_color) }
-      warn        = uniq_errors.count { |e| [:yellow].include?(e.level_color) }
-      info        = uniq_errors.count { |e| [:default].include?(e.level_color) }
-      out.puts "errors: #{error_count}, warn: #{warn}, info: #{info}"
-      out.puts "Failed models: #{failed_models.join(", ")}" if failed_models.count > 0
+      display "Error Summary"
+      display "errors: #{error_count}, warn: #{warn}, info: #{info}"
+      display "Failed models: #{failed_models.join(", ")}" if failed_models.count > 0
     end
 
     def failure_count_message
-      if ActiveMocker::Config.error_verbosity > 0 && (success_count < model_count || uniq_errors.count > 0)
-        out.puts "#{model_count - success_count} mock(s) out of #{model_count} failed."
+      if success_count < model_count || any_errors?
+        display "#{model_count - success_count} mock(s) out of #{model_count} failed."
       end
     end
+
+    private
+
+    def display(msg)
+      out.puts(msg)
+    end
+
+    def display_verbosity_three(error)
+      return unless ActiveMocker::Config.error_verbosity == 3
+
+      display_error_header(error)
+      display error.level
+
+      display_original_error(error)
+    end
+
+    def display_original_error(e)
+      original = e.original_error
+      return unless original
+
+      display original.message.colorize(e.level_color)
+      display original.backtrace
+      display original.class.name.colorize(e.level_color)
+    end
+
+    def display_verbosity_two(e)
+      return unless ActiveMocker::Config.error_verbosity == 2
+
+      display_error_header(e)
+    end
+
+    def display_error_header(e)
+      display "#{e.class_name} has the following errors:"
+      display e.message.colorize(e.level_color)
+    end
+
+    def display_verbosity_one
+      return unless ActiveMocker::Config.error_verbosity > 0
+
+      error_summary if any_errors?
+
+      failure_count_message
+
+      return unless any_errors?
+      display "To see more/less detail set error_verbosity = 0, 1, 2, 3"
+    end
+
+    def error_count
+      errors_for(:red)
+    end
+
+    def warn
+      errors_for(:yellow)
+    end
+
+    def info
+      errors_for(:default)
+    end
+
+    def errors_for(level)
+      uniq_errors.count { |e| [level].include? e.level_color }
+    end
   end
 end

data/lib/active_mocker/mock/base.rb

@@ -7,7 +7,7 @@ module ActiveMocker
     extend AliasAttribute
 
     def self.inherited(subclass)
-      return ActiveMocker::LoadedMocks.send(:add, subclass) if subclass.superclass == Base
+      ActiveMocker::LoadedMocks.send(:add, subclass)
     end
 
     class << self

data/lib/active_mocker/mock/queries.rb

@@ -58,12 +58,10 @@ module ActiveMocker
     #   Post.limit(100).delete_all
     #   # => ActiveMocker::Error: delete_all doesn't support limit scope
     def delete_all(conditions = nil)
-      raise ActiveMocker::Error.new("delete_all doesn't support limit scope") if from_limit?
-      if conditions.nil?
-        to_a.map(&:delete)
-        return to_a.clear
-      end
-      where(conditions).map(&:delete).count
+      check_for_limit_scope!
+
+      collection = conditions.nil? ? to_a.each(&:delete).clear : where(conditions)
+      collection.map(&:delete).count
     end
 
     alias destroy_all delete_all
@@ -346,6 +344,10 @@ module ActiveMocker
 
     private
 
+    def check_for_limit_scope!
+      raise ActiveMocker::Error.new("delete_all doesn't support limit scope") if from_limit?
+    end
+
     def values_by_key(key)
       all.map { |obj| obj.send(key) }
     end

data/lib/active_mocker/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveMocker
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_mocker
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport