clinth3o-acdc 0.1.4 → 0.1.5

data/lib/acdc/body.rb

@@ -38,9 +38,9 @@ module AcDc
             else
               raise ArgumentError.new("Type is invalid") unless val.is_a?(type)
             end
-            elements.update(key => type.new(val,options_for(key),key))
+            elements.update(key => type.new(val, options_for(key)))
           else
-            elements.update(key => Element(val,options_for(key),key))
+            elements.update(key => Element(val, options_for(key)))
           end
         end
       end
@@ -51,7 +51,7 @@ module AcDc
       xml = Builder::XmlMarkup.new
       attrs = attributes.inject({}){|acc,attr| acc.update(attr[1].to_hash)}
       xml.tag!(tag_name,attrs){ |body|
-        elements.each do |key, elem|
+        elements.sort{|a,b| a[1].sequence <=> b[1].sequence}.each do |key, elem|
           body << elem.acdc
         end
       }
@@ -76,17 +76,22 @@ module AcDc
       def inherited(child)
         child.instance_variable_set('@declared_elements', @declared_elements)
         child.instance_variable_set('@declared_attributes', @declared_attributes)
+        child.instance_variable_set('@element_sequence', @element_sequence)
       end
       
       # Declare an Element for this Body
+      # Sequence of elements (XML Schema sequence) is taken care of by the order
+      # the elements are declared in the class definition.
       #@param [Symbol] name A name to assign the Element (tag name)
       #@param [Class] type A type to use for the element (enforcement)
       #@option options [Boolean] :single False if object is a collection
+      #@option options [String] :tag String determining the name to use in the XML tag
       def element(*options)
         name = options.first
-        type = options.second || nil
+        type = options.second || nil unless options.second.is_a?(Hash)
         opts = options.extract_options!
-        declared_elements.update(name => opts.merge(:type => type))
+        opts.merge!(:tag => name) if opts[:tag].nil?
+        declared_elements.update(name => opts.merge(:type => type, :sequence => next_sequence))
       end
       
       # Declare an attribute for this Body
@@ -137,6 +142,11 @@ module AcDc
           klass = name.constantize
           klass.new(value_from_node(node), :attributes => attrs)
         end
+        
+        def next_sequence
+          @element_sequence ||= 0
+          @element_sequence = @element_sequence +=1
+        end
     end
     
     private
@@ -156,7 +166,7 @@ module AcDc
       def write(method_id, *args, &block)
         key = method_id.to_s.gsub(/\=$/,"").to_sym
         if elements.has_key?(key)
-          elements.update(key => Element(args.first,options_for(key),key))
+          elements.update(key => Element(args.first, options_for(key)))
         else
           attributes.update(key => Attribute(key,args.first))
         end

data/lib/acdc/element.rb

@@ -8,9 +8,9 @@ module AcDc
     # Constructor with the following:
     #@param [Object] value Any value to place in the tags
     #@option options [Boolean] :single False if object is a collection 
-    #@param [String] tag A tag name to use if not Element
-    def initialize(value, options={}, tag=nil)
-      @tag = tag ||= self.class.to_s.split("::").last
+    #@option options [String] :tag A tag name to use if not Element
+    def initialize(value, options={})
+      @tag = options[:tag] ||= self.class.to_s.split("::").last
       @value = value
       @options = options
       @attributes = options.delete(:attributes)
@@ -33,8 +33,8 @@ module AcDc
     end
     
     # The name to use for the tag
-    def tag_name
-      tag.to_s.camelize
+    def tag_name 
+      tag.to_s
     end
     
     # Overridden to compare the values and not the whole object
@@ -44,6 +44,10 @@ module AcDc
       value.eql?(other.value)
     end
     
+    def sequence
+      @options[:sequence]
+    end
+    
     private
       def tag_content
         (attributes.nil? or attributes.empty?) ? tag_name : [tag_name,attributes]

data/lib/acdc.rb

@@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__),"acdc","body")
 
 module AcDc
   
-  VERSION = [0,1,4] unless defined?(AcDc::VERSION)
+  VERSION = [0,1,5] unless defined?(AcDc::VERSION)
   
   if defined?(JAIL_BREAK)
     Element.class_eval{ alias :to_s :acdc }
@@ -19,8 +19,8 @@ module AcDc
 end
 
 # Will construct a AcDc::Element classs
-def Element(value, options = {}, name = nil)
-  AcDc::Element.new(value,options,name)
+def Element(value, options = {})
+  AcDc::Element.new(value,options)
 end
 
 # Will construct a AcDc::Attribute class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: clinth3o-acdc
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Clint Hill