super_module 1.1.1 → 1.2.0

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.1.1 ruby lib
+# stub: super_module 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "super_module"
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Andy Maleh"]
-  s.date = "2015-04-09"
+  s.date = "2016-05-03"
   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"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -26,15 +26,30 @@ Gem::Specification.new do |s|
     "examples/reddit-readers/banister/foo.rb",
     "examples/reddit-readers/banister/world.rb",
     "lib/super_module.rb",
-    "lib/super_module/module_body_method_call_recorder.rb",
-    "lib/super_module/singleton_method_definition_store.rb",
+    "lib/super_module/v1.rb",
+    "lib/super_module/v1/module_body_method_call_recorder.rb",
+    "lib/super_module/v1/singleton_method_definition_store.rb",
     "ruby187.Gemfile",
     "spec/lib/super_module_spec.rb",
     "spec/support/bar.rb",
     "spec/support/baz.rb",
     "spec/support/fake_active_model.rb",
     "spec/support/foo.rb",
-    "spec/support/support.rb",
+    "spec/support/v1.rb",
+    "spec/support/v1/bar.rb",
+    "spec/support/v1/baz.rb",
+    "spec/support/v1/fake_active_model.rb",
+    "spec/support/v1/foo.rb",
+    "spec/support/v2.rb",
+    "spec/support/v2/bar.rb",
+    "spec/support/v2/baz.rb",
+    "spec/support/v2/fake_active_model.rb",
+    "spec/support/v2/foo.rb",
+    "spec/support/v2_alt.rb",
+    "spec/support/v2_alt/bar.rb",
+    "spec/support/v2_alt/baz.rb",
+    "spec/support/v2_alt/fake_active_model.rb",
+    "spec/support/v2_alt/foo.rb",
     "super_module.gemspec"
   ]
   s.homepage = "http://github.com/AndyObtiva/super_module"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: super_module
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
@@ -84,15 +84,30 @@ files:
 - examples/reddit-readers/banister/foo.rb
 - examples/reddit-readers/banister/world.rb
 - lib/super_module.rb
-- lib/super_module/module_body_method_call_recorder.rb
-- lib/super_module/singleton_method_definition_store.rb
+- lib/super_module/v1.rb
+- lib/super_module/v1/module_body_method_call_recorder.rb
+- lib/super_module/v1/singleton_method_definition_store.rb
 - ruby187.Gemfile
 - spec/lib/super_module_spec.rb
 - spec/support/bar.rb
 - spec/support/baz.rb
 - spec/support/fake_active_model.rb
 - spec/support/foo.rb
-- spec/support/support.rb
+- spec/support/v1.rb
+- spec/support/v1/bar.rb
+- spec/support/v1/baz.rb
+- spec/support/v1/fake_active_model.rb
+- spec/support/v1/foo.rb
+- spec/support/v2.rb
+- spec/support/v2/bar.rb
+- spec/support/v2/baz.rb
+- spec/support/v2/fake_active_model.rb
+- spec/support/v2/foo.rb
+- spec/support/v2_alt.rb
+- spec/support/v2_alt/bar.rb
+- spec/support/v2_alt/baz.rb
+- spec/support/v2_alt/fake_active_model.rb
+- spec/support/v2_alt/foo.rb
 - super_module.gemspec
 homepage: http://github.com/AndyObtiva/super_module
 licenses:

data/lib/super_module/module_body_method_call_recorder.rb

@@ -1,40 +0,0 @@
-module SuperModule
-  module ModuleBodyMethodCallRecorder
-    def __super_module_singleton_methods_excluded_from_call_recording
-      @__super_module_singleton_methods_excluded_from_call_recording ||= [
-        :__record_method_call,
-        :__method_signature
-      ]
-    end
-
-    def __module_body_method_calls
-      @__module_body_method_calls ||= []
-    end
-
-    def __method_signature(method_name, args)
-      "#{method_name}(#{args.to_a.map(&:to_s).join(",")})"
-    end
-
-    #TODO handle case of a method call being passed a block (e.g. validates do custom validator end )
-    def __record_method_call(method_name, *args, &block)
-      return if self.is_a?(Class)
-      __module_body_method_calls << [method_name, args, block]
-    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
-      all_module_body_method_calls.reverse
-    end
-
-    def __singleton_method_call_recorder(method_name, method_args)
-      unless __super_module_singleton_methods_excluded_from_call_recording.include?(method_name)
-        method_call_recorder_args = "'#{method_name}'"
-        method_call_recorder_args << ", #{method_args}" unless method_args.to_s.strip == '' 
-        "self.__record_method_call(#{method_call_recorder_args})" 
-      end
-    end
-  end
-end
-   
-

data/lib/super_module/singleton_method_definition_store.rb

@@ -1,102 +0,0 @@
-require 'method_source'
-require File.expand_path(File.join(File.dirname(__FILE__), 'module_body_method_call_recorder')) # backwards compatible with Ruby 1.8.7
-
-module SuperModule
-  module SingletonMethodDefinitionStore
-    # excluded list of singleton methods to define (perhaps give a better name)
-    def __super_module_singleton_methods_excluded_from_base_definition
-      @__super_module_singleton_methods_excluded_from_base_definition ||= [
-        :__all_module_body_method_calls_in_definition_order,
-        :__build_singleton_method_body_source,
-        :__define_super_module_singleton_methods,
-        :__invoke_module_body_method_calls,
-        :__module_body_method_calls,
-        :__overwrite_singleton_method_from_current_super_module,
-        :__singleton_method_args,
-        :__singleton_method_body,
-        :__singleton_method_body_for,
-        :__singleton_method_call_recorder,
-        :__singleton_method_definition_regex,
-        :__super_module_having_method,
-        :__super_module_singleton_methods,
-        :__super_module_singleton_methods_excluded_from_base_definition,
-        :__super_module_singleton_methods_excluded_from_call_recording,
-        :class_eval,
-        :dbg_print, #debugger library friendly exclusion
-        :dbg_puts, #debugger library friendly exclusion
-        :included, 
-        :included_super_modules,
-        :singleton_method_added
-      ]
-    end
-
-    def __super_module_singleton_methods
-      @__super_module_singleton_methods ||= []
-    end
-    
-    def __singleton_method_body_for(super_module, method_name)
-      super_module.__super_module_singleton_methods.detect {|sm_method_name, sm_method_body| sm_method_name == method_name}[1]
-    end
-
-    def included_super_modules
-      included_modules.select {|m| m.include?(SuperModule)}
-    end
-
-    def __all_methods(object)
-      object.public_methods + object.protected_methods + object.private_methods
-    end
-
-    def __super_module_having_method(method_name)
-      included_super_modules.detect {|included_super_module| __all_methods(included_super_module).map(&:to_s).include?(method_name.to_s)}
-    end
-
-    def __singleton_method_definition_regex(method_name)
-      /(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]
-    end
-
-    def __singleton_method_access_level(method_name)
-      %w(private protected public).detect do |method_access|
-        method_group = "#{method_access}_methods"
-        send(method_group).map(&:to_s).include?(method_name.to_s)
-      end
-    end
-
-    def __build_singleton_method_body_source(method_name)
-      method_body = self.method(method_name).source
-      method_args = __singleton_method_args(method_name, method_body)
-      method_body = "def #{method_name}\n#{method_body}\nend" if method_args.nil?
-      class_self_method_def_enclosure = "class << self\n#{__singleton_method_access_level(method_name)}\ndef #{method_name}(#{method_args})\n#{__singleton_method_call_recorder(method_name, method_args)}\n"
-      method_body.sub(__singleton_method_definition_regex(method_name), class_self_method_def_enclosure) + "\nend\n"
-    end
-
-    def __singleton_method_body(method_name)
-        super_module_having_method = __super_module_having_method(method_name)
-        super_module_having_method ? __singleton_method_body_for(super_module_having_method, method_name) : __build_singleton_method_body_source(method_name) 
-    end
-
-    def __overwrite_singleton_method_from_current_super_module(method_name, method_body)
-      if __super_module_having_method(method_name).nil?
-        __super_module_singleton_methods_excluded_from_base_definition << method_name
-        class_eval(method_body)
-      end
-    end
-
-    def singleton_method_added(method_name)
-      unless __super_module_singleton_methods_excluded_from_base_definition.include?(method_name)
-        method_body = __singleton_method_body(method_name)
-        __super_module_singleton_methods << [method_name, method_body] 
-        __overwrite_singleton_method_from_current_super_module(method_name, method_body)
-      end
-    end
-
-    def self.extended(base)
-      base.extend(SuperModule::ModuleBodyMethodCallRecorder) unless base.respond_to?(:__record_method_call)
-      base.singleton_method_added(:__method_signature)
-      base.singleton_method_added(:__record_method_call)
-    end
-  end
-end

data/spec/support/support.rb

@@ -1,4 +0,0 @@
-require File.join(File.dirname(__FILE__), 'fake_active_model')
-require File.join(File.dirname(__FILE__), 'foo')
-require File.join(File.dirname(__FILE__), 'bar')
-require File.join(File.dirname(__FILE__), 'baz')