representative 0.2.1 → 0.2.3

data/lib/representative/version.rb

@@ -1,3 +1,3 @@
 module Representative
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.3".freeze
 end

data/lib/representative/xml.rb

@@ -26,19 +26,16 @@ module Representative
     # This object will provide element values where they haven't been 
     # explicitly provided.
     #
-    def subject
+    def current_subject
       @subjects.last
     end
 
+    alias :subject :current_subject
+    
     # Evaluate a block with a specified object as #subject.
     #
-    def representing(subject)
-      @subjects.push(subject)
-      begin
-        yield subject
-      ensure
-        @subjects.pop
-      end
+    def representing(new_subject, &block)
+      with_subject(resolve_value(new_subject), &block)
     end
 
     # Generate an element.
@@ -73,12 +70,12 @@ module Representative
     #
     def element(name, *args, &block)
 
-      attributes = args.extract_options!
-      attributes = attributes.merge(@inspector.get_metadata(subject, name))
+      metadata = @inspector.get_metadata(current_subject, name)
+      attributes = args.extract_options!.merge(metadata)
 
-      value_generator = if args.empty? 
+      subject_of_element = if args.empty? 
         lambda do |subject|
-          @inspector.get_value(subject, name)
+          @inspector.get_value(current_subject, name)
         end
       else 
         args.shift
@@ -86,18 +83,22 @@ module Representative
 
       raise ArgumentError, "too many arguments" unless args.empty?
 
-      value = resolve_value(value_generator)
-      return @xml.tag!(name) if value.nil?
-      
-      representing(value) do
-        
-        content_string = subject.to_s unless block
-        content_block = unless block.nil? || block == Representative::EMPTY
-          Proc.new do
-            block.call(subject)
+      representing(subject_of_element) do
+
+        content_string = content_block = nil
+
+        unless current_subject.nil?
+          if block
+            unless block == Representative::EMPTY
+              content_block = Proc.new do
+                block.call(current_subject) 
+              end
+            end
+          else
+            content_string = current_subject.to_s
           end
         end
-
+      
         resolved_attributes = resolve_attributes(attributes)
         tag_args = [content_string, resolved_attributes].compact
 
@@ -124,15 +125,15 @@ module Representative
     def list_of(name, *args, &block)
 
       options = args.extract_options!
-      value_generator = args.empty? ? name : args.shift
+      list_subject = args.empty? ? name : args.shift
       raise ArgumentError, "too many arguments" unless args.empty?
 
       list_attributes = options[:list_attributes] || {}
       item_name = options[:item_name] || name.to_s.singularize
       item_attributes = options[:item_attributes] || {}
 
-      items = resolve_value(value_generator)
-      element(name, items, list_attributes.merge(:type => "array")) do
+      items = resolve_value(list_subject)
+      element(name, items, list_attributes.merge(:type => lambda{"array"})) do
         items.each do |item|
           element(item_name, item, item_attributes, &block)
         end
@@ -150,13 +151,27 @@ module Representative
       Representative::EMPTY
     end
     
+    # Generate a comment
+    def comment(text)
+      @xml.comment!(text)
+    end
+    
     private 
 
-    def resolve_value(value_generator, subject = subject)
+    def with_subject(subject)
+      @subjects.push(subject)
+      begin
+        yield subject
+      ensure
+        @subjects.pop
+      end
+    end
+
+    def resolve_value(value_generator)
       if value_generator == :self
-        subject
+        current_subject
       elsif value_generator.respond_to?(:to_proc)
-        value_generator.to_proc.call(subject) if subject
+        value_generator.to_proc.call(current_subject) unless current_subject.nil?
       else
         value_generator
       end
@@ -165,7 +180,7 @@ module Representative
     def resolve_attributes(attributes)
       if attributes
         attributes.inject({}) do |resolved, (name, value_generator)|
-          resolved_value = resolve_value(value_generator, subject)
+          resolved_value = resolve_value(value_generator)
           resolved[name.to_s.dasherize] = resolved_value unless resolved_value.nil?
           resolved
         end

data/spec/representative/xml_spec.rb

@@ -116,11 +116,16 @@ describe Representative::Xml do
 
         describe "and attributes" do
 
-          it "omits the attributes" do
+          it "omits attributes derived from the subject" do
             r.element :name, nil, :size => :size
             resulting_xml.should == %(<name/>)
           end
 
+          it "retains attributes with explicit values" do
+            r.element :name, nil, :lang => "en"
+            resulting_xml.should == %(<name lang="en"/>)
+          end
+
         end
 
         describe "and a block" do
@@ -209,8 +214,10 @@ describe Representative::Xml do
       describe "with an argument that resolves to nil" do
 
         it "omits the attribute" do
-          r.list_of(:flags)
-          resulting_xml.should == %(<flags/>)
+          r.list_of(:services) do
+            r.date
+          end
+          resulting_xml.should == %(<services/>)
         end
 
       end
@@ -248,6 +255,30 @@ describe Representative::Xml do
 
     end
 
+    describe "#representing" do
+    
+      it "selects a new subject without generating an element" do
+        r.representing :vehicle do
+          r.element :make
+        end
+        resulting_xml.should == %(<make>Chevrolet</make>)
+      end
+      
+    end
+
+    describe "#comment" do
+      
+      it "inserts a comment" do
+        r.element :vehicle do
+          r.comment "Year of manufacture"
+          r.element :year
+        end
+        resulting_xml.should == 
+        %(<vehicle><!-- Year of manufacture --><year>1959</year></vehicle>)
+      end
+      
+    end
+    
   end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Mike Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 +10:00
+date: 2010-08-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency