representative 0.1.1 → 0.1.2

data/README.markdown

@@ -96,7 +96,7 @@ Installation
 
 Representative is packaged as a Gem, hosted on [gemcutter](http://gemcutter.org/gems/representative).  Install with:
 
-    sudo gem install representative --source http://gemcutter.org
+    sudo gem install representative
 
 Copyright
 ---------

data/lib/representative/version.rb

@@ -1,3 +1,3 @@
 module Representative
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/representative/xml.rb

@@ -8,7 +8,7 @@ module Representative
 
     def initialize(xml_builder, subject = nil)
       @xml = xml_builder
-      @subject = subject
+      @subjects = [subject]
       yield self if block_given?
     end
 
@@ -21,7 +21,7 @@ module Representative
     end
 
     def subject!
-      @subject
+      @subjects.last
     end
     
     def property!(property_name, *args, &block)
@@ -39,18 +39,23 @@ module Representative
 
     end
 
-    def element!(element_name, value, options, &block)
-      text = content_generator = nil
-      if block && value
+    def element!(element_name, subject, options, &block)
+      content = content_generator = nil
+      if block && subject
         unless block == Representative::EMPTY
           content_generator = Proc.new do
-            block.call(Representative::Xml.new(@xml, value))
+            @subjects.push(subject)
+            begin
+              block.call(self)
+            ensure
+              @subjects.pop
+            end
           end
         end
       else
-        text = value
+        content = subject
       end
-      tag_args = [text, options].compact
+      tag_args = [content, options].compact
       @xml.tag!(element_name, *tag_args, &content_generator)
     end
 
@@ -77,10 +82,16 @@ module Representative
 
     end
 
+    def empty!(property_name, *args)
+      property!(property_name, *args, &Representative::EMPTY)
+    end
+      
     private 
 
-    def resolve(value_generator, subject = @subject)
-      if value_generator.respond_to?(:to_proc)
+    def resolve(value_generator, subject = subject!)
+      if value_generator == :self
+        subject
+      elsif value_generator.respond_to?(:to_proc)
         value_generator.to_proc.call(subject) if subject
       else
         value_generator

data/representative.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{representative}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Williams"]
-  s.date = %q{2009-12-02}
+  s.date = %q{2009-12-03}
   s.email = %q{mdub@dogbiscuit.org}
   s.extra_rdoc_files = [
     "LICENSE",

data/spec/representative/xml_spec.rb

@@ -21,7 +21,7 @@ describe Representative::Xml do
   describe "for some 'subject'" do
 
     before do
-      @subject = OpenStruct.new(:name => "Fred", :width => 200)
+      @subject = OpenStruct.new(:name => "Fred", :width => 200, :vehicle => OpenStruct.new(:year => "1959", :make => "Chevrolet"))
       @xml_representative = Representative::Xml.new(@xml, @subject)
     end
 
@@ -97,6 +97,17 @@ describe Representative::Xml do
 
       end
 
+      describe "with argument :self" do
+
+        it "doesn't alter the subject" do
+          represent.info(:self) do |info|
+            info.name
+          end
+          resulting_xml.should == %(<info><name>Fred</name></info>)
+        end
+        
+      end
+
       describe "with a nil argument" do
 
         it "builds an empty element" do
@@ -129,7 +140,6 @@ describe Representative::Xml do
       describe "with a block" do
 
         it "generates nested elements" do
-          @subject.vehicle = OpenStruct.new(:year => "1959", :make => "Chevrolet")
           represent.vehicle do |vehicle|
             vehicle.year
             vehicle.make
@@ -139,18 +149,17 @@ describe Representative::Xml do
 
       end
       
-      describe "with Representative::Empty" do
+    end
 
-        it "generates an empty element" do
-          @subject.vehicle = OpenStruct.new(:year => "1959", :make => "Chevrolet")
-          represent.vehicle(:year => :year, &Representative::EMPTY)
-          resulting_xml.should == %(<vehicle year="1959"/>)
-        end
-        
+    describe "#empty!" do
+      
+      it "generates an empty element" do
+        represent.empty!(:vehicle, :year => :year)
+        resulting_xml.should == %(<vehicle year="1959"/>)
       end
 
     end
-
+    
     describe "#list_of!" do
 
       before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: representative
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mike Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 +11:00
+date: 2009-12-03 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency