haruska-ninja-decorators 0.0.2 → 0.5.0

data/Rakefile

@@ -1,23 +1,17 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/ninja_decorators'
+require 'rake'
+require 'rake/gempackagetask'
 
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('ninja_decorators', NinjaDecorators::VERSION) do |p|
-  p.developer('Jason Haruska', 'contact@haruska.com')
-  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.rubyforge_name       = p.name # TODO this is default value
-  p.extra_deps         = [
-   ['activesupport','>= 2.0.2'],
-  ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  p.rsync_args = '-av --delete --ignore-errors'
-end
-
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "ninja-decorators"
+    gemspec.summary = "before_filter, after_filter, and around_filter for ruby without rails"
+    gemspec.email = "contact@haruska.com"
+    gemspec.homepage = "http://github.com/haruska/ninja-decorators/"
+    gemspec.authors = ["Jason Haruska", "Kevin Menard"]
+    
+    gemspec.add_dependency('activesupport', '>= 2.0.2')
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:minor: 5
+:patch: 0
+:major: 0

data/lib/ninja_decorators.rb

@@ -9,36 +9,80 @@ module NinjaDecorators
   end
 
   module ClassMethods
-  
-    @@delayed_alias_method_chains = {}
+
+    def delayed_alias_method_chains
+      @delayed_alias_method_chains ||= {}
+    end
   
     def method_added(meth)
-      if @@delayed_alias_method_chains[meth.to_s]
-        chains_arr = @@delayed_alias_method_chains.delete(meth.to_s)
+      if delayed_alias_method_chains[meth.to_s]
+        chains_arr = delayed_alias_method_chains.delete(meth.to_s)
         chains_arr.each do |chain|
-          self.send(:alias_method_chain, meth, chain)
+          chain.each_pair do |filter_type, filtered_method_builder|
+            ninja_method_chain meth, filter_type, &filtered_method_builder
+          end
         end
       end
     end
 
-    def around_filter(around_method, function_names)
-      function_names.each do |func|
-        define_method("#{func}_with_around_filter_wrapper") do |*args|
-          send(around_method, *args) do |*ar_args|
-            send "#{func}_without_around_filter_wrapper", *ar_args
+    def around_filter(around_method, method_names)
+      method_names.each do |meth|
+
+        # Build up a proc that will construct the filtered method.  Execution of the proc is delayed
+        # until we encounter the alias_method_chain call.
+        filtered_method_builder = Proc.new do
+          # Get a reference to the unfiltered method or, more accurately, the original method with
+          # all previous filters already applied.  This new filtered method builds up on the filters
+          # already applied.
+          unfiltered_method = instance_method "#{meth}_without_around_filter_wrapper"
+
+          # Define the newly filtered method.
+          define_method("#{meth}_with_around_filter_wrapper") do |*args|
+            send(around_method, *args) do |*ar_args|
+              unfiltered_method.bind(self).call(*ar_args)
+            end
           end
         end
 
-        if self.instance_methods.include?(func.to_s)
-          alias_method_chain func, :around_filter_wrapper
+        # If the method to filter has been defined already.
+        if self.instance_methods.include?(meth.to_s)
+
+          # Filter the method with around_method.
+          ninja_method_chain meth, :around_filter_wrapper, &filtered_method_builder
+
+        # If the method to filter has not been defined already, delay wrapping until it has.  
         else
-          @@delayed_alias_method_chains[func.to_s] ||= []
-          @@delayed_alias_method_chains[func.to_s] << :around_filter_wrapper
+          delayed_alias_method_chains[meth.to_s] ||= []
+          delayed_alias_method_chains[meth.to_s] << {:around_filter_wrapper => filtered_method_builder}
         end
-      
       end
     end
-  
+
+    # This was largely lifted from ActiveSupport's alias_method_chain.  We needed to be able to yield to a block
+    # that could construct the with_* methods while having access to the aliased without_* methods.
+    def ninja_method_chain(target, feature)
+      # Strip out punctuation on predicates or bang methods since
+      # e.g. target?_without_feature is not a valid method name.
+      aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
+
+      with_method, without_method = "#{aliased_target}_with_#{feature}#{punctuation}", "#{aliased_target}_without_#{feature}#{punctuation}"
+
+      alias_method without_method, target
+
+      yield if block_given?
+
+      alias_method target, with_method
+
+      case
+      when public_method_defined?(without_method)
+        public target
+      when protected_method_defined?(without_method)
+        protected target
+      when private_method_defined?(without_method)
+        private target
+      end
+    end
+
   end
   
 end

data/test/ninja_class.rb

@@ -2,10 +2,15 @@ require File.dirname(__FILE__) + '/../lib/ninja_decorators'
 
 class NinjaClass
   include NinjaDecorators
-  
+
+  around_filter :common_around, [:foo, :bar, :nested]
+  around_filter :nested_around, [:nested]
+
   attr_accessor :ret
-  
-  around_filter :common_around, [:foo, :bar]
+
+  def initialize
+    @ret = ""
+  end
   
   def foo
     @ret += "foo"
@@ -15,11 +20,21 @@ class NinjaClass
     @ret += "bar"
   end
   
+  def nested
+    @ret += "nested"
+  end
+  
   private
   
   def common_around
-    @ret = "common "
+    @ret += "common "
     yield
     @ret += " around"
   end
+  
+  def nested_around
+    @ret += "nesting "
+    yield
+    @ret += " completed"
+  end
 end

data/test/test_ninja_decorators.rb

@@ -10,6 +10,12 @@ class TestNinjaDecorators < Test::Unit::TestCase
   def test_simple_around_filter
     ninja = NinjaClass.new
     assert_equal "common foo around", ninja.foo
+    ninja.ret = ""
     assert_equal "common bar around", ninja.bar
   end
+  
+  def test_nested_around_filter
+    ninja = NinjaClass.new
+    assert_equal "nesting common nested around completed", ninja.nested
+  end
 end

metadata

@@ -1,19 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: haruska-ninja-decorators
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jason Haruska
+- Kevin Menard
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-11-21 00:00:00 -08:00
+date: 2009-05-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -21,26 +23,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
-description: Implements before_filter, after_filter, and around_filter decorators similar to Rails but can be used anywhere
-email: 
-- contact@haruska.com
+description: 
+email: contact@haruska.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- PostInstall.txt
 - README.rdoc
 files: 
 - History.txt
@@ -48,16 +37,16 @@ files:
 - PostInstall.txt
 - README.rdoc
 - Rakefile
+- VERSION.yml
 - lib/ninja_decorators.rb
+- test/ninja_class.rb
 - test/test_helper.rb
 - test/test_ninja_decorators.rb
-- test/ninja_class.rb
 has_rdoc: true
-homepage: http://github.com/haruska/ninja-decorators
+homepage: http://github.com/haruska/ninja-decorators/
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -77,9 +66,9 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
-summary: Implements before_filter, after_filter, and around_filter decorators similar to Rails but can be used anywhere
+specification_version: 3
+summary: before_filter, after_filter, and around_filter for ruby without rails
 test_files: 
+- test/ninja_class.rb
 - test/test_helper.rb
 - test/test_ninja_decorators.rb
-- test/ninja_class.rb