haruska-ninja-decorators 0.5.0 → 0.6.0

data/.gitignore

@@ -0,0 +1,7 @@
+.idea
+*.iws
+*.iml
+*.ipr
+pkg
+coverage
+rdoc

data/README.rdoc

@@ -57,7 +57,6 @@ irb(main):078:0> n.foo
 == REQUIREMENTS:
 
 rubygems
-activesupport >= 2.0.2
 
 == INSTALL:
 
@@ -67,7 +66,8 @@ sudo gem install haruska-ninja-decorators
 
 (The MIT License)
 
-Copyright (c) 2008 Jason Haruska
+Copyright (c) 2008-2009 Jason Haruska, Kevin Menard
+Portions Copyright (c) 2005-2009 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,17 +1,54 @@
-require 'rake'
-require 'rake/gempackagetask'
-
-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
+require 'rake'
+require 'rake/gempackagetask'
+
+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"]    
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "blah #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+

data/VERSION.yml

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

data/lib/ninja_decorators.rb

@@ -1,9 +1,6 @@
 require "rubygems"
-require "activesupport"
 
 module NinjaDecorators
-  VERSION = '0.0.2'
-  
   def self.included(base)
     base.extend ClassMethods
   end
@@ -26,6 +23,18 @@ module NinjaDecorators
     end
 
     def around_filter(around_method, method_names)
+      filter_factory(around_method, method_names, :around)
+    end
+
+    def before_filter(before_method, method_names)
+      filter_factory(before_method, method_names, :before)
+    end
+
+    def after_filter(after_method, method_names)
+      filter_factory(after_method, method_names, :after)
+    end
+
+    def filter_factory(filter_method, method_names, filter_type)
       method_names.each do |meth|
 
         # Build up a proc that will construct the filtered method.  Execution of the proc is delayed
@@ -34,26 +43,41 @@ module NinjaDecorators
           # 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"
+          unfiltered_method = instance_method "#{meth}_without_#{filter_type.to_s}_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
+          case filter_type
+            when :before
+              define_method("#{meth}_with_before_filter_wrapper") do |*args|
+                send(filter_method, *args)
+                unfiltered_method.bind(self).call(*args)
+              end
+
+            when :around
+              define_method("#{meth}_with_around_filter_wrapper") do |*args|
+                send(filter_method, *args) do |*ar_args|
+                  unfiltered_method.bind(self).call(*ar_args)
+                end
+              end
+
+            when :after
+              define_method("#{meth}_with_after_filter_wrapper") do |*args|
+                unfiltered_method.bind(self).call(*args)
+                send(filter_method, *args)
+              end
           end
         end
 
         # 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
+          # Filter the method with before_method.
+          ninja_method_chain meth, "#{filter_type.to_s}_filter_wrapper", &filtered_method_builder
 
-        # If the method to filter has not been defined already, delay wrapping until it has.  
+        # If the method to filter has not been defined already, delay wrapping until it has.
         else
           delayed_alias_method_chains[meth.to_s] ||= []
-          delayed_alias_method_chains[meth.to_s] << {:around_filter_wrapper => filtered_method_builder}
+          delayed_alias_method_chains[meth.to_s] << {"#{filter_type.to_s}_filter_wrapper" => filtered_method_builder}
         end
       end
     end

data/ninja-decorators.gemspec

@@ -0,0 +1,52 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ninja-decorators}
+  s.version = "0.6.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jason Haruska", "Kevin Menard"]
+  s.date = %q{2009-05-27}
+  s.email = %q{contact@haruska.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "Manifest.txt",
+     "PostInstall.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "lib/ninja_decorators.rb",
+     "ninja-decorators.gemspec",
+     "test/after_ninja_subject.rb",
+     "test/around_ninja_subject.rb",
+     "test/before_ninja_subject.rb",
+     "test/ninja_decorators_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/haruska/ninja-decorators/}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.3}
+  s.summary = %q{before_filter, after_filter, and around_filter for ruby without rails}
+  s.test_files = [
+    "test/after_ninja_subject.rb",
+     "test/around_ninja_subject.rb",
+     "test/before_ninja_subject.rb",
+     "test/ninja_decorators_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/test/after_ninja_subject.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../lib/ninja_decorators'
+
+class AfterNinjaSubject
+  include NinjaDecorators
+
+  after_filter :common_before, [:foo, :bar, :nested]
+  after_filter :nested_before, [:nested]
+
+  attr_accessor :ret
+
+  def initialize
+    @ret = ""
+  end
+
+  def foo
+    @ret += "foo"
+  end
+
+  def bar
+    @ret += "bar"
+  end
+
+  def nested
+    @ret += "nested"
+  end
+
+  private
+
+  def common_before
+    @ret += "common "
+    yield if block_given?
+    @ret += " around"
+  end
+
+  def nested_before
+    @ret += "nesting "
+    yield if block_given?
+    @ret += " completed"
+  end
+end

data/test/{ninja_class.rb → around_ninja_subject.rb}

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../lib/ninja_decorators'
 
-class NinjaClass
+class AroundNinjaSubject
   include NinjaDecorators
 
   around_filter :common_around, [:foo, :bar, :nested]

data/test/before_ninja_subject.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../lib/ninja_decorators'
+
+class BeforeNinjaSubject
+  include NinjaDecorators
+
+  before_filter :common_before, [:foo, :bar, :nested]
+  before_filter :nested_before, [:nested]
+
+  attr_accessor :ret
+
+  def initialize
+    @ret = ""
+  end
+
+  def foo
+    @ret += "foo"
+  end
+
+  def bar
+    @ret += "bar"
+  end
+
+  def nested
+    @ret += "nested"
+  end
+
+  private
+
+  def common_before
+    @ret += "common "
+    yield if block_given?
+    @ret += " around"
+  end
+
+  def nested_before
+    @ret += "nesting "
+    yield if block_given?
+    @ret += " completed"
+  end
+end

data/test/ninja_decorators_test.rb

@@ -0,0 +1,47 @@
+require 'rubygems'
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'around_ninja_subject'
+require 'before_ninja_subject'
+require 'after_ninja_subject'
+
+class TestNinjaDecorators < Test::Unit::TestCase
+
+  def setup
+  end
+  
+  def test_simple_around_filter
+    ninja = AroundNinjaSubject.new
+    assert_equal "common foo around", ninja.foo
+    ninja.ret = ""
+    assert_equal "common bar around", ninja.bar
+  end
+  
+  def test_nested_around_filter
+    ninja = AroundNinjaSubject.new
+    assert_equal "nesting common nested around completed", ninja.nested
+  end
+
+  def test_simple_before_filter
+    ninja = BeforeNinjaSubject.new
+    assert_equal "common  aroundfoo", ninja.foo
+    ninja.ret = ""
+    assert_equal "common  aroundbar", ninja.bar
+  end
+
+  def test_nested_before_filter
+    ninja = BeforeNinjaSubject.new
+    assert_equal "nesting  completedcommon  aroundnested", ninja.nested
+  end
+
+  def test_simple_after_filter
+    ninja = AfterNinjaSubject.new
+    assert_equal "foocommon  around", ninja.foo
+    ninja.ret = ""
+    assert_equal "barcommon  around", ninja.bar
+  end
+
+  def test_nested_after_filter
+    ninja = AfterNinjaSubject.new
+    assert_equal "nestedcommon  aroundnesting  completed", ninja.nested
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haruska-ninja-decorators
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Jason Haruska
@@ -10,19 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 -07:00
+date: 2009-05-27 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: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.0.2
-    version: 
+dependencies: []
+
 description: 
 email: contact@haruska.com
 executables: []
@@ -32,6 +23,7 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
 - History.txt
 - Manifest.txt
 - PostInstall.txt
@@ -39,10 +31,13 @@ files:
 - Rakefile
 - VERSION.yml
 - lib/ninja_decorators.rb
-- test/ninja_class.rb
+- ninja-decorators.gemspec
+- test/after_ninja_subject.rb
+- test/around_ninja_subject.rb
+- test/before_ninja_subject.rb
+- test/ninja_decorators_test.rb
 - test/test_helper.rb
-- test/test_ninja_decorators.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/haruska/ninja-decorators/
 post_install_message: 
 rdoc_options: 
@@ -69,6 +64,8 @@ signing_key:
 specification_version: 3
 summary: before_filter, after_filter, and around_filter for ruby without rails
 test_files: 
-- test/ninja_class.rb
+- test/after_ninja_subject.rb
+- test/around_ninja_subject.rb
+- test/before_ninja_subject.rb
+- test/ninja_decorators_test.rb
 - test/test_helper.rb
-- test/test_ninja_decorators.rb

data/test/test_ninja_decorators.rb

@@ -1,21 +0,0 @@
-require 'rubygems'
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'ninja_class'
-
-class TestNinjaDecorators < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  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