diff_matcher 2.2.2 → 2.2.3

data/lib/diff_matcher/difference.rb

@@ -90,19 +90,34 @@ module DiffMatcher
         :match_proc    => [CYAN  , "{"]
     }
 
-    COLOR_SCHEMES = {
-      :default          => DEFAULT_COLOR_SCHEME,
-      :white_background => DEFAULT_COLOR_SCHEME.merge(
-        :additional    => [MAGENTA, "+"]
-      ) 
-    }
+    class << self
+      attr_reader :color_scheme
+      attr_writer :color_enabled, :color_schemes
+
+      def color_schemes
+        @color_schemes ||= {
+          :default          => DEFAULT_COLOR_SCHEME,
+          :white_background => DEFAULT_COLOR_SCHEME.merge(
+            :additional    => [MAGENTA, "+"]
+          )
+        }
+      end
+
+      def color_scheme=(value)
+        @color_scheme = color_schemes[value]
+      end
+
+      def color_enabled
+        @color_enabled.nil? ? !!@color_scheme : @color_enabled
+      end
+    end
 
     def initialize(expected, actual, opts={})
       @opts = opts
       @ignore_additional = opts[:ignore_additional]
       @quiet             = opts[:quiet]
-      @color_enabled     = opts[:color_enabled] || !!opts[:color_scheme]
-      @color_scheme      = COLOR_SCHEMES[opts[:color_scheme] || :default]
+      @color_scheme      = self.class.color_schemes[opts[:color_scheme]] || self.class.color_scheme || self.class.color_schemes[:default]
+      @color_enabled     = (opts[:color_enabled].nil? && opts[:color_scheme].nil?) ? self.class.color_enabled : !!opts[:color_scheme] || opts[:color_enabled]
       @optional_keys = opts.delete(:optional_keys) || []
       @dif_count = 0
       @difference = difference(expected, actual)

data/lib/diff_matcher/version.rb

@@ -1,3 +1,3 @@
 module DiffMatcher
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

data/spec/diff_matcher/difference_spec.rb

@@ -668,6 +668,40 @@ describe "DiffMatcher::difference(expected, actual, opts)" do
           Where, \e[31m- \e[1m1 missing\e[0m, \e[35m+ \e[1m1 additional\e[0m, \e[32m~ \e[1m1 match_regexp\e[0m, \e[34m: \e[1m1 match_class\e[0m, \e[36m. \e[1m1 match_range\e[0m, \e[36m{ \e[1m1 match_proc\e[0m
           EOF
       end
+
+      context "color_enabled can be set on the class" do
+        before { DiffMatcher::Difference::color_enabled = true }
+
+        it_behaves_like "a diff matcher", expected, same, different,
+          <<-EOF
+          \e[0m[
+          \e[0m  \e[31m- \e[1m1\e[0m\e[33m+ \e[1m0\e[0m,
+          \e[0m  2,
+          \e[0m  \e[32m~ \e[0m"\e[32m(\e[1m3\e[0m\e[32m)\e[0m"\e[0m,
+          \e[0m  \e[34m: \e[1m4\e[0m,
+          \e[0m  \e[36m. \e[1m5\e[0m,
+          \e[0m  \e[36m{ \e[1m6\e[0m
+          \e[0m]
+          Where, \e[31m- \e[1m1 missing\e[0m, \e[33m+ \e[1m1 additional\e[0m, \e[32m~ \e[1m1 match_regexp\e[0m, \e[34m: \e[1m1 match_class\e[0m, \e[36m. \e[1m1 match_range\e[0m, \e[36m{ \e[1m1 match_proc\e[0m
+          EOF
+      end
+
+      context "color_scheme can be set on the class" do
+        before { DiffMatcher::Difference::color_scheme = :white_background }
+
+        it_behaves_like "a diff matcher", expected, same, different,
+          <<-EOF
+          \e[0m[
+          \e[0m  \e[31m- \e[1m1\e[0m\e[35m+ \e[1m0\e[0m,
+          \e[0m  2,
+          \e[0m  \e[32m~ \e[0m"\e[32m(\e[1m3\e[0m\e[32m)\e[0m"\e[0m,
+          \e[0m  \e[34m: \e[1m4\e[0m,
+          \e[0m  \e[36m. \e[1m5\e[0m,
+          \e[0m  \e[36m{ \e[1m6\e[0m
+          \e[0m]
+          Where, \e[31m- \e[1m1 missing\e[0m, \e[35m+ \e[1m1 additional\e[0m, \e[32m~ \e[1m1 match_regexp\e[0m, \e[34m: \e[1m1 match_class\e[0m, \e[36m. \e[1m1 match_range\e[0m, \e[36m{ \e[1m1 match_proc\e[0m
+          EOF
+      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: diff_matcher
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors: 
 - Playup
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-07-08 00:00:00 Z
 dependencies: []
 
 description: |
@@ -60,7 +60,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2103074240095197051
+      hash: 2610392382067707608
       segments: 
       - 0
       version: "0"