defmacro 0.0.1 → 0.0.2

data/History.txt

@@ -1,6 +1,12 @@
+=== 0.0.2 / 2008-06-11
+
+* 1 minor enhancement
+
+  * macros can be defined on objects or on main
+
 === 0.0.1 / 2008-06-09
 
 * 1 major enhancement
 
-  * Birthday!
+  * macros!
 

data/Manifest.txt

@@ -4,4 +4,5 @@ README.rdoc
 README.txt
 Rakefile
 lib/def_macro.rb
+lib/defmacro.rb
 test/test_def_macro.rb

data/README.rdoc

@@ -42,6 +42,7 @@ Macros for ruby
 == INSTALL:
 
 * sudo gem install dfg59-def_macro --source=http://gems.github.com
+* sudo gem install defmacro
 
 == LICENSE:
 

data/README.txt

@@ -42,6 +42,7 @@ Macros for ruby
 == INSTALL:
 
 * sudo gem install dfg59-def_macro --source=http://gems.github.com
+* sudo gem install defmacro
 
 == LICENSE:
 

data/lib/def_macro.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'ruby2ruby'
 
 module DefMacro
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
   
   def self.cleanse_body(body)
     body = body.split("\n")
@@ -20,7 +20,8 @@ end
 
 class Object
   def def_macro(name,&body)
-    class_eval <<-EOS
+    context = (self.kind_of?(Class) ? self : self.class)
+    context.class_eval <<-EOS
       def #{name}(*args,&block) 
         mac_body = DefMacro.cleanse_body(block.to_ruby)
         args.map! do |arg|

data/lib/defmacro.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'need'
+need { "def_macro" }

data/test/test_def_macro.rb

@@ -10,8 +10,13 @@ class Foo
   end
 end
 
+def_macro :with do |args,body|
+  eval args.first
+  eval body
+end
+
 class TestDefMacro < Test::Unit::TestCase
-  def test_with_macro
+  def test_with_macro_in_class_def
     foo = Foo.new
     
     result = foo.with proc { a = 1; b = 3 } do
@@ -20,4 +25,12 @@ class TestDefMacro < Test::Unit::TestCase
     
     assert_equal(4, result)
   end
+  
+  def test_with_macro_in_main
+    result = with proc { a = 1; b = 3 } do
+      a + b
+    end
+    
+    assert_equal(4, result)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: defmacro
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Drew Olson
@@ -57,6 +57,7 @@ files:
 - README.txt
 - Rakefile
 - lib/def_macro.rb
+- lib/defmacro.rb
 - test/test_def_macro.rb
 has_rdoc: true
 homepage: http://github.com/dfg59/def_macro/tree/master