aop 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a11ed9fc8c66d7dbf41febbfb8fc4d0205a3c937
-  data.tar.gz: 78ecf889219aeb28e044d948a40185901475b7fc
+  metadata.gz: 2627d0786bc6e33b83e833b9ccd9a7fd42cd7c36
+  data.tar.gz: a252c109c0c138f2c64593f2f1aabb5b49051b42
 SHA512:
-  metadata.gz: 264164d2abb7be0975a398ae799b0ddf59068d86a0194182476725babba90a2d1875c9d2c155ad6d775f3f54130c5aa7a9b6708fc295db77f0be9f61b9931259
-  data.tar.gz: 8ab954e1e2afe9dbc5b3b7c4cf7c9b2c9311615483841b2f5c0efd2c787b2c67b5d1c1d7cdf044711abe8745e139d0d05d28950c65d72b579f3390533c789c4b
+  metadata.gz: 46d02c87653970b28799e3c31c2444f74b23aca494c47f997a5e69c3228d64815060240b790b473c2fb86d9027f17f29d19416f4a7d135820035b27878054bf8
+  data.tar.gz: 2efcc6cef881ca92868ed7060970d3a3f4a996620946619bebb1d67384494f939311a8d9da135272550128ccedafbf6d4bf45e96b7dfcbdc7feca2a6759ccf25

data/.travis.yml

@@ -14,3 +14,4 @@ bundler_args: --without development
 script:
   - bundle exec rspec
   - bundle exec ruby integration/contracts.rb
+  - bundle exec ruby integration/contracts_pattern_matching.rb

data/integration/contracts_pattern_matching.rb

@@ -0,0 +1,29 @@
+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
+
+  Contract nil, Num => Num
+  def transfer(_, amount)
+    self.amount -= amount
+  end
+end
+
+@actual = nil
+@expected = "Transfered 100 from 12345 to cash account"
+
+Aop["BankAccount#transfer:around"].advice do |jp, account, other, amount|
+  @actual = "Transfered #{amount} from #{account.number} to #{other ? other.number : "cash account"}"
+  jp.call
+end
+
+BankAccount[12345, 955].transfer(nil, 100)
+
+fail "\nExpected: #{@expected}\nActual:   #{@actual}" unless @expected == @actual

data/lib/aop/pointcut.rb

@@ -16,7 +16,6 @@ module Aop
       end
 
       @method_spec = spec.scan(/[#\.][^,#\.:]+/)
-      @methods = @method_spec.map { |m| MethodReference.from(m) }
 
       @advices = spec.scan(/[^:]:([^:,]+)/).flatten
     end
@@ -37,12 +36,11 @@ module Aop
     end
 
     def generic_advice(advised, &body)
-      methods = @methods
+      methods = @method_spec
       @classes.each do |klass|
-        klass.class_eval do
-          methods.each do |method_ref|
-            method_ref.decorate(klass, &body[method_ref])
-          end
+        methods.each do |method|
+          method_ref = MethodReference.from(method)
+          method_ref.decorate(klass, &body[method_ref])
         end
       end
     end

data/lib/aop/version.rb

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

data/spec/aop/advanced_spec.rb

@@ -5,9 +5,49 @@ RSpec.describe "Advanced advices" do
 
   before do
     load_fixture("BankAccount", "bank_account")
+    load_fixture("OtherBankAccount", "other_bank_account")
     load_fixture("CashAccount", "cash_account")
   end
 
+  describe "double advice" do
+    before do
+      Aop["BankAccount#transfer:around"].advice do |joint_point, *args, &blk|
+        joint_point.call
+      end
+
+      Aop["BankAccount#transfer:around"].advice do |joint_point, *args, &blk|
+        joint_point.call
+      end
+    end
+
+    it "works" do
+      account = BankAccount.new(spy)
+      other = BankAccount.new(spy)
+      amount = 55
+
+      expect(spy).to receive(:inside).with(other, amount).ordered.once
+
+      expect(account.transfer(other, amount)).to eq(:a_result)
+    end
+  end
+
+  describe "inheritance advice" do
+    before do
+      Aop["BankAccount,OtherBankAccount#transfer:before"].advice do |joint_point, *args, &blk|
+      end
+    end
+
+    it "works" do
+      account = OtherBankAccount.new(spy)
+      other = BankAccount.new(spy)
+      amount = 55
+
+      expect(spy).to receive(:inside).with(other, amount).ordered.once
+
+      expect(account.transfer(other, amount)).to eq(:a_result)
+    end
+  end
+
   describe "class methods" do
     before do
       Aop["BankAccount.transfer:around"].advice do |joint_point, klass, *args, &blk|

data/spec/fixtures/other_bank_account.rb

@@ -0,0 +1,5 @@
+class OtherBankAccount < BankAccount
+  def transfer(other, amount)
+    super
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aop
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Alex Fedorov
@@ -55,6 +55,7 @@ files:
 - aop.gemspec
 - benchmarks/before.rb
 - integration/contracts.rb
+- integration/contracts_pattern_matching.rb
 - lib/aop.rb
 - lib/aop/errors.rb
 - lib/aop/joint_point.rb
@@ -67,6 +68,7 @@ files:
 - spec/aop/before_spec.rb
 - spec/fixtures/bank_account.rb
 - spec/fixtures/cash_account.rb
+- spec/fixtures/other_bank_account.rb
 - spec/spec_helper.rb
 - spec/support/loader.rb
 homepage: https://github.com/waterlink/aop
@@ -100,5 +102,6 @@ test_files:
 - spec/aop/before_spec.rb
 - spec/fixtures/bank_account.rb
 - spec/fixtures/cash_account.rb
+- spec/fixtures/other_bank_account.rb
 - spec/spec_helper.rb
 - spec/support/loader.rb