deprecator 0.0.3 → 0.0.4

data/README.md

@@ -49,6 +49,10 @@ class SomeClass
 
   deprecated_method :method4, "%{method} is no longer here, use some other method!"
   deprecated_method [:method5, :method6], "%{method} is no longer here, use some other method!"
+
+  def method7
+    raise_deprecated # raises regardless of strategy
+  end
 end
 
 obj = SomeClass.new # outputs to stderr: [DEPRECATED] deprecated class SomeClass instantiated at /Users/vasfed/work/deprecator/examples/example.rb:26:in `new'
@@ -57,6 +61,12 @@ obj.method2 # [DEPRECATED] this is deprecated when true is true
 obj.method3 # [DEPRECATED] method method3 is deprecated. Called from /Users/vasfed/work/deprecator/examples/example.rb:28:in `<top (required)>'
 obj.method4 # [DEPRECATED] method4 is no longer here, use some other method!
 obj.method6 # [DEPRECATED] method6 is no longer here, use some other method!
+begin
+  obj.method7
+rescue Deprecator::Deprecated
+  puts "error raised" # guess what? :)
+end
+
 
 ```
 
@@ -96,6 +106,14 @@ SomeClass.new
 
 ```
 
+Note that for BasicObject helpers are not loaded by default, you should do smth like
+
+```ruby
+class BasicObject
+  include ::Deprecator::ClassClassMethods
+end
+```
+
 ## Contributing
 
 1. Fork it

data/examples/example.rb

@@ -21,6 +21,10 @@ class SomeClass
 
   deprecated_method :method4, "%{method} is no longer here, use some other method!"
   deprecated_method [:method5, :method6], "%{method} is no longer here, use some other method!"
+
+  def method7
+    raise_deprecated # raises regardless of strategy
+  end
 end
 
 obj = SomeClass.new # outputs to stderr: [DEPRECATED] deprecated class SomeClass instantiated at /Users/vasfed/work/deprecator/examples/example.rb:26:in `new'
@@ -28,4 +32,9 @@ obj.method1 # [DEPRECATED] method1 is deprecated!
 obj.method2 # [DEPRECATED] this is deprecated when true is true
 obj.method3 # [DEPRECATED] method method3 is deprecated. Called from /Users/vasfed/work/deprecator/examples/example.rb:28:in `<top (required)>'
 obj.method4 # [DEPRECATED] method4 is no longer here, use some other method!
-obj.method6 # [DEPRECATED] method6 is no longer here, use some other method!
+obj.method6 # [DEPRECATED] method6 is no longer here, use some other method!
+begin
+  obj.method7
+rescue Deprecator::Deprecated
+  puts "error raised" # guess what? :)
+end

data/lib/deprecator.rb

@@ -109,19 +109,27 @@ module Deprecator
   end
 
   def self.strategy= s
-    case s
-    when Class then return(@@strategy = s.new)
+    @@strategy = case s
+    when nil then DefaultStrategy.new
+    when Class then s.new
     when Symbol then
       capitalized = s.capitalize
       if Strategy.const_defined?(capitalized)
-        self.strategy = Strategy.const_get(capitalized)
+        Strategy.const_get(capitalized).new
       else
         raise UnknownStrategy, s
       end
     else
-      @@strategy = s
+      s
     end
   end
+
+  def self.with_strategy new_strategy
+    old_strategy = strategy
+    self.strategy = new_strategy
+    yield
+    self.strategy = old_strategy
+  end
 end
 
 

data/lib/deprecator/core_ext.rb

@@ -10,7 +10,10 @@ end
 
 module Kernel
   def deprecated reason=nil, *args
-    Deprecator.strategy.deprecated(reason, caller_line, args)
+    ::Deprecator.strategy.plain_deprecated(reason, caller_line, args)
+  end
+  def raise_deprecated reason=nil, *args
+    raise ::Deprecator::Deprecated, reason, *args
   end
   alias DEPRECATED deprecated
 

data/lib/deprecator/strategy.rb

@@ -4,7 +4,6 @@ module Deprecator
     class Base
       #on class/module definition/extenting with deprecater or deprecate statement
       def class_found cls, where=nil, reason=nil, args=nil
-        this = self
         cls.send(:define_method, :initialize){|*args|
           ::Deprecator.strategy.object_found(cls, self, reason, caller_line, where)
         }
@@ -34,21 +33,20 @@ module Deprecator
       end
       # on method definition
       def method_found cls,name, reason, where=nil
-        this = self
         unless cls.method_defined?(name) # also we may place stubs there for existing methods in other strategies
           cls.send :define_method, name, ->(*args){
-            this.method_called cls,name,reason,caller_line,where
+            ::Deprecator.strategy.method_called cls,name,reason,caller_line,where
           }
         else
           method = cls.instance_method(name)
           cls.send :define_method, name, ->(*args){
-            this.method_called cls,name,reason,caller_line,where
+            ::Deprecator.strategy.method_called cls,name,reason,caller_line,where
             method.bind(self).call(*args)
           }
         end
       end
       def method_called cls,name,reason=nil,where,defined_at; end
-      def deprecated reason=nil, where=caller_line, args=nil; end
+      def plain_deprecated reason=nil, where=caller_line, args=nil; end
       def fixme! msg, where, args; end
       def todo! msg, where, args; end
       def not_implemented msg, where, args
@@ -72,7 +70,7 @@ module Deprecator
         msg reason.gsub('%{method}', name.to_s), where
       end
 
-      def deprecated reason=nil, where=caller_line, args=nil
+      def plain_deprecated reason=nil, where=caller_line, args=nil
         where =~ /in `(.+)'$/
         method_name = $1 || '<unknown>'
         reason ||= "%{method} is deprecated!"
@@ -93,7 +91,7 @@ module Deprecator
         raise DeprecatedMethodCalled, (reason || "deprecated").gsub('%{method}', name.to_s)
       end
 
-      def deprecated reason=nil, where=caller_line, args=nil
+      def plain_deprecated reason=nil, where=caller_line, args=nil
         where =~ /in `(.+)'$/
         method_name = $1 || '<unknown>'
         reason ||= "%{method} is deprecated!"

data/lib/deprecator/version.rb

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

data/spec/deprecator_spec.rb

@@ -49,10 +49,14 @@ describe Deprecator do
         subject.strategy = :base
       }
       it "simple" do
-        subject.strategy.should_receive(:deprecated).with("reason", duck_type(:to_s), [])
+        subject.strategy.should_receive(:plain_deprecated).with("reason", duck_type(:to_s), [])
         deprecated "reason"
       end
 
+      it "raise_deprecated" do
+        expect{ raise_deprecated }.to raise_error(Deprecator::Deprecated)
+      end
+
       it "marking in class" do
         cls = Class.new{
           deprecated_method "reason"
@@ -120,5 +124,13 @@ describe Deprecator do
         expect{ subject.strategy = :no_such_strategy }.to raise_error(Deprecator::UnknownStrategy)
       end
     end
+
+    it "with" do
+      expect{
+        subject.with_strategy(Object) do
+          deprecated
+        end
+      }.to raise_error(NoMethodError, /plain_deprecated/)
+    end
   end
 end

data/spec/strategy/warning_spec.rb

@@ -7,7 +7,7 @@ describe Deprecator::Strategy::Warning do
   }
   it "calls warn" do
     subject.should_receive(:warn).with("[DEPRECATED] block (2 levels) in <top (required)> is deprecated!")
-    subject.deprecated
+    deprecated
   end
 
   it "raises on not implemented" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deprecator
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: is_a
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2302177472746095841
+      hash: -1744994072693929959
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24