dslize 0.0.3 → 0.0.4

data/lib/dslize/formatter/formatter.rb

@@ -9,6 +9,11 @@ module DSLize
         self.objects = DSLize.objects
         self.superclasses = DSLize.superclasses
       end
+      
+      protected
+      def get_subclasses(type)
+        superclasses.select { |k,v| v.to_s == type.to_s }.keys
+      end
     end
     
   end

data/lib/dslize/formatter/xsd_formatter.rb

@@ -21,7 +21,20 @@ module DSLize
                     { :has_one => nil, :has_many => "unbounded"}.each do |relation, max_occurs|
                       (options[relation] or []).each do |k, v|
                         named_object_if_needed(xsd, k, v) do
-                          xsd.element(nil, { :ref => (v[:type] or k), :maxOccurs => max_occurs }.select { |k,v| !v.nil? })
+                          clazz = v[:type] or k
+                          subclasses = get_subclasses(clazz)
+                          if subclasses.empty?
+                            xsd.element(nil, { :ref => clazz, :maxOccurs => max_occurs }.select { |k,v| !v.nil? })
+                          else
+                            xsd.choice({ :maxOccurs => max_occurs }.select { |k,v| !v.nil? }) do
+                              subclasses.each do |sub_type|
+                                xsd.element(nil, :ref => sub_type)
+                              end
+                              if !objects[clazz][:abstract]
+                                xsd.element(nil, :ref => clazz)
+                              end
+                            end
+                          end
                         end
                       end
                     end

data/lib/dslize/version.rb

@@ -1,3 +1,3 @@
 module DSLize
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/sample.rb

@@ -56,6 +56,10 @@ module DSLize::Definition
   class WaterPlanet < Planet
   end
   
+  class Universe
+    has_many Planet
+  end
+  
 end
 
 DSLize::Formatter::XSD.new.generate!(ARGV[0])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - redox
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-11 00:00:00 +02:00
+date: 2012-07-12 00:00:00 +02:00
 default_executable: 
 dependencies: []