deprecation 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2f81b6ac3b0ec0e588962e5c9b0314e7a8a3439
-  data.tar.gz: b63ada54354a0804f77c468ade91442b5d82bb72
+  metadata.gz: 974299a00be061d7c77bea75662264bd90e84e88
+  data.tar.gz: 05b05522f673a5bc35aa022b62ea375c771a17b4
 SHA512:
-  metadata.gz: a6b8a23cff2ad9efb77fcc4b5ec5d1b120239d2a3163108c97d5ae84241e668f9761253e034ceecc90aeffcb9842e831d477e8ec6b326da1feddfe6cc653086d
-  data.tar.gz: 905c8692fa62dab1eaf683a42b288dab2246a615a258b80bfda4a273f22f97b5bead792f39ceea651ca026fe53fa917425029534f0c130f06ac7ab30970283c8
+  metadata.gz: 1defcbe01ed8c8a00b912284629e1442106000ad83d2617bb066025e53ee81d7713457e285aca39ec89c2bf8f623b425055484d21e98c97e022e8ef2c1d4a253
+  data.tar.gz: c24c5064090d8be010fd9411eaa5344f11bfe9cfa937842be1cb1b6388c0b4ac9ec54a4f6f16b3ddfa35123d26dc5461911f3cf8c90ea60b0d216ed5cfd6caad

data/lib/deprecation/reporting.rb

@@ -18,7 +18,7 @@ module Deprecation
       end
 
       deprecation_message(callstack, message).tap do |m|
-        deprecation_behavior(context).each { |b| b.call(m, callstack) }
+        deprecation_behavior(context).each { |b| b.call(m, sanitized_callstack(callstack)) }
       end
     end
 
@@ -92,8 +92,7 @@ module Deprecation
       end
 
       def extract_callstack(callstack)
-        deprecation_gem_root = File.expand_path("../..", __FILE__) + "/"
-        offending_line = callstack.find { |line| !line.start_with?(deprecation_gem_root) and line !~ IGNORE_REGEX } || callstack.first
+        offending_line = sanitized_callstack(callstack).first || callstack.first
         if offending_line
           if md = offending_line.match(/^(.+?):(\d+)(?::in `(.*?)')?/)
             md.captures
@@ -102,5 +101,13 @@ module Deprecation
           end
         end
       end
+
+      def sanitized_callstack(callstack)
+        callstack.reject { |line| line.start_with? deprecation_gem_root}.select { |line| (line =~ IGNORE_REGEX).nil? }
+      end
+
+      def deprecation_gem_root
+        File.expand_path("../..", __FILE__) + "/"
+      end
   end
 end

data/lib/deprecation/version.rb

@@ -1,3 +1,3 @@
 module Deprecation
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/deprecation_spec.rb

@@ -95,7 +95,7 @@ describe Deprecation do
     end
 
     it "should provide a useful deprecation trace" do
-      logger.should_receive(:warn).with(/called from old_method/)
+      expect(logger).to receive(:warn).with(/called from old_method/)
       expect(A.new.old_method).to eq true
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deprecation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport