peanuts 2.1 → 2.1.1

data/lib/peanuts/mappable.rb

@@ -54,6 +54,16 @@ module Peanuts #:nodoc:
       type.is_a?(Class) && !(type < Converter)
     end
 
+    def self.macro(&block)
+      Module.new do |mod|
+        @@macro_proc = block
+        def self.included(other)
+          other.send(:include, MappableObject)
+          other.instance_eval(&@@macro_proc)
+        end
+      end
+    end
+
     def from_xml(source, options = {})
       new.from_xml(source, options)
     end

data/lib/peanuts.rb

@@ -1,7 +1,12 @@
 require 'peanuts/mappable'
 
 module Peanuts #:nodoc:
+  # Deprecated. Include Peanuts::MappableObject instead.
   def self.included(other)
-    other.send(:include, MappableObject)
+    other.send(:include, MappableObject) if ![Object, Kernel].include?(other)
+  end
+
+  def self.macro(&block)
+    MappableType.macro(&block)
   end
 end

data/spec/cat_spec.rb

@@ -7,7 +7,7 @@ require 'peanuts'
 
 
 class Cheezburger
-  include Peanuts
+  include Peanuts::MappableObject
 
   attribute :weight, :float
   attribute :price, :decimal
@@ -24,13 +24,13 @@ class Cheezburger
 end
 
 class Paws
-  include Peanuts
+  include Peanuts::MappableObject
 
   elements :paws, :name => :paw, :ns => 'urn:x-lol'
 end
 
 class Cat
-  include Peanuts
+  include Peanuts::MappableObject
 
   namespaces :lol => 'urn:x-lol', :kthnx => 'urn:x-lol:kthnx'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: peanuts
 version: !ruby/object:Gem::Version 
-  version: "2.1"
+  version: 2.1.1
 platform: ruby
 authors: 
 - Igor Gunko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 +02:00
+date: 2010-01-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency