aspectual 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 791be340bcb932e339d64f0735635b806b0ed860
-  data.tar.gz: e85f88a62334e97d685f2d626d7d9e7b8a45c8ff
+  metadata.gz: 3229da9400effd5026b954ea45865ea5e57e514c
+  data.tar.gz: 68bc5c8b63eee406ac02127f9c3c0cc9d6f2c0a9
 SHA512:
-  metadata.gz: d20e5e8d7ec23d34f6664626248f49e29276f2cb963383f19579bc6300e8182ce791eccc639d8d8bda12e3929f3aa3210d807504a3c96e3170001da86ccf07dc
-  data.tar.gz: c5dd639e0b3fa4f1e187fc445ba6682aef248a100bc99453e6e6d61a657c34284e6cf2edd2f9723e9390798ea21bcfd81f329f2a8c37f1f6d34fb729f64da7ef
+  metadata.gz: d259200db5b129a02b80b26cd8622ea969a67f5ed2b47451e77d6026e7aabf657a5be86ecd8e21bed7b6e1ba938cc14df0c4a20d2064503f229dc67959b987d6
+  data.tar.gz: e2e37da471291d851655249b0a3eda4f063a754f3569e1cf6cddd8fdbe7a094f13f2a8e9225f9ee95e7ef5c00b606c54036666ac8a14df28a2938dde612229dc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aspectual (0.0.2)
+    aspectual (0.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -22,6 +22,6 @@ PLATFORMS
 
 DEPENDENCIES
   aspectual!
-  bundler (~> 1.3)
+  bundler
   rake
   rspec

data/aspectual.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "bundler", "~> 0"
+  spec.add_development_dependency "rake", "~> 0"
+  spec.add_development_dependency "rspec", "~> 0"
 end

data/lib/aspectual/version.rb

@@ -1,3 +1,3 @@
 module Aspectual
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/lib/aspectual.rb

@@ -6,6 +6,7 @@ module Aspectual
     # aspects are added to one method, the first declared method will be
     # added last.
     @_before_aspects = Array(aspects[:before]).reverse
+    @_around_aspects = Array(aspects[:around]).reverse
     @_after_aspects  = Array(aspects[:after])
   end
 
@@ -14,7 +15,7 @@ module Aspectual
     return if @_defining_method
     if method_defined?(method_symbol)
 
-      %w{before after}.each do |position|
+      %w{before around after}.each do |position|
         current_aspects = instance_variable_get("@_#{position}_aspects")
         if current_aspects
           current_aspects.each do |aspect|
@@ -39,10 +40,12 @@ module Aspectual
     without_aspect_method_name = method_symbol.to_s + "_without_#{position}_" + aspect.to_s
 
     case position
-    when "after"
-      aspect_proc = lambda {|*args| send(without_aspect_method_name, *args); send(aspect, *args)}
     when "before"
       aspect_proc = lambda {|*args| send(aspect, *args); send(without_aspect_method_name, *args)}
+    when "around"
+      aspect_proc = lambda {|*args| send(aspect, *args, &Proc.new{send(without_aspect_method_name, *args)})}
+    when "after"
+      aspect_proc = lambda {|*args| send(without_aspect_method_name, *args); send(aspect, *args)}
     end
 
     define_method(with_aspect_method_name, aspect_proc)

data/spec/lib/aspectual_spec.rb

@@ -49,12 +49,32 @@ describe Aspectual do
       self
     end
 
+    def block_test_method_0
+      methods_called << "before_block_test_method_0_block"
+      yield
+      methods_called << "after_block_test_method_0_block"
+      self
+    end
+
+    def block_test_method_1
+      methods_called << "before_block_test_method_1_block"
+      yield
+      methods_called << "after_block_test_method_1_block"
+      self
+    end
+
     aspects before: :single_test_method
     def single_before_test_method
       methods_called << "single_before_test_method"
       self
     end
 
+    aspects around: :block_test_method_0
+    def single_around_test_method
+      methods_called << "single_around_test_method"
+      self
+    end
+
     aspects after: :single_test_method
     def single_after_test_method
       methods_called << "single_after_test_method"
@@ -67,6 +87,12 @@ describe Aspectual do
       self
     end
 
+    aspects around: [:block_test_method_0, :block_test_method_1]
+    def array_around_test_method
+      methods_called << "array_around_test_method"
+      self
+    end
+
     aspects after: [:array_test_method_0, :array_test_method_1]
     def array_after_test_method
       methods_called << "array_after_test_method"
@@ -102,7 +128,7 @@ describe Aspectual do
   describe "before aspects" do
     it "calls before aspect methods before the called method" do
       test_instance = TestClass.new.single_before_test_method
-      expect(test_instance.methods_called).to match_array(%w{
+      expect(test_instance.methods_called).to eq(%w{
         single_test_method
         single_before_test_method
       })
@@ -110,7 +136,7 @@ describe Aspectual do
 
     it "allows multiple aspects to be declared" do
       test_instance = TestClass.new.array_before_test_method
-      expect(test_instance.methods_called).to match_array(%w{
+      expect(test_instance.methods_called).to eq(%w{
         array_test_method_0
         array_test_method_1
         array_before_test_method
@@ -121,15 +147,15 @@ describe Aspectual do
   describe "after aspects" do
     it "calls before aspect methods before the called method" do
       test_instance = TestClass.new.single_after_test_method
-      expect(test_instance.methods_called).to match_array(%w{
-        single_test_method
+      expect(test_instance.methods_called).to eq(%w{
         single_after_test_method
+        single_test_method
       })
     end
 
     it "allows multiple aspects to be declared" do
       test_instance = TestClass.new.array_after_test_method
-      expect(test_instance.methods_called).to match_array(%w{
+      expect(test_instance.methods_called).to eq(%w{
         array_after_test_method
         array_test_method_0
         array_test_method_1
@@ -137,10 +163,32 @@ describe Aspectual do
     end
   end
 
+  describe "around aspects" do
+    it "calls around aspect methods around the called method" do
+      test_instance = TestClass.new.single_around_test_method
+      expect(test_instance.methods_called).to eq(%w{
+        before_block_test_method_0_block
+        single_around_test_method
+        after_block_test_method_0_block
+      })
+    end
+
+    it "allows multiple aspects to be declared" do
+      test_instance = TestClass.new.array_around_test_method
+      expect(test_instance.methods_called).to eq(%w{
+        before_block_test_method_0_block
+        before_block_test_method_1_block
+        array_around_test_method
+        after_block_test_method_1_block
+        after_block_test_method_0_block
+      })
+    end
+  end
+
   describe "mixed aspects" do
     it "calls all the aspect declarations in the correct order" do
       test_instance = TestClass.new.before_and_after_aspects_test_method
-      expect(test_instance.methods_called).to match_array(%w{
+      expect(test_instance.methods_called).to eq(%w{
         before_test_method_0
         before_test_method_1
         before_and_after_aspects_test_method

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: aspectual
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Alex Sunderland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: "\n    A simple gem to support minimal Aspect Oriented Programming in
@@ -64,6 +64,7 @@ files:
 - Gemfile.lock
 - README.md
 - aspectual-0.0.1.gem
+- aspectual-0.0.2.gem
 - aspectual.gemspec
 - lib/aspectual.rb
 - lib/aspectual/version.rb
@@ -78,17 +79,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A gem to help with AOP.