aop 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab47f56fd5a02a5de555ceb2ace3ffeed0300db0
-  data.tar.gz: 8657d57606125d660e8cbbd544054ddfb7988381
+  metadata.gz: a11ed9fc8c66d7dbf41febbfb8fc4d0205a3c937
+  data.tar.gz: 78ecf889219aeb28e044d948a40185901475b7fc
 SHA512:
-  metadata.gz: fcfc3efd8608afcc4890a712d7b57468ef795b22e4dae6405827105ab95a8c84c1f4c62f0f2c50855a1cbd5508504b263e7d0ca203b571db1661783730e5e06e
-  data.tar.gz: 77bef4440f0080fda36afd8399c5cdebf9502b0aebe9db42c31353e36d051cf7c1b1d7f6bbd704d1143584ea4e749483bb5dd8469fe015e251c4603d9c1e1935
+  metadata.gz: 264164d2abb7be0975a398ae799b0ddf59068d86a0194182476725babba90a2d1875c9d2c155ad6d775f3f54130c5aa7a9b6708fc295db77f0be9f61b9931259
+  data.tar.gz: 8ab954e1e2afe9dbc5b3b7c4cf7c9b2c9311615483841b2f5c0efd2c787b2c67b5d1c1d7cdf044711abe8745e139d0d05d28950c65d72b579f3390533c789c4b

data/.travis.yml

@@ -9,5 +9,8 @@ rvm:
   - jruby-19mode
   - rbx
 
-script: bundle exec rspec
-bundler_args: --without development
+bundler_args: --without development
+
+script:
+  - bundle exec rspec
+  - bundle exec ruby integration/contracts.rb

data/Gemfile

@@ -1,13 +1,14 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in aop.gemspec
 gemspec
 
 group :test do
-  gem 'rspec'
+  gem "rspec"
+  gem "contracts"
 end
 
 group :development do
   gem "method_profiler"
   gem "ruby-prof"
-end
+end

data/benchmarks/before.rb

@@ -42,8 +42,8 @@ def profile
   observers << MethodProfiler.observe(Example)
   observers << MethodProfiler.observe(Aop)
   observers << MethodProfiler.observe(Aop::Pointcut)
-  observers << MethodProfiler.observe(Aop::Pointcut::MethodReference)
-  observers << MethodProfiler.observe(Aop::Pointcut::MethodReference::Singleton)
+  observers << MethodProfiler.observe(Aop::MethodReference)
+  observers << MethodProfiler.observe(Aop::MethodReference::Singleton)
 
   10000.times do
     example.heavy_add(rand(1000), rand(1000))

data/integration/contracts.rb

@@ -0,0 +1,23 @@
+require "aop"
+require "contracts"
+
+class BankAccount < Struct.new(:number, :amount)
+  include Contracts
+
+  Contract BankAccount, Num => Num
+  def transfer(other, amount)
+    self.amount -= amount
+    other.amount += amount
+  end
+end
+
+@actual = nil
+@expected = "Transfered 100 from 12345 to 98765"
+
+Aop["BankAccount#transfer:after"].advice do |account, other, amount|
+  @actual = "Transfered #{amount} from #{account.number} to #{other.number}"
+end
+
+BankAccount[12345, 955].transfer(BankAccount[98765, 130], 100)
+
+fail "\nExpected: #{@expected}\nActual:   #{@actual}" unless @expected == @actual

data/lib/aop.rb

@@ -1,5 +1,14 @@
-require "aop/version"
-require "aop/pointcut"
+%w[
+  version
+
+  errors
+  pointcut
+  joint_point
+  method_reference
+].each { |name| require "aop/#{name}" }
 
 module Aop
+  def self.[](pointcut_spec)
+    Pointcut.new(pointcut_spec)
+  end
 end

data/lib/aop/errors.rb

@@ -0,0 +1,14 @@
+module Aop
+  class PointcutNotFound < StandardError
+    attr_reader :original_error
+
+    def initialize(pointcut_spec, original_error)
+      super("Unable to find pointcut #{pointcut_spec}")
+      @original_error = original_error
+    end
+
+    def to_s
+      "#{super}\n\tReason: #{original_error.inspect}"
+    end
+  end
+end

data/lib/aop/joint_point.rb

@@ -0,0 +1,14 @@
+module Aop
+  class JointPoint
+    def initialize(method_name, action)
+      @method_name = method_name
+      @action = action
+    end
+
+    def call(*args)
+      @action.call(*args)
+    end
+
+    attr_reader :method_name
+  end
+end

data/lib/aop/method_reference.rb

@@ -0,0 +1,63 @@
+module Aop
+  class MethodReference
+    def self.from(m)
+      return new(m) if m[0...1] == "#"
+      Singleton.new(m)
+    end
+
+    def initialize(m)
+      @name = m[1..-1]
+    end
+
+    def decorate(target, &with)
+      name = @name
+      new_name = alias_name
+      alias_target(target).class_eval do
+        alias_method(new_name, name)
+        define_method(name, &with)
+      end
+    rescue NameError => err
+      raise PointcutNotFound.new(method_spec(target), err)
+    end
+
+    def call(target, *args, &blk)
+      target.send(alias_name, *args, &blk)
+    end
+
+    def method_name
+      "#{method_notation}#{@name}"
+    end
+
+    private
+
+    def method_spec(target)
+      "#{target_name(target)}#{method_name}"
+    end
+
+    def method_notation
+      "#"
+    end
+
+    def alias_target(target)
+      target
+    end
+
+    def target_name(target)
+      target.name || target.inspect
+    end
+
+    def alias_name
+      @_alias_name ||= :"__aop_#{SecureRandom.hex(10)}"
+    end
+
+    class Singleton < self
+      def method_notation
+        "."
+      end
+
+      def alias_target(target)
+        class << target; self; end
+      end
+    end
+  end
+end

data/lib/aop/pointcut.rb

@@ -1,23 +1,6 @@
 require "securerandom"
 
 module Aop
-  def self.[](pointcut_spec)
-    Pointcut.new(pointcut_spec)
-  end
-
-  class PointcutNotFound < StandardError
-    attr_reader :original_error
-
-    def initialize(pointcut_spec, original_error)
-      super("Unable to find pointcut #{pointcut_spec}")
-      @original_error = original_error
-    end
-
-    def to_s
-      "#{super}\n\tReason: #{original_error.inspect}"
-    end
-  end
-
   class Pointcut
     def initialize(spec)
       @spec = spec
@@ -87,69 +70,14 @@ module Aop
       generic_advice(advised) do |method_ref|
         lambda do |*args, &blk|
           result = nil
-          joint_point = lambda { result = method_ref.call(self, *args, &blk) }
+          joint_point = JointPoint.new(
+            method_ref.method_name,
+            lambda { result = method_ref.call(self, *args, &blk) }
+          )
           advised.call(joint_point, self, *args, &blk)
           result
         end
       end
     end
-
-    class MethodReference
-      def self.from(m)
-        return new(m) if m[0...1] == "#"
-        Singleton.new(m)
-      end
-
-      def initialize(m)
-        @name = m[1..-1]
-      end
-
-      def decorate(target, &with)
-        name = @name
-        new_name = alias_name
-        alias_target(target).class_eval do
-          alias_method(new_name, name)
-          define_method(name, &with)
-        end
-      rescue NameError => err
-        raise PointcutNotFound.new(method_spec(target), err)
-      end
-
-      def call(target, *args, &blk)
-        target.send(alias_name, *args, &blk)
-      end
-
-      private
-
-      def method_spec(target)
-        "#{target_name(target)}#{method_notation}#{@name}"
-      end
-
-      def method_notation
-        "#"
-      end
-
-      def alias_target(target)
-        target
-      end
-
-      def target_name(target)
-        target.name || target.inspect
-      end
-
-      def alias_name
-        @_alias_name ||= :"__aop_#{SecureRandom.hex(10)}"
-      end
-
-      class Singleton < self
-        def method_notation
-          "."
-        end
-
-        def alias_target(target)
-          class << target; self; end
-        end
-      end
-    end
   end
 end

data/lib/aop/version.rb

@@ -1,3 +1,3 @@
 module Aop
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/aop/around_spec.rb

@@ -8,6 +8,7 @@ RSpec.describe "Around advice" do
 
     Aop["BankAccount#transfer:around"].advice do |joint_point, account, *args, &blk|
       spy.before(account, *args, &blk)
+      spy.method_is(joint_point.method_name)
       joint_point.call
       spy.after(account, *args, &blk)
     end
@@ -19,6 +20,7 @@ RSpec.describe "Around advice" do
     amount = 55
 
     expect(spy).to receive(:before).with(account, other, amount).ordered.once
+    expect(spy).to receive(:method_is).with("#transfer").ordered.once
     expect(spy).to receive(:inside).with(other, amount).ordered.once
     expect(spy).to receive(:after).with(account, other, amount).ordered.once
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aop
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Alex Fedorov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,7 +54,11 @@ files:
 - Rakefile
 - aop.gemspec
 - benchmarks/before.rb
+- integration/contracts.rb
 - lib/aop.rb
+- lib/aop/errors.rb
+- lib/aop/joint_point.rb
+- lib/aop/method_reference.rb
 - lib/aop/pointcut.rb
 - lib/aop/version.rb
 - spec/aop/advanced_spec.rb