deprecator 0.0.4 → 0.1.0

data/README.md

@@ -31,7 +31,7 @@ Or install it yourself as:
 require 'deprecator'
 
 class SomeClass
-  deprecated
+  deprecated_class
 
   def method1
     deprecated
@@ -77,7 +77,7 @@ changing strategies:
 Deprecator.strategy = :raise # included: warning(default), raise, raiseHard
 
 class SomeClass
-  deprecated "some reason"
+  deprecated_class "some reason"
   def initialize
     puts "SomeClass#initialize called"
   end

data/examples/example.rb

@@ -3,7 +3,7 @@
 require 'deprecator'
 
 class SomeClass
-  deprecated
+  deprecated_class
 
   def method1
     deprecated

data/examples/example2.rb

@@ -5,7 +5,7 @@ require 'deprecator'
 Deprecator.strategy = :raise # included: warning(default), raise, raiseHard
 
 class SomeClass
-  deprecated "some reason"
+  deprecated_class "some reason"
   def initialize
     puts "SomeClass#initialize called"
   end

data/lib/deprecator.rb

@@ -51,7 +51,7 @@ module Deprecator
 
 
   module ClassClassMethods
-    def deprecated reason=nil, *args
+    def deprecated_class reason=nil, *args
       ::Deprecator.strategy.class_found(self, caller_line, reason, args)
     end
 
@@ -62,21 +62,19 @@ module Deprecator
         @method_added_stack.push(m)
       end
 
-      @skip_next_method_added_addition = true
+      Deprecator._skip_next_method_added_addition!
       define_singleton_method(:method_added, ->(name){
         return if name == :method_added
         super(name)
         old = @method_added_stack.pop
         if old
-          @skip_next_method_added_addition = true
+          Deprecator._skip_next_method_added_addition!
           define_singleton_method(:method_added, old)
-          remove_instance_variable :@skip_next_method_added_addition
         else
           class <<self; remove_method(:method_added); end
         end
         blk.call(name)
       })
-      remove_instance_variable :@skip_next_method_added_addition
     end
 
     def deprecated_method name=nil, reason=nil, &blk
@@ -130,6 +128,27 @@ module Deprecator
     yield
     self.strategy = old_strategy
   end
+
+  #@private
+  def self._skip_next_initialize_addition!
+    @_skip_next_initialize_addition = true
+  end
+  #@private
+  def self._skip_next_initialize_addition?
+    return false if !@_skip_next_initialize_addition
+    remove_instance_variable :@_skip_next_initialize_addition
+    return true
+  end
+  #@private
+  def self._skip_next_method_added_addition!
+    @_skip_next_method_added_addition = true
+  end
+  #@private
+  def self._skip_next_method_added_addition?
+    return false if !@_skip_next_method_added_addition
+    remove_instance_variable :@_skip_next_method_added_addition
+    return true
+  end
 end
 
 

data/lib/deprecator/strategy.rb

@@ -10,19 +10,18 @@ module Deprecator
 
         cls.send(:define_singleton_method, :method_added, ->(name){
           super(name)
-          if name == :initialize && !@skip_next_initialize_addition
+          if name == :initialize && !Deprecator._skip_next_initialize_addition?
             meth = instance_method(name)
-            @skip_next_initialize_addition = true
+            Deprecator::_skip_next_initialize_addition!
             define_method(name){|*args|
               ::Deprecator.strategy.object_found(cls, self, reason, caller_line, where)
               meth.bind(self).call(*args)
             }
-            remove_instance_variable :@skip_next_initialize_addition
           end
           })
         cls.send(:define_singleton_method, :singleton_method_added, ->(name){
           #guard for self?
-          if name == :method_added && !@skip_next_method_added_addition
+          if name == :method_added && !Deprecator._skip_next_method_added_addition?
             warn "[WARNING] when you replace method_added for deprecated class - you can no longer autotrack its object creation, use deprecation of initialize method."
           end
           })

data/lib/deprecator/version.rb

@@ -1,3 +1,3 @@
 module Deprecator
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/spec/deprecator_spec.rb

@@ -25,7 +25,15 @@ describe Deprecator do
       end
       it "via call to deprecated" do
         subject.strategy.should_receive(:class_found).with(kind_of(Class), duck_type(:to_s), "abc", [])
-        Class.new{ deprecated "abc" }
+        Class.new{ deprecated_class "abc" }
+      end
+      it "class methods" do
+        subject.strategy.should_receive(:class_found).with(kind_of(Class), duck_type(:to_s), "aa", []).once
+        subject.strategy.should_receive(:plain_deprecated).with("bb", duck_type(:to_s), [])
+        (Class.new{
+          deprecated_class "aa"
+          def self.cls_method; deprecated "bb"; end
+        }).cls_method
       end
     end
 
@@ -40,7 +48,7 @@ describe Deprecator do
       end
       it "via call to deprecated" do
         subject.strategy.should_receive(:class_found).with(kind_of(Module), duck_type(:to_s), "abc", [])
-        Module.new{ deprecated "abc" }
+        Module.new{ deprecated_class "abc" }
       end
     end
 
@@ -86,14 +94,14 @@ describe Deprecator do
       end
 
       it "with reason passed" do
-        cls = Class.new{ deprecated "reason" }
+        cls = Class.new{ deprecated_class "reason" }
         subject.strategy.should_receive(:object_found).with(cls, kind_of(cls), "reason", /#{Regexp.escape __FILE__}:#{__LINE__+1}/, /#{Regexp.escape __FILE__}:#{__LINE__-1}/)
         cls.new
       end
 
       it "and guards for initialize method" do
         cls = Class.new{
-          deprecated "reason"
+          deprecated_class "reason"
           # def self.method_added(name); puts "method added #{name}"; end
           def initialize
             self.class.initialize_called

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deprecator
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1744994072693929959
+      hash: -593577026750073995
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24