simple_aspect 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b231e9ddfdb2a5004ef5aa5228c3ac8571598d91
-  data.tar.gz: 014ace302235591326558b0ba957ed7fa857020f
+  metadata.gz: e991b108ddd328284fb3ce188939bf5a725482b1
+  data.tar.gz: 81e062bfdfc0e338fb13281be91eed674e42f4a0
 SHA512:
-  metadata.gz: 2a0c5c29a5718cc5828faa369b16a91ae3f877669e866cd7d1582b59cc899d18b0df4e174bc4adef027d988ebc987e8eead4b45dd676e6575900ff0d8c4ac83c
-  data.tar.gz: 03e71ae12c31d1cf8430f5b91932fee27f4a75a4777084e87c67ae4151d19d5a2bd7921e897d3a2870f9c6efc408abd74e6504de6daf420d144a2645b7df6eb0
+  metadata.gz: 11f0ed8fb7a82d60d7c4768ab67bbf9e96f44573f144d9a80973aeeb8a7901f5b6dd5c19f4ed0d740f6de43e05f0e8a7c0755983c4196384c34938d6f73c5c44
+  data.tar.gz: ba9b6f33b50018731847f2100165e1d4678ea015552777aefdf8d6965935ab5fec73f25e503e35300ef90a7f73ab53eaa6910cd5706b71ce1e2a18974d3ab0ca

data/.travis.yml

@@ -1,4 +1,10 @@
 language: ruby
 rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.7
   - 2.2.3
 before_install: gem install bundler -v 1.10.6
+install: bundle install -j 4 --retry 3
+script:
+  - bin/rspec

data/README.md

@@ -1,5 +1,7 @@
 # SimpleAspect
 
+[![Build Status](https://travis-ci.org/ricardotealdi/simple_aspect.svg?branch=master)](https://travis-ci.org/ricardotealdi/simple_aspect)
+
 Simple AOP implementation for Ruby
 
 ## Installation

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/lib/simple_aspect/version.rb

@@ -1,3 +1,3 @@
 module SimpleAspect
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/simple_aspect.rb

@@ -1,54 +1,105 @@
-require "simple_aspect/version"
+require 'simple_aspect/version'
 
 module SimpleAspect
   require 'thread'
 
   def self.extended(base)
     base.instance_eval do
-      @_sa_watcher_aspects = {}
-      @_sa_ignoring_methods = false
-      @_sa_lock = Mutex.new
+      @sa_methods_to_aspect_methods_name = {}
+      @sa_ignoring_new_methods = false
+      @sa_mutex = Mutex.new
     end
   end
 
   def aspect_around(
-    method, instance_around_method = instance_around_method_name(method), &block
+    method,
+    instance_around_method_name = sa_instance_around_method_name(method),
+    &block
   )
-    @_sa_watcher_aspects[method] = instance_around_method
-
-    if block
-      define_method(instance_around_method, &block)
-      self.instance_eval { private instance_around_method }
-    end
+    sa_register_aspect_on_method(method, instance_around_method_name, &block)
   end
 
   def method_added(method)
-    aspect = @_sa_watcher_aspects[method]
+    return if sa_should_not_redefine?(method)
 
-    return if @_sa_ignoring_methods || !aspect
+    sa_redefine_original_method(method, sa_get_aspect_method_name(method))
+  end
 
-    @_sa_lock.synchronize do
-      begin
-        @_sa_ignoring_methods = true
+  private
 
-        orig_impl = instance_method(method)
+  def sa_register_aspect_on_method(method, aspect_method_name, &block)
+    sa_set_aspect_method_name(method, aspect_method_name)
 
-        define_method(method) do |*args, &block|
-          result = nil
+    sa_define_aspect_method(aspect_method_name, &block) if block
+  end
 
-          send(aspect, *args) do
-            result = orig_impl.bind(self).call(*args, &block)
-          end
+  def sa_define_aspect_method(aspect_method_name, &block)
+    define_method(aspect_method_name, &block)
+    instance_eval { private aspect_method_name }
+  end
 
-          result
-        end
+  def sa_redefine_original_method(method, aspect_method)
+    sa_avoid_infinite_recursion do
+      define_method(
+        method, &sa_aspect_method_definition(
+          aspect_method, instance_method(method)
+        )
+      )
+    end
+  end
+
+  def sa_aspect_method_definition(
+    aspect_method, unbinded_original_implementation
+  )
+    proc do |*args, &block|
+      result = nil
+      send(aspect_method, *args) do
+        result = unbinded_original_implementation.bind(self).call(*args, &block)
+      end
+      result
+    end
+  end
+
+  def sa_avoid_infinite_recursion
+    sa_mutex.synchronize do
+      begin
+        sa_ignore_new_methods
+        yield
       ensure
-        @_sa_ignoring_methods = false
+        sa_ignore_new_methods(_ignore = false)
       end
     end
   end
 
-  def instance_around_method_name(method)
-    "_sa_around_#{method}".to_sym
+  def sa_should_redefine?(method)
+    !sa_ignoring_new_methods? && sa_get_aspect_method_name(method)
+  end
+
+  def sa_should_not_redefine?(method)
+    !sa_should_redefine?(method)
+  end
+
+  def sa_get_aspect_method_name(method)
+    @sa_methods_to_aspect_methods_name[method]
+  end
+
+  def sa_set_aspect_method_name(method, instance_around_method)
+    @sa_methods_to_aspect_methods_name[method] = instance_around_method
+  end
+
+  def sa_ignoring_new_methods?
+    @sa_ignoring_new_methods
+  end
+
+  def sa_ignore_new_methods(ignore = true)
+    @sa_ignoring_new_methods = ignore
+  end
+
+  def sa_mutex
+    @sa_mutex
+  end
+
+  def sa_instance_around_method_name(method)
+    "sa_around_#{method}".to_sym
   end
 end

data/simple_aspect.gemspec

@@ -4,20 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'simple_aspect/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "simple_aspect"
+  spec.name          = 'simple_aspect'
   spec.version       = SimpleAspect::VERSION
-  spec.authors       = ["Ricardo Tealdi"]
-  spec.email         = ["ricardo.tealdi@gmail.com"]
+  spec.authors       = ['Ricardo Tealdi']
+  spec.email         = ['ricardo.tealdi@gmail.com']
 
-  spec.summary       = %q{Simple AOP implementation for Ruby}
-  spec.description   = %q{Simple AOP implementation for Ruby}
-  spec.homepage      = "https://github.com/ricardotealdi/simple_aspect"
+  spec.summary       = 'Simple AOP implementation for Ruby'
+  spec.description   = 'Simple AOP implementation for Ruby'
+  spec.homepage      = 'https://github.com/ricardotealdi/simple_aspect'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.files         = `git ls-files -z`
+                       .split("\x0")
+                       .reject { |f| f.match(%r{^(test|spec|features)/}) }
+
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency 'rspec', '~> 3.4.0'
+  spec.add_development_dependency 'pry'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: simple_aspect
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ricardo Tealdi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - lib/simple_aspect.rb
 - lib/simple_aspect/version.rb
@@ -76,8 +77,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple AOP implementation for Ruby
 test_files: []
+has_rdoc: