super_module 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4faa73d0b49aef392b5dd1c26df10e4fc7ae5f9c528284503cd68df38c2381b
-  data.tar.gz: 9c48055a31b17ae2cdd554314cc3dbbf4d10e6eb2a93d4f21636663ce0f0a6c5
+  metadata.gz: 192ef511f9395d9d90d7110a154602a4c62a47c5287cfaf9662456be09c84712
+  data.tar.gz: c4233e47af1355abff03878070f2916175aa1c399deb3a2e696b5fb18351dbef
 SHA512:
-  metadata.gz: 37e9470e3ebe8977cf24425169ac7976304ba4d4eb1c0ca8069fa761813184d24e182235cc57ae01674f09189e22fe2681bd0b3a580e23aff50e323cc47ef435
-  data.tar.gz: 998e4a95be965413b20f49d2dad072a3458b61fd13e34eb33db601bd96ee3f7581c015ccb0e8872b8f3ef329a585dea902cccc165ac7921e58c503a6b2396892
+  metadata.gz: f1cd9c156c81762b287a4eb67b1b0b1bff5a27cd0325e3baef9b0fe2da7b77a3ecfb948c21ed99c295e6c020858c0c2c0a507dd8c9c232f80b6abc07b539cf17
+  data.tar.gz: 11973559c530a77b64f1d04bdd15964f73549f1b3a3f7fc93d694b503f35cfcacbdacbbf74602b2ea371b02d70137ab26b663756e7ab4d753bb19f0910df752f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.4.1
+
+- Pauses singleton method recording inside a super_module_included block to avoid replaying on submodules
+
 ## 1.4.0
 
 - Support aliased methods

data/README.md

@@ -1,4 +1,4 @@
-# <img src="https://raw.githubusercontent.com/AndyObtiva/super_module/master/SuperModule.jpg" alt="SuperModule" align="left" height="50" /> &nbsp; SuperModule 1.3
+# <img src="https://raw.githubusercontent.com/AndyObtiva/super_module/master/SuperModule.jpg" alt="SuperModule" align="left" height="50" /> &nbsp; SuperModule 1.4.0
 [![Gem Version](https://badge.fury.io/rb/super_module.svg)](http://badge.fury.io/rb/super_module)
 [![Build Status](https://api.travis-ci.org/AndyObtiva/super_module.svg?branch=master)](https://travis-ci.org/AndyObtiva/super_module)
 [![Coverage Status](https://coveralls.io/repos/AndyObtiva/super_module/badge.svg?branch=master)](https://coveralls.io/r/AndyObtiva/super_module?branch=master)
@@ -104,7 +104,7 @@ In other words, [SuperModule](https://rubygems.org/gems/super_module) furthers R
 
 <b>Using [Bundler](http://bundler.io/)</b>
 
-Add the following to Gemfile: <pre>gem 'super_module', '1.4.0'</pre>
+Add the following to Gemfile: <pre>gem 'super_module', '1.4.1'</pre>
 
 And run the following command: <pre>bundle</pre>
 

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/lib/super_module/v1.rb

@@ -28,7 +28,15 @@ module SuperModule
             def included(base)
               __define_super_module_singleton_methods(base)
               __invoke_module_body_method_calls(base)
-              super_module_included.each {|block| block.call(base)}
+              super_module_included.each do |block|
+                self.__inside_super_module_included = true
+                base.__inside_super_module_included = true       
+                block.binding.receiver.__inside_super_module_included = true       
+                block.call(base)
+                block.binding.receiver.__inside_super_module_included = false
+                base.__inside_super_module_included = false
+                self.__inside_super_module_included = false
+              end
               if base.ancestors.include?(SuperModule) && !base.is_a?(Class)
                 super_module_included.reverse.each do |block|
                   base.super_module_included.unshift(block)

data/lib/super_module/v1/module_body_method_call_recorder.rb

@@ -5,6 +5,8 @@ module SuperModule
         @__super_module_singleton_methods_excluded_from_call_recording ||= [
           :__record_method_call,
           :__method_signature,
+          :__inside_super_module_included?,
+          :__inside_super_module_included=,
         ]
       end
 
@@ -17,10 +19,18 @@ module SuperModule
       end
 
       def __record_method_call(method_name, *args, &block)
-        return if self.is_a?(Class)
+        return if self.is_a?(Class) || __inside_super_module_included?
         __module_body_method_calls << [method_name, args, block]
       end
 
+      def __inside_super_module_included?
+        @__inside_super_module_included
+      end
+ 
+      def __inside_super_module_included=(value)
+        @__inside_super_module_included = !!value
+      end
+
       def __all_module_body_method_calls_in_definition_order
         ancestor_module_body_method_calls = included_super_modules.map(&:__module_body_method_calls).flatten(1)
         all_module_body_method_calls = __module_body_method_calls + ancestor_module_body_method_calls

data/lib/super_module/v1/singleton_method_definition_store.rb

@@ -54,11 +54,12 @@ module SuperModule
       end
 
       def __singleton_method_definition_regex(method_name)
+        method_name = Regexp.escape(method_name.to_s)
         /(public|protected|private)?(send)?[ \t(:"']*def(ine_method)?[ \t,:"']+(self\.)?#{method_name}\)?[ \tdo{(|]*([^\n)|;]*)?[ \t)|;]*/m
       end
 
       def __singleton_method_args(method_name, method_body)
-        method_arg_match = method_body.match(__singleton_method_definition_regex(method_name)).to_a[5]
+        method_body.match(__singleton_method_definition_regex(method_name)).to_a[5]
       end
 
       def __singleton_method_access_level(method_name)
@@ -106,6 +107,8 @@ module SuperModule
         base.extend(SuperModule::V1::ModuleBodyMethodCallRecorder) unless base.is_a?(SuperModule::V1::ModuleBodyMethodCallRecorder)
         base.singleton_method_added(:__method_signature)
         base.singleton_method_added(:__record_method_call)
+        base.singleton_method_added(:__inside_super_module_included?)
+        base.singleton_method_added(:__inside_super_module_included=)
       end
     end
   end

data/spec/lib/super_module_spec.rb

@@ -19,12 +19,6 @@ end
 module V1::SummarizedActiveModel
   include SuperModule
 
-  super_module_included do |klass|
-    if klass.name.split(/::/).last.start_with?('Fake')
-      klass.extend(FakeClassMethods1)
-    end
-  end
-
   module FakeClassMethods1
     def fake_summary
       'This is a fake summary.'
@@ -43,7 +37,19 @@ module V1::SummarizedActiveModel
     def summary
       validations.flatten.map(&:to_s).join("/")
     end
+
+    def only_call_in_super_module_included
+      raise 'Error' unless self == ::V1::SummarizedActiveModel
+    end
   end
+
+  super_module_included do |klass|
+    if klass.name.split(/::/).last.start_with?('Fake')
+      klass.extend(FakeClassMethods1)
+    end
+    only_call_in_super_module_included # should not get recorded for submodules/subclasses
+  end
+
 end
 
 module V1::ExtraSummarizedActiveModel

data/super_module.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: super_module 1.4.0 ruby lib
+# stub: super_module 1.4.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "super_module".freeze
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Andy Maleh".freeze]
-  s.date = "2020-04-06"
+  s.date = "2020-04-23"
   s.description = "SuperModule allows defining class methods and method invocations the same way a super class does without using def included(base). This also succeeds ActiveSupport::Concern by offering lighter syntax".freeze
   s.extra_rdoc_files = [
     "CHANGELOG.md",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_module
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Andy Maleh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source