overrider 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d52cf24ae854860de785dbab4e6d9c2750290482f4691c902304fb9faed1a089
-  data.tar.gz: c1fb2a74aae5d70ac65790546808ae113e82ff3912307007835d8c582fa46108
+  metadata.gz: 01ce5703f96a82103f4b181db23f0bc11aa0ffb6106a20328ae1c0d0cf87dc69
+  data.tar.gz: 6de0b11afc0073bcb87b65d38c220677d0c1d41fffe25b46607c72b3c7f2f787
 SHA512:
-  metadata.gz: 196bb7a40efa56f4a8e0de5490b175e302fdfd39edc6f48d388367580eba66434abc65cc85d8b4a02d93bacfc6b950640e97019bf8a74c6049da2bcdb250150f
-  data.tar.gz: 9b441aa900a934993379f30f21caa95241221e96cdbf0b6bb1fe8b2dc4889db831bed33076ccc7591487fa41ffe1a7e4a86282382b3f34a174f4a425b58d1a6a
+  metadata.gz: da98dc68e05c9aec19bf4a04cf1efe689945da6620614448e5d84b24e9ad1f1be7c506f784fee246659f2a4c81cac410c9c2a6c205a7702951d152def063e0dd
+  data.tar.gz: bdcde88a049176513dda1f897c8aac950546690b599702c12db14ff0dc8db1ce269dd943d3a277359a1f57729d949a164737d23c10c238f35b51587fb1943382

data/README.md

@@ -1,5 +1,6 @@
 # Overrider
 [![Build Status](https://travis-ci.org/joker1007/overrider.svg?branch=master)](https://travis-ci.org/joker1007/overrider)
+[![Gem Version](https://badge.fury.io/rb/overrider.svg)](https://badge.fury.io/rb/overrider)
 
 This gem adds `override` syntax that is similar to Java's one.
 `override` syntax ensures that a modified method has super method.
@@ -7,8 +8,14 @@ This gem adds `override` syntax that is similar to Java's one.
 Unless the method has super method, this gem raise `Overrider::NoSuperMethodError`.
 
 This gem is pseudo static code analyzer by `TracePoint` and `Ripper`.
+
 it detect abstract violation when class(module) is defined, not runtime.
 
+### My similar gems
+
+- [finalist](https://github.com/joker1007/finalist) (`final` implementation)
+- [abstriker](https://github.com/joker1007/abstriker) (`abstract` implementation)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/overrider.rb

@@ -6,10 +6,11 @@ module Overrider
   class NoSuperMethodError < StandardError
     attr_reader :override_class, :unbound_method
 
-    def initialize(klass, method)
-      super("#{method} requires super method.")
+    def initialize(klass, method, backtrace = nil)
+      super("`#{method.owner}##{method.name}` requires super method.")
       @override_class = klass
       @unbound_method = method
+      set_backtrace(backtrace) if backtrace
     end
   end
 
@@ -62,123 +63,92 @@ module Overrider
 
   private
 
-  def override(symbol)
-    return if Overrider.disabled?
-
-    @ensure_overrides ||= Set.new
-    @ensure_overrides.add(instance_method(symbol))
-
-    caller_info = caller_locations(1, 1)[0]
-    unless Overrider.sexps[caller_info.absolute_path]
-      Overrider.sexps[caller_info.absolute_path] ||= Ripper.sexp(File.read(caller_info.absolute_path))
-    end
+  def override_methods
+    @override_methods ||= Set.new
+  end
 
-    @__overrider_trace_point ||= TracePoint.trace(:end, :c_return, :return, :return, :raise) do |t|
-      if t.event == :raise
-        @__overrider_trace_point.disable
-        @__overrider_trace_point = nil
-        next
-      end
+  using Module.new {
+    refine Module do
+      def trace_for_override(owner)
+        @__overrider_trace_point ||= TracePoint.trace(:end, :c_return, :return, :raise) do |t|
+          if t.event == :raise
+            @__overrider_trace_point.disable
+            @__overrider_trace_point = nil
+            next
+          end
 
-      klass = t.self
-
-      target_outer_override = false
-      if t.event == :return && klass == self && t.method_id == :override
-        c = caller_locations(2, 1)[0]
-        traverser = SexpTraverser.new(Overrider.sexps[c.absolute_path])
-        traverser.traverse do |n, parent|
-          if n[0] == :@ident && n[1] == "override" && n[2][0] == c.lineno
-            if parent[0] == :command || parent[0] == :fcall
-              # override :foo
-            elsif parent[0] == :command_call || parent[0] == :call
-              if parent[1][0] == :var_ref && parent[1][1][0] == :@kw && parent[1][1][1] == "self"
-                # self.override :foo
-              else
-                # unknown case
-                target_outer_override = true
+          klass = t.self
+
+          override_at_outer = false
+          if t.event == :return && klass == self && (t.method_id == :override || t.method_id == :override_singleton_method)
+            c = caller_locations(2, 1)[0]
+            traverser = SexpTraverser.new(Overrider.sexps[c.absolute_path])
+            traverser.traverse do |n, parent|
+              if n[0] == :@ident && (n[1] == "override" || n[1] == "override_singleton_method") && n[2][0] == c.lineno
+                if parent[0] == :command || parent[0] == :fcall
+                  # override :foo
+                elsif parent[0] == :command_call || parent[0] == :call
+                  if parent[1][0] == :var_ref && parent[1][1][0] == :@kw && parent[1][1][1] == "self"
+                    # self.override :foo
+                  else
+                    # unknown case
+                    warn "call `override` method by unknown way"
+                    override_at_outer = true
+                  end
+                else
+                  override_at_outer = true
+                end
               end
-            else
-              target_outer_override = true
             end
           end
-        end
-      end
 
-      target_end_event = klass == self && t.event == :end
-      target_c_return_event = (klass == Class || klass == Module) && t.event == :c_return && t.method_id == :new
+          target_class_end = klass == owner && t.event == :end
+          target_class_new_end = (klass == Class || klass == Module) && t.event == :c_return && t.method_id == :new && t.return_value == owner
 
-      if target_end_event || target_c_return_event || target_outer_override
-        @ensure_overrides.each do |meth|
-          unless meth.super_method
+          if target_class_end || target_class_new_end || override_at_outer
+            override_methods.each do |meth|
+              unless meth.super_method
+                @__overrider_trace_point.disable
+                @__overrider_trace_point = nil
+                raise NoSuperMethodError.new(self, meth, caller(4))
+              end
+            end
             @__overrider_trace_point.disable
             @__overrider_trace_point = nil
-            raise NoSuperMethodError.new(self, meth)
           end
         end
-        @__overrider_trace_point.disable
-        @__overrider_trace_point = nil
       end
     end
+  }
+
+  def override(symbol)
+    return symbol if Overrider.disabled?
+
+    owner = self
+    override_methods.add(instance_method(symbol))
+
+    caller_info = caller_locations(1, 1)[0]
+    unless Overrider.sexps[caller_info.absolute_path]
+      Overrider.sexps[caller_info.absolute_path] ||= Ripper.sexp(File.read(caller_info.absolute_path))
+    end
+
+    trace_for_override(owner)
 
     symbol
   end
 
   def override_singleton_method(symbol)
-    return if Overrider.disabled?
+    return symbol if Overrider.disabled?
 
-    @ensure_overrides ||= Set.new
-    @ensure_overrides.add(singleton_class.instance_method(symbol))
+    owner = self
+    override_methods.add(singleton_class.instance_method(symbol))
 
     caller_info = caller_locations(1, 1)[0]
     unless Overrider.sexps[caller_info.absolute_path]
       Overrider.sexps[caller_info.absolute_path] ||= Ripper.sexp(File.read(caller_info.absolute_path))
     end
 
-    @__overrider_singleton_trace_point ||= TracePoint.trace(:end, :c_return, :return, :raise) do |t|
-      if t.event == :raise
-        @__overrider_singleton_trace_point.disable
-        @__overrider_singleton_trace_point = nil
-        next
-      end
-
-      klass = t.self
-
-      target_outer_override_singleton_method = false
-      if t.event == :return && klass == self && t.method_id == :override_singleton_method
-        c = caller_locations(2, 1)[0]
-        traverser = SexpTraverser.new(Overrider.sexps[c.absolute_path])
-        traverser.traverse do |n, parent|
-          if n[0] == :@ident && n[1] == "override_singleton_method" && n[2][0] == c.lineno
-            if parent[0] == :command || parent[0] == :fcall
-              # override_singleton_method :foo
-            elsif parent[0] == :command_call || parent[0] == :call
-              if parent[1][0] == :var_ref && parent[1][1][0] == :@kw && parent[1][1][1] == "self"
-                # self.override_singleton_method :foo
-              else
-                # unknown case
-                target_outer_override_singleton_method = true
-              end
-            else
-              target_outer_override_singleton_method = true
-            end
-          end
-        end
-      end
-
-      target_end_event = klass == self && t.event == :end
-      target_c_return_event = (klass == Class || klass == Module) && t.event == :c_return && t.method_id == :new
-      if target_end_event || target_c_return_event || target_outer_override_singleton_method
-        @ensure_overrides.each do |meth|
-          unless meth.super_method
-            @__overrider_singleton_trace_point.disable
-            @__overrider_singleton_trace_point = nil
-            raise NoSuperMethodError.new(self, meth)
-          end
-        end
-        @__overrider_singleton_trace_point.disable
-        @__overrider_singleton_trace_point = nil
-      end
-    end
+    trace_for_override(owner)
 
     symbol
   end

data/lib/overrider/version.rb

@@ -1,3 +1,3 @@
 module Overrider
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overrider
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Add override syntax that ensures that target method has super method.