cuts 1.0.0 → 1.1.0

data/README.rdoc

@@ -0,0 +1,82 @@
+= Cuts - Cut-based AOP for Ruby
+
+{Homepage}[http://rubyworks.github.com/cuts] |
+{Source Code}[http://github.com/rubyworks/cuts] |
+{Issue Tracker}[http://github.com/rubyworks/cuts/issues]
+
+{<img src="http://travis-ci.org/rubyworks/cuts.png" />}[http://travis-ci.org/rubyworks/cuts]
+
+
+== Description
+
+Cuts is an expiremental pure-Ruby implimentation of cut-base AOP.
+Cuts are a failry low-level system, so implementing them in pure-Ruby is no
+simple accomplishment, even for a language as reflective and metaprogrammable
+as Ruby.
+
+
+== History
+
+Cuts started it's life as a discussion about AOP on Ruby-talk, which led to 
+a in-depth discussion between Trans and Peter Vanbroekhoven. The outcome of those talks
+were three projects. {Suby}[http://suby.rubyforge.org] an early expiremental
+branch of Ruby; the RCRFoundry, a section of the Ruby Garden Wiki dedicated to jointly
+developing RCRs; and the {Cut-based AOP RCR}[rcr.html]. The RCR of course,
+ultimately led to this project, as well as an expiremental Ruby 1.8.3 core
+implementation (see the Suby homepage). We continue to touch up the {RCR}[rcr.html]
+but on the whole it is now complete.
+
+Please read {Cut-based AOP for Ruby RCR}[rcr.html].
+
+This Cuts library comes by way of {Ruby Facets}[http://rubyworks.github.com/facets],
+where the implementation was orginally housed. Becuase of it's expiremental nature,
+it was deemd best to move it into it's own project as part of the ongoing work to
+make Facets a rock solid library. Despite being expiremental, this implementation
+does pass it's unit test. However, it has had litte trial in integrated tests.
+It will be interesting to see if this library, as it matures, can prove robust
+enough for production use. In either case, clearly it would be preferable to have
+a Ruby-core implementation instead, but that potential is completely in other
+persons hands.
+
+
+== Usage
+
+Here is a quick and dirty example:
+
+  require 'cuts'
+
+  class C
+    def f ; "f" ; end
+  end
+
+  cut :G < C do
+    def f; '<'+super+'>' ; end
+  end
+
+  c = C.new
+
+  c.f  #=> "&lt;f&gt;"
+
+
+For detailed usage documentation, please refer to the {API Documentation}[http://rubydoc.info/gems/cuts].
+
+
+== Install
+
+Install via RubyGems:
+
+  $ gem install cuts
+
+
+== Special Thanks
+
+Special thanks to Peter Van Broekhoven. The man is a genius!
+
+
+== Legal
+
+(FreeBSD License)
+
+Cuts, Copyright (c) 2007 Thomas Sawyer & Peter Van Broekhoven
+
+See NOTICE.rdoc for details.

data/lib/cuts/aop.rb

@@ -1,22 +1,11 @@
-# TITLE:
-#
-#   Aspect Oriented Programming for Ruby
-#
-# SUMMARY:
-#
-#
-# AUTHORS:
-#
-#   - Thomas Sawyer
-#
-# NOTES:
-#
-#    - Can JointPoint and Target be the same class?
-
 require 'cuts/cut'
 
-#
+require 'pp'
 
+# TODO: Can JointPoint and Target be the same class?
+
+# Aspect Oriented Programming for Ruby using Cuts.
+#
 class Aspect < Module
 
   def initialize(&block)
@@ -104,23 +93,31 @@ end
 
 
 def cross_cut(klass)
+
   Cut.new(klass) do
-    define_method :__base__ do klass end
 
-    def advices; @advices ||= {}; end
+    define_method :__base__ do
+      klass 
+    end
+
+    def advices
+      @advices ||= {} 
+    end
 
     def self.extended(obj)
       base = obj.class #__base__
 
-      methods = obj.methods + obj.private_methods - ['advices']
-
-      methods.each do |sym|
+      # use string for 1.9-, and symbol for 1.9+
+      methods = obj.methods +
+                obj.public_methods +
+                obj.protected_methods +
+                obj.private_methods -
+                [:advices, 'advices']
 
+      methods.uniq.each do |sym|
         #meth = obj.method(sym)
-
-        define_method(sym) do |*args| #, &blk|  # TODO imporove interface mirroring
+        define_method(sym) do |*args, &blk|
           jp = Joinpoint.new(self, base, sym, *args) #, &blk)
-
           # calculate advices on first use.
           unless advices[sym]
             advices[sym] = []
@@ -136,20 +133,17 @@ def cross_cut(klass)
           end
           
           if advices[sym].empty?
-            super
+            super(*args, &blk)
           else
             target = jp #Target.new(self, sym, *args, &blk)  # Target == JoinPoint ?
             advices[sym].each do |(aspect, advice)|
               target = Target.new(aspect, advice, target)
             end
-            target.super
+            target.call #super
           end
-
-        end
-
-      end
-
-    end
+        end #define_method
+      end #methods
+    end #def
 
   end
 

data/test/test_aop.rb

@@ -1,7 +1,8 @@
-require 'test/unit'
+require 'microtest'
+require 'ae'
 require 'cuts'
 
-class TestAop < Test::Unit::TestCase
+class AOPTest < MicroTest::TestCase
 
   class X
     def x; "x"; end
@@ -24,26 +25,27 @@ class TestAop < Test::Unit::TestCase
   end
 
   def test_class
-    assert_equal(X, @x1.class)
+    @x1.class.assert == X
   end
 
   def test_public_methods
     meths = @x1.public_methods(false)
-    assert(meths.include?("y"))
-    assert(meths.include?("q"))
-    assert(meths.include?("x"))
+    meths = meths.map{ |m| m.to_s }
+    meths.assert.include?("y")
+    meths.assert.include?("q")
+    meths.assert.include?("x")
   end
 
   def test_x
-    assert_equal("{x}", @x1.x)
+    @x1.x.assert == "{x}"
   end
 
   def test_y
-    assert_equal("y", @x1.y)
+    @x1.y.assert == "y"
   end
 
   def test_q
-    assert_equal("<{x}>", @x1.q)
+    @x1.q.assert == "<{x}>"
   end
 
 end

data/test/test_cut.rb

@@ -1,7 +1,9 @@
-require 'test/unit'
+require 'microtest'
+require 'ae'
 require 'cuts'
 
-class TestCut < Test::Unit::TestCase
+#
+class TestCutNew < MicroTest::TestCase
 
   class X
     def x; "x"; end
@@ -12,13 +14,14 @@ class TestCut < Test::Unit::TestCase
   end
 
   def test_method_is_wrapped_by_advice
-      o = X.new
-      assert_equal("{x}", o.x)
+    o = X.new
+    o.x.assert == "{x}"
   end
 
 end
 
-class TestCut1 < Test::Unit::TestCase
+#
+class TestLiteralSyntax < MicroTest::TestCase
 
   class F
     def f ; "f" ; end
@@ -31,20 +34,19 @@ class TestCut1 < Test::Unit::TestCase
 
   def test_1_01
     f = F.new
-    assert_equal( "<f>", f.f )
-    assert_equal( F, f.class )
+    f.f.assert == "<f>"
+    f.class.assert == F
   end
 
   def test_1_02
     assert(G)
-    assert_equal( "TestCut1::G", G.name )
+    G.name.assert == "TestLiteralSyntax::G"
   end
 
 end
 
 # Test multiple cuts.
-
-class TestCut2 < Test::Unit::TestCase
+class TestMultipleCuts < MicroTest::TestCase
 
   class F
     def f ; "f" ; end
@@ -61,24 +63,24 @@ class TestCut2 < Test::Unit::TestCase
   end
 
   #def test_2_01
-  #  assert_equal( [Q, G], F.cuts )
-  #  assert_equal( [Q, G], F.predecessors )
+  #  F.cuts.assert == [Q, G]
+  #  F.predecessors.assert == [Q, G]
   #end
 
   def test_2_02
     f = F.new
-    assert_equal( F, f.class )
-    assert_equal( "[<f>]", f.f )
+    f.class.assert == F
+    f.f.assert == "[<f>]"
   end
 
   def test_2_03
     assert(G)
-    assert_equal( "TestCut2::G", G.name )
+    G.name.assert == "TestMultipleCuts::G"
   end
 
   def test_2_04
     assert(Q)
-    assert_equal( "TestCut2::Q", Q.name )
+    Q.name.assert == "TestMultipleCuts::Q"
   end
 
 end

metadata

@@ -1,86 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cuts
-version: !ruby/object:Gem::Version 
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
-- tigerops-community@rubyforge.org
+authors:
+- Thomas Sawyer
+- Peter Vanbroekhoven
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-07-04 00:00:00 -04:00
-default_executable: 
-dependencies: []
-
-description: |-
-  Cuts is an expiremental implementation of cut-based
-  AOP for Ruby written in pure Ruby.
-email: 
+date: 2011-10-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: detroit
+  requirement: &18946520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *18946520
+- !ruby/object:Gem::Dependency
+  name: microtest
+  requirement: &18945920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *18945920
+- !ruby/object:Gem::Dependency
+  name: ae
+  requirement: &18945380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *18945380
+description: Cuts is an expiremental implementation of cut-based AOP for Ruby written
+  in pure Ruby.
+email:
+- transfire@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README
-- Rakefile
-- MANIFEST
-- RELEASE
-- LICENSE
-- HISTORY
-files: 
-- Rakefile
-- RELEASE
-- LICENSE
-- README
-- HISTORY
-- lib/cuts.rb
+extra_rdoc_files:
+- HISTORY.rdoc
+- README.rdoc
+- NOTICE.rdoc
+- RCR.textile
+files:
+- .ruby
 - lib/cuts/aop.rb
 - lib/cuts/cut.rb
-- meta/created
-- meta/homepage
-- meta/summary
-- meta/abstract
-- meta/package
-- meta/version
-- meta/license
-- meta/project
-- meta/contact
-- test/test_cut.rb
+- lib/cuts.rb
 - test/test_aop.rb
-- MANIFEST
-has_rdoc: true
-homepage: http://death.rubyforge.org
-licenses: []
-
+- test/test_cut.rb
+- HISTORY.rdoc
+- README.rdoc
+- NOTICE.rdoc
+- RCR.textile
+homepage: http://rubyworks.github.com/cuts
+licenses:
+- BSD-2-Clause
+- BSD-2-Clause
 post_install_message: 
-rdoc_options: 
-- --inline-source
-- --title
-- cuts api
-- --main
-- README
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: death
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Cuts is an expiremental implementation of cut-based
-test_files: 
-- test/test_cut.rb
-- test/test_aop.rb
+summary: Cut-based AOP for Ruby
+test_files: []