as_deprecation_tracker 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c9e8fd0e5c19889d05575d93539fde6cbd82f90
-  data.tar.gz: 6fc07fb3155fe02e64510b1e2fa7d53440a1e0b8
+  metadata.gz: 319c016e3c0d157afe5bf366597bbe08c3f7b8a1
+  data.tar.gz: c497cffa7fb8a20754ec0bcf0c041735f1a7e8b6
 SHA512:
-  metadata.gz: f4782ab953d838c2ff817d490078117d54bff31a8ecedbda70f271c3f265847333425019a3fb75a60e7309dd6a162530757e4a35906e113d33e7a2d0945a5613
-  data.tar.gz: 8bcff72162a895eefeb70f0bf8409562b4d9beb38248f9124c7038bb955370aef46dc6fd828e60821d98d31a2d9292f64747ed16320436a30118a46bc58cef47
+  metadata.gz: ac1bba14823514e09b4b5421d3fca0a265b0b26edb9fddfcd72eb2994bc148ef7107f1f7058fcbe771bb2d21ae9eb22c43591a0876085645d672d021a5fd34c6
+  data.tar.gz: 0c807d54d2e662c98a7988ae5e9df30fa262cbebbe54788d4401d67281a5b8a9f52b51d9b52abc7d5dac5c4cd9943727b98f6482be071381f1eace9da4ec0380

data/README.md

@@ -88,9 +88,8 @@ number may vary by up to ten lines from the recorded number by default (see
 `line_tolerance` to tune). Usually the filename and method name are sufficient
 to match the caller without needing line numbers.
 
-The message is an exact string match, but if it's a multi-line message then not
-all lines need to be specified. Only the first lines given will be compared
-against the deprecation message.
+The message is an exact string match on the _start_ of the deprecation message,
+so not all of the original deprecation message needs to be specified.
 
 Additional whitelist files may be placed below the root of each Rails engine
 and will be loaded at startup in addition to the main Rails root config file.

data/lib/as_deprecation_tracker/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ASDeprecationTracker
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

data/lib/as_deprecation_tracker/whitelist.rb

@@ -21,7 +21,7 @@ module ASDeprecationTracker
     end
 
     def load_file(path)
-      add_to_list(YAML.safe_load(File.read(path), [Symbol]))
+      add_to_list(YAML.safe_load(File.read(path), [Symbol]) || [])
     end
 
     def matches?(deprecation)

data/lib/as_deprecation_tracker/whitelist_entry.rb

@@ -11,7 +11,6 @@ module ASDeprecationTracker
       @callstack = callstack_to_files_lines(Array.wrap(callstack))
       @engine_root = engine.present? ? engine_root(engine) : nil
       @message = message
-      @message_lines = message.lines.map(&:chomp) if message
     end
 
     # rubocop:disable Metrics/CyclomaticComplexity
@@ -26,10 +25,7 @@ module ASDeprecationTracker
     private
 
     def message_matches?(message)
-      message = clean_message(message)
-      return true if message == @message
-      return true if message.lines[0, @message_lines.length].map(&:chomp) == @message_lines
-      false
+      clean_message(message).start_with?(@message)
     end
 
     def clean_message(message)

data/test/whitelist_entry_test.rb

@@ -19,6 +19,10 @@ class WhitelistEntryTest < ASDeprecationTracker::TestCase
   end
 
   def test_matches_partial_message
+    assert entry(callstack: nil, message: "a\nb").matches?(deprecation(message: "a\nb c"))
+  end
+
+  def test_matches_partial_message_lines
     assert entry(callstack: nil, message: "a\nb").matches?(deprecation(message: "a\nb\nc"))
   end
 

data/test/whitelist_test.rb

@@ -34,6 +34,12 @@ class WhitelistTest < ASDeprecationTracker::TestCase
     assert_equal 1, @whitelist.list.count
   end
 
+  def test_load_file_empty
+    File.expects(:read).with('root/config/as_deprecation_whitelist.yaml').returns('---')
+    @whitelist.load_file('root/config/as_deprecation_whitelist.yaml')
+    assert_equal 0, @whitelist.list.count
+  end
+
   def test_matches_failure
     @whitelist.add_to_list([entry])
     deprecation = mock('deprecation')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: as_deprecation_tracker
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport