after_do-loader 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d31f5f542881f143ad69c1e47e322e61cbba746
-  data.tar.gz: 2119f2fb24eec7c074cbdb86339eecf68a6390f6
+  metadata.gz: 0c6396dad629af3ba2cfb47eb8c9beae69c09f6d
+  data.tar.gz: d0b77c5fac65224a0d8ef39426dc96c48d395b64
 SHA512:
-  metadata.gz: 121fc77e34beb9dcd5042dbe8b582c0477f9f8d4cdba9b6cf1baa4f00c480eb8b192203dc4486b8db0179f2f1be6c360af22a6b428a90414ee1d2dd3b8c5199d
-  data.tar.gz: 4355842b44e4f30f97bbf83aca1a67b92feacb3d88694d4b2d5ad00f69c710d607265b2bb38c3205a3148af262fda70fbfa2ab07145fd1158e0097df4fdde93a
+  metadata.gz: 11283c6e32a5980e935171a803117548a23ceaee9de1ae3b279d76a508a624a3bbbb3a9c3e4d26a8cba2fb17dabf943c9eb9574cece14fe1e13ec160ecc2e2ba
+  data.tar.gz: 158b836afe0373cf094f2d1c96505f48c2d25bf5b86ba7ad5c0f5c3b81050e26b63f0e1da61e98a277f3c4abe6181d78ed955110a317968d540babb2ee2b20c8

data/README.md

@@ -50,6 +50,10 @@ aspects:
             target_methods:
               - initialize
               - merge
+		  - klass: AdvisedClass > # Matches all AdvisedClass' subclasses
+            target_methods:
+              - initialize
+              - merge
 ```
 
 And the `LoggingAspect` class will be something like this:

data/after_do-loader.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'after_do', '~> 0.3'
   spec.add_dependency 'recursive-open-struct'
+  spec.add_dependency 'activesupport', '>= 3.0'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/after_do/loader/aspect_applier.rb

@@ -8,27 +8,29 @@ module AfterDo
       def apply
         aspect.advices.each do |advice|
           advice.targets.each do |target|
-            target.klass.extend(AfterDo)
-
-            methods = target.target_methods
-
-            apply_aspect_to_target(aspect.klass, advice, target.klass, methods)
+            target.klass.each do |target_klass|
+              extend_and_apply(
+                target_klass, target.target_methods, aspect, advice
+              )
+            end
           end
         end
-      rescue
-        raise Errors::CannotApplyAspect
       end
 
       protected
 
       attr_reader :aspect
 
-      def apply_aspect_to_target(aspect_klass, advice, target, methods)
+      def extend_and_apply(target_klass, methods, aspect, advice)
+        target_klass.extend(AfterDo)
+
         methods.each do |method|
           advice.names.each do |advice_name|
-            aspect_klass.new(target).send(advice_name, method)
+            aspect.klass.new(target_klass).send(advice_name, method)
           end
         end
+      rescue
+        raise Errors::CannotApplyAspect
       end
     end
   end

data/lib/after_do/loader/config.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'active_support/core_ext/class/subclasses'
 
 module AfterDo
   module Loader
@@ -12,6 +13,8 @@ module AfterDo
 
       attr_reader :config_path
 
+      private
+
       def parse_config
         config_hash = YAML.load_file(config_path)
         config = constantize_classes!(config_hash)
@@ -27,13 +30,21 @@ module AfterDo
 
           aspect['advices'].each do |advice|
             advice['targets'].each do |target|
-              target['klass'] = AfterDo.const_get(target['klass'])
+              target['klass'] = find_classes(target['klass'])
             end
           end
         end
 
         config_hash
       end
+
+      def find_classes(target)
+        if target =~ />$/
+          AfterDo.const_get(target.gsub(/\s+>$/, '')).subclasses
+        else
+          [AfterDo.const_get(target.gsub(/\s+>$/, ''))]
+        end
+      end
     end
   end
 end

data/lib/after_do/loader/version.rb

@@ -1,5 +1,5 @@
 module AfterDo
   module Loader
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/spec/after_do/loader/aspect_applier_spec.rb

@@ -1,6 +1,9 @@
 module AfterDo
   module Loader
     class AdvisedClass; end
+    class AdvisedChild < AdvisedClass; end
+    class OtherAdvisedChild < AdvisedClass; end
+
     class CoolAspect; end
 
     describe AspectApplier do
@@ -8,12 +11,12 @@ module AfterDo
 
       let(:aspect_config) { config.aspects.first }
       let(:config) do
-        Config.new(fixture_path('aspect_config.yml'))
+        Config.new(fixture_path('aspect_config_with_subclass.yml'))
       end
 
       let(:aspect_instance) { CoolAspect.new }
       let(:aspect_class) { CoolAspect }
-      let(:target_class) { AdvisedClass }
+      let(:target_classes) { [AdvisedChild, OtherAdvisedChild] }
 
       describe '#apply' do
         subject(:apply) { applier.apply }
@@ -24,13 +27,17 @@ module AfterDo
         end
 
         it 'extends the target class with the AfterDo library' do
-          expect(target_class).to receive(:extend).with(AfterDo)
+          target_classes.each do |target_class|
+            expect(target_class).to receive(:extend).with(AfterDo)
+          end
 
           apply
         end
 
         it 'creates an Aspect object of the correct class' do
-          expect(aspect_class).to receive(:new).with(target_class)
+          target_classes.each do |target_class|
+            expect(aspect_class).to receive(:new).with(target_class)
+          end
 
           apply
         end
@@ -44,7 +51,7 @@ module AfterDo
 
         context 'when applying goes wrong' do
           before do
-            allow(aspect_config).to receive(:advices).and_raise(StandardError)
+            allow(AdvisedClass).to receive(:extend).and_raise(StandardError)
           end
 
           it { expect { apply }.to raise_error(Errors::CannotApplyAspect) }

data/spec/after_do/loader/config_spec.rb

@@ -2,6 +2,8 @@ module AfterDo
   module Loader
     class AdvisedClass; end
     class CoolAspect; end
+    class AdvisedChild < AdvisedClass; end
+    class OtherAdvisedChild < AdvisedClass; end
 
     describe Config do
       subject(:config) { Config.new(config_path) }
@@ -21,7 +23,7 @@ target classes",
                   'names' => %w(add_callback),
                   'targets' => [
                     {
-                      'klass' => AfterDo::Loader::AdvisedClass,
+                      'klass' => target_klasses,
                       'target_methods' => %w(initialize merge)
                     }
                   ]
@@ -31,10 +33,13 @@ target classes",
           ]
         }
       end
+
       let(:config_os) do
         RecursiveOpenStruct.new(config_hash, recurse_over_arrays: true)
       end
 
+      let(:target_klasses) { [AdvisedClass] }
+
       it { expect(config.aspects).to eq(config_os.aspects) }
 
       context 'when parsing goes wrong' do
@@ -42,6 +47,14 @@ target classes",
 
         it { expect { config }.to raise_error(Errors::InvalidConfig) }
       end
+
+      context 'when advised class has subclasses' do
+        let(:config_path) { fixture_path('aspect_config_with_subclass.yml') }
+
+        let(:target_klasses) { [AdvisedChild, OtherAdvisedChild] }
+
+        it { expect(config.aspects).to eq(config_os.aspects) }
+      end
     end
   end
 end

data/spec/fixtures/aspect_config_with_subclass.yml

@@ -0,0 +1,11 @@
+aspects:
+  - name: CoolAspect
+    klass: AfterDo::Loader::CoolAspect
+    description: This aspect adds after_do callbacks to its target classes
+    advices:
+      - names: [add_callback]
+        targets:
+          - klass: AfterDo::Loader::AdvisedClass >
+            target_methods:
+              - initialize
+              - merge

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: after_do-loader
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Renan Ranelli
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: after_do
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +179,7 @@ files:
 - spec/after_do/loader/config_spec.rb
 - spec/after_do/loader_spec.rb
 - spec/fixtures/aspect_config.yml
+- spec/fixtures/aspect_config_with_subclass.yml
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -195,5 +210,6 @@ test_files:
 - spec/after_do/loader/config_spec.rb
 - spec/after_do/loader_spec.rb
 - spec/fixtures/aspect_config.yml
+- spec/fixtures/aspect_config_with_subclass.yml
 - spec/spec_helper.rb
 has_rdoc: