aop 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af9f44c8cac54ec4197e54a135d3c6829b8badd6
-  data.tar.gz: f9ffd78f10555e9ef4f09c2d14231d7248f4c82f
+  metadata.gz: 265bbfbbde5fedca853374f381977f960186c174
+  data.tar.gz: 5ba07e066d01dfb9647f8294f29b1508604fe2ea
 SHA512:
-  metadata.gz: f24dd40907b9bd09ac43e491651cfb64cedaa4044363d99fba028e3b23c85afe2a5d1a12baa6d2c440a6e7dec0aec8f65413048753584183cb63efb8a8451b2a
-  data.tar.gz: af8f883d3f73072302b052afd3e69cca24d4d5d0517bb404cb30c68bc9f9be906e987aa3e1a596c9d3e625a96e028a28c5f7166708f405e66aa184b23282ca71
+  metadata.gz: 4e762bcad98bbbf72d5f867d22bb20e1add43d02a66e0f63f1da21c1804b335b539bee2eea2c2956c0a7900153931285052a4ee21413bc78e620575c0caefb79
+  data.tar.gz: aa177e07c23669b04a02ac5de5e4ca9bedb2dacc7e92dd8124419b63fd5d5924fa0d236fee9dc01471ec32c8a3454e20cb19f59eb1c9e3b8c77cf1cb969092df

data/README.md

@@ -50,8 +50,6 @@ end
 
 ### Around advice
 
-*Not implemented*
-
 ```ruby
 module Transactional
   Aop["BankAccount#transfer:around"].advice do |joint_point, account, *args, &blk|
@@ -62,9 +60,31 @@ module Transactional
 end
 ```
 
-## TODO (to specify)
+### Class methods
+
+Use `.method` notation:
+
+```ruby
+module Transactional
+  Aop["BankAccount.transfer:around"].advice do |joint_point, klass, *args, &blk|
+    start_transaction
+    joint_point.call
+    finish_transaction
+  end
+end
+```
+
+### Multiple classes, methods and advices
 
-- multiple classes, methods and types of advices at once
+Use `,` to use multiple classes, methods and advices:
+
+```ruby
+module Analytics
+  Aop["User,Admin#sign_in,.sign_up,#sign_out:before,:after"].advice do |target, *args, &blk|
+    report("auth_action", user.id)
+  end
+end
+```
 
 ## Contributing
 

data/lib/aop/pointcut.rb

@@ -13,16 +13,16 @@ module Aop
       @class_names = @class_spec.split(",")
       @classes = @class_names.map { |name| Object.const_get(name) }
 
-      @method_spec = spec.scan(/[#\.][^#\.:]+/)
+      @method_spec = spec.scan(/[#\.][^,#\.:]+/)
       @methods = @method_spec.map { |m| MethodReference.from(m) }
 
-      @advices = spec.scan(/[^:]:([^:]+)/).flatten
+      @advices = spec.scan(/[^:]:([^:,]+)/).flatten
     end
 
     def advice(&advised)
-      advices = @advices
-      advices.each do |advice|
-        _advice(advice, advised)
+      return _advice(@advices.first, advised) if @advices.count == 1
+      @advices.each do |advice|
+        Aop["#{@class_names.join(",")}#{@method_spec.join(",")}:#{advice}"].advice(&advised)
       end
     end
 
@@ -30,6 +30,7 @@ module Aop
 
     def _advice(advice, advised)
       return before_advice(advised) if advice == "before"
+      return around_advice(advised) if advice == "around"
       after_advice(advised)
     end
 
@@ -63,6 +64,17 @@ module Aop
       end
     end
 
+    def around_advice(advised)
+      generic_advice(advised) do |method_ref|
+        lambda do |*args, &blk|
+          result = nil
+          joint_point = 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] == "#"
@@ -83,7 +95,7 @@ module Aop
       end
 
       def call(target, *args, &blk)
-        alias_target(target).send(alias_name, *args, &blk)
+        target.send(alias_name, *args, &blk)
       end
 
       private

data/lib/aop/version.rb

@@ -1,3 +1,3 @@
 module Aop
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/aop/advanced_spec.rb

@@ -0,0 +1,110 @@
+RSpec.describe "Advanced advices" do
+  include FixtureLoader
+
+  let(:spy) { double("Spy") }
+
+  before do
+    load_fixture("BankAccount", "bank_account")
+    load_fixture("CashAccount", "cash_account")
+  end
+
+  describe "class methods" do
+    before do
+      Aop["BankAccount.transfer:around"].advice do |joint_point, klass, *args, &blk|
+        spy.before(klass, *args, &blk)
+        joint_point.call
+        spy.after(klass, *args, &blk)
+      end
+    end
+
+    it "fires around #transfer" do
+      account = BankAccount.new(spy)
+      other = BankAccount.new(spy)
+      amount = 55
+
+      expect(spy).to receive(:before).with(BankAccount, spy, account, other, amount).ordered.once
+      expect(spy).to receive(:inside).with(spy, account, other, amount).ordered.once
+      expect(spy).to receive(:after).with(BankAccount, spy, account, other, amount).ordered.once
+
+      expect(BankAccount.transfer(spy, account, other, amount)).to eq(:a_result)
+    end
+  end
+
+  describe "multiple classes, methods and advices" do
+    before do
+      Aop["BankAccount,CashAccount#transfer,#withdraw,.transfer:before,:after"].advice do |*args, &blk|
+        spy.report(*args, &blk)
+      end
+    end
+
+    it "works for BankAccount#transfer" do
+      account = BankAccount.new(spy)
+      other = BankAccount.new(spy)
+      amount = 55
+
+      expect(spy).to receive(:report).with(account, other, amount).ordered.once
+      expect(spy).to receive(:inside).with(other, amount).ordered.once
+      expect(spy).to receive(:report).with(account, other, amount).ordered.once
+
+      expect(account.transfer(other, amount)).to eq(:a_result)
+    end
+
+    it "works for CashAccount#transfer" do
+      account = CashAccount.new(spy)
+      other = CashAccount.new(spy)
+      amount = 55
+
+      expect(spy).to receive(:report).with(account, other, amount).ordered.once
+      expect(spy).to receive(:inside).with(:cash_account, other, amount).ordered.once
+      expect(spy).to receive(:report).with(account, other, amount).ordered.once
+
+      expect(account.transfer(other, amount)).to eq(:a_result)
+    end
+
+    it "works for BankAccount#withdraw" do
+      account = BankAccount.new(spy)
+      amount = 55
+
+      expect(spy).to receive(:report).with(account, amount).ordered.once
+      expect(spy).to receive(:withdraw).with(account, amount).ordered.once
+      expect(spy).to receive(:report).with(account, amount).ordered.once
+
+      expect(account.withdraw(amount)).to eq(:a_result)
+    end
+
+    it "works for CashAccount#withdraw" do
+      account = CashAccount.new(spy)
+      amount = 55
+
+      expect(spy).to receive(:report).with(account, amount).ordered.once
+      expect(spy).to receive(:withdraw).with(:cash_account, account, amount).ordered.once
+      expect(spy).to receive(:report).with(account, amount).ordered.once
+
+      expect(account.withdraw(amount)).to eq(:a_result)
+    end
+
+    it "works for BankAccount.transfer" do
+      account = BankAccount.new(spy)
+      other = BankAccount.new(spy)
+      amount = 55
+
+      expect(spy).to receive(:report).with(BankAccount, spy, account, other, amount).ordered.once
+      expect(spy).to receive(:inside).with(spy, account, other, amount).ordered.once
+      expect(spy).to receive(:report).with(BankAccount, spy, account, other, amount).ordered.once
+
+      expect(BankAccount.transfer(spy, account, other, amount)).to eq(:a_result)
+    end
+
+    it "works for CashAccount.transfer" do
+      account = CashAccount.new(spy)
+      other = CashAccount.new(spy)
+      amount = 55
+
+      expect(spy).to receive(:report).with(CashAccount, spy, account, other, amount).ordered.once
+      expect(spy).to receive(:inside).with(:cash_account, spy, account, other, amount).ordered.once
+      expect(spy).to receive(:report).with(CashAccount, spy, account, other, amount).ordered.once
+
+      expect(CashAccount.transfer(spy, account, other, amount)).to eq(:a_result)
+    end
+  end
+end

data/spec/aop/around_spec.rb

@@ -0,0 +1,27 @@
+RSpec.describe "Around advice" do
+  include FixtureLoader
+
+  let(:spy) { double("Spy") }
+
+  before do
+    load_fixture("BankAccount", "bank_account")
+
+    Aop["BankAccount#transfer:around"].advice do |joint_point, account, *args, &blk|
+      spy.before(account, *args, &blk)
+      joint_point.call
+      spy.after(account, *args, &blk)
+    end
+  end
+
+  it "fires around #transfer" do
+    account = BankAccount.new(spy)
+    other = BankAccount.new(spy)
+    amount = 55
+
+    expect(spy).to receive(:before).with(account, other, amount).ordered.once
+    expect(spy).to receive(:inside).with(other, amount).ordered.once
+    expect(spy).to receive(:after).with(account, other, amount).ordered.once
+
+    expect(account.transfer(other, amount)).to eq(:a_result)
+  end
+end

data/spec/fixtures/bank_account.rb

@@ -3,4 +3,14 @@ class BankAccount < Struct.new(:spy)
     spy.inside(to, amount)
     :a_result
   end
+
+  def withdraw(amount)
+    spy.withdraw(self, amount)
+    :a_result
+  end
+
+  def self.transfer(spy, from, to, amount)
+    spy.inside(spy, from, to, amount)
+    :a_result
+  end
 end

data/spec/fixtures/cash_account.rb

@@ -0,0 +1,16 @@
+class CashAccount < Struct.new(:spy)
+  def transfer(to, amount)
+    spy.inside(:cash_account, to, amount)
+    :a_result
+  end
+
+  def withdraw(amount)
+    spy.withdraw(:cash_account, self, amount)
+    :a_result
+  end
+
+  def self.transfer(spy, from, to, amount)
+    spy.inside(:cash_account, spy, from, to, amount)
+    :a_result
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aop
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Alex Fedorov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,9 +56,12 @@ files:
 - lib/aop.rb
 - lib/aop/pointcut.rb
 - lib/aop/version.rb
+- spec/aop/advanced_spec.rb
 - spec/aop/after_spec.rb
+- spec/aop/around_spec.rb
 - spec/aop/before_spec.rb
 - spec/fixtures/bank_account.rb
+- spec/fixtures/cash_account.rb
 - spec/spec_helper.rb
 - spec/support/loader.rb
 homepage: https://github.com/waterlink/aop
@@ -86,8 +89,11 @@ signing_key:
 specification_version: 4
 summary: Very thin AOP gem for Ruby
 test_files:
+- spec/aop/advanced_spec.rb
 - spec/aop/after_spec.rb
+- spec/aop/around_spec.rb
 - spec/aop/before_spec.rb
 - spec/fixtures/bank_account.rb
+- spec/fixtures/cash_account.rb
 - spec/spec_helper.rb
 - spec/support/loader.rb