dslize 0.0.4 → 0.0.5

data/lib/dslize/formatter/formatter.rb

@@ -12,7 +12,7 @@ module DSLize
       
       protected
       def get_subclasses(type)
-        superclasses.select { |k,v| v.to_s == type.to_s }.keys
+        superclasses.select { |k,v| v.to_s == type.to_s }.keys.map { |k| (!objects[k][:abstract] ? [k] : []) + get_subclasses(k) }.flatten
       end
     end
     

data/lib/dslize/formatter/xsd_formatter.rb

@@ -27,6 +27,11 @@ module DSLize
                             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
+                              xsd.annotation do
+                                xsd.appinfo do
+                                  xsd.property :name => clazz, :xmlns => "http://java.sun.com/xml/ns/jaxb"
+                                end
+                              end
                               subclasses.each do |sub_type|
                                 xsd.element(nil, :ref => sub_type)
                               end
@@ -53,7 +58,8 @@ module DSLize
         end
         
         File.open(args[0], "w") do |f|
-          f << schema.to_xml.gsub(' name=""', '') # xpain is buggy and always write a name on <element>
+          f << schema.to_xml.gsub(' name=""', ''). # xpain is buggy and always write a name on <element>
+            gsub(' xmlns:xsd="http://www.w3.org/2001/XMLSchema"', ' xmlns:xsd="http://www.w3.org/2001/XMLSchema" jaxb:version="2.0" elementFormDefault="qualified" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"')
         end
       end
       

data/lib/dslize/version.rb

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

metadata

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