deprecations 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78ed3cd91fd99c383cfcf80cf73f9e5757f0f007
-  data.tar.gz: bf79ec77bdff29dc0222a4b385efa37d7bc27fd5
+  metadata.gz: 8f3f137ca9a5beb63eb3bdd08488fff97528ca7b
+  data.tar.gz: d7ea7405ba490ee635a0a299acb96af174ac4f10
 SHA512:
-  metadata.gz: 600ef0c82127f3df1111751cad2a13fdd0aa4342051fa629f122f498dac8ee469182f1417474df5ff1b60db178276858e707a8becfb9f62449d75e05126f41fb
-  data.tar.gz: 17760c77380a0379c7e8cc523a1869bcf77164156fe4749d63ba3ed6afa674f1f0cf9bbed7f63f394e35b956e76dba51786f47d0e6d8fe84bdd4b5ac7aec51d0
+  metadata.gz: 80b8a7f300eac8799d2b813e0eee5481da2dc06716893a851585c876c21f32c68952f38f30e1233e440decc2249a48163a023b6a3cf74dd9056bbb60058ee25d
+  data.tar.gz: ca23236eda75c3e37649cd464bb9fe22f4944fbd260a318c9980ff6acf63656b1641342f1e0e60baa6fa4856b4f99cfe56f661e9e51348f7797a6e7a036a5b09

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### deprecations 1.0.4
+- less code, better algorithm to overload deprecated methods
+- no more private «shadow methods»
+
 ### deprecations 1.0.2
 - support for late bound class names (like in `Foo = Class.new`)
 

data/lib/deprecations/configuration.rb

@@ -10,7 +10,7 @@ module Deprecations
       @@cfg
     end
 
-    BEHAVIORS = [:warn, :raise, :silence].freeze
+    BEHAVIORS = [:warn, :raise, :silence]
 
     private
 
@@ -25,7 +25,7 @@ module Deprecations
         BEHAVIORS.include?(how) and return @behavior = how
         ::Kernel.raise(
           ::ArgumentError, "invalid parameter `#{how}` - have to be #{BEHAVIORS.map(&:inspect).join(' | ')}"
-        )        
+        )
       end
 
     end

data/lib/deprecations/extension.rb

@@ -1,7 +1,7 @@
-
 module Deprecations
   class << self
     private
+
     def infect(mod)
       mod.extend(ClassMethods)
       mod.send(:include, InstanceMethods)
@@ -9,95 +9,58 @@ module Deprecations
 
     module Helper
       private
-
-      def __method_scope(method_name)
-        private_method_defined?(method_name) and return :private
-        protected_method_defined?(method_name) and return :protected
-        public_method_defined?(method_name) and return :public
-        nil
+      def __method(method_name)
+        instance_method(method_name) rescue nil
       end
 
-      def __define_deprecated(name, decorated_name, scope, alternative, outdated)
-        alias_name = __private_alias(name, decorated_name)
-        send(scope, name)
-        define_method(name) do |*a, &b|
-          Deprecations.call(decorated_name, alternative, outdated)
-          send(alias_name, *a, &b)
+      def __method_deprecated!(method, alternative, outdated)
+        define_method(method.name) do |*a, &b|
+          decorated = Class === self ? "#{self}." : "#{self.class}#"
+          Deprecations.call(
+            "#{decorated}#{__method__}",
+            alternative.nil? ? nil : "#{decorated}#{alternative.name}",
+            outdated
+          )
+          method.bind(self).call(*a, &b)
         end
-        name
       end
 
-      def __private_alias(name, decorated_name)
-        alias_name = "deprecated_#{name}"
-        private_method_defined?(alias_name) and raise(ScriptError, "method is already deprecated - #{decorated_name}")
-        alias_method(alias_name, name)
-        private(alias_name)
-        alias_name
+      def __method_not_found!(method_name)
+        raise(NameError, "undefined method `#{method_name}` for class `#{self}`")
       end
+
     end
 
     module ClassMethods
-      include Helper
       private
+      include Helper
 
-      def deprecated(method_name, alternative_method_name = nil, outdated = nil)
-        method_scope = __method_scope(method_name) or __not_found!(method_name)
-        __define_deprecated(
-          method_name,
-          ->{"#{self.inspect[8..-2]}.#{method_name}"},
-          method_scope,
-          __decorated(alternative_method_name),
-          outdated
-        )
-      ensure
-        $@ and $@.delete_if{ |s| s.index(__FILE__) }
-      end
-
-      def __decorated(name)
-        name or return nil
-        __method_scope(name) and return ->{"#{self.inspect[8..-2]}.#{name}"}
-        Symbol === name and __not_found!(name)
-        name
-      end
-
-      def __not_found!(name)
-        raise(NameError, "undefined method `#{name}` for class `#{self.inspect[8..-2]}`")
+      def deprecated(method_name, alternative = nil, outdated = nil)
+        m = __method(method_name) or __method_not_found!(method_name)
+        a = alternative.nil? ? nil : (__method(alternative) or __method_not_found!(alternative))
+        __method_deprecated!(m, a, outdated)
       end
     end
 
     module InstanceMethods
-      include Helper
       private
+      include Helper
 
-      def deprecated!(alternative = nil, outdated = nil)
-        singleton_class.send(
-          :__define_deprecated,
-          :new,
-          ->{self},
-          :public,
-          alternative ? "#{alternative}" : nil,
-          outdated
-        )
-      end
-
-      def deprecated(method_name, alternative_method_name = nil, outdated = nil)
-        method_scope = __method_scope(method_name) and return __define_deprecated(
-          method_name,
-          ->{"#{self}##{method_name}"},
-          method_scope,
-          __decorated(alternative_method_name),
-          outdated
-        )
-        singleton_class.send(:deprecated, method_name, alternative_method_name, outdated)
-      ensure
-        $@ and $@.delete_if{ |s| s.index(__FILE__) }
+      def deprecated(method_name, alternative = nil, outdated = nil)
+        m = __method(method_name) or return singleton_class.send(:deprecated, method_name, alternative, outdated)
+        a = alternative.nil? ? nil : (__method(alternative) or __method_not_found!(alternative))
+        __method_deprecated!(m, a, outdated)
       end
 
-      def __decorated(name)
-        name or return nil
-        __method_scope(name) ? ->{"#{self}##{name}"} : singleton_class.send(:__decorated, name)
+      def deprecated!(alternative = nil, outdated = nil)
+        m = method(:new)
+        define_singleton_method(:new) do |*a, &b|
+          Deprecations.call(self, alternative, outdated)
+          m.call(*a, &b)
+        end
       end
     end
+
   end
 
   infect(Module)

data/lib/deprecations/version.rb

@@ -1,3 +1,3 @@
 module Deprecations
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

data/lib/deprecations.rb

@@ -21,8 +21,8 @@ module Deprecations
     private
 
     def throw!(subject, alternative)
-      msg = "`#{value(subject)}` is deprecated"
-      alternative and msg << " - use #{value(alternative)} instead"
+      msg = "`#{subject}` is deprecated"
+      alternative and msg << " - use #{alternative} instead"
       ex = DeprecationError.new(msg)
       ex.set_backtrace(caller(3))
       raise(ex)
@@ -30,15 +30,11 @@ module Deprecations
 
     def warn(subject, alternative, outdated)
       location = ::Kernel.caller_locations(3,1).last and location = "#{location.path}:#{location.lineno}: "
-      msg = "#{location}[DEPRECATION] `#{value(subject)}` is deprecated"
-      msg << ((outdated = value(outdated)) ? " and will be outdated #{outdated}." : '.')
-      alternative = value(alternative) and msg << " Please use `#{alternative}` instead."
+      msg = "#{location}[DEPRECATION] `#{subject}` is deprecated"
+      msg << (outdated ? " and will be outdated #{outdated}." : '.')
+      alternative and msg << " Please use `#{alternative}` instead."
       ::Kernel.warn(msg)
     end
-    
-    def value(arg)
-      defined?(arg.call) ? arg.call : arg
-    end
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deprecations
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,9 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: deprecations
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Deprecation support for your project.
 test_files: []
-has_rdoc: false