Map some more XSD types.

sshaw · Apr 7, 2016 · 427845b · 427845b
1 parent 3768212
commit 427845b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Rakefile b/Rakefile
@@ -9,10 +9,10 @@ end
 
 task :xjc do
   schema = ENV["SCHEMA"]
-  abort "SCHEMA not set" unless schema
+  abort "SCHEMA not set" if schema.to_s.strip.empty?
 
   output = ENV["OUTPUT"] || "java-src"
   FileUtils.mkdir(output) unless File.directory?(output)
 
-  sh "xjc -extension -npa  -d #{output} #{schema} -b lib/jaxb2ruby/config.xjb"
+  sh "xjc -extension -npa -d #{output} #{schema} -b lib/jaxb2ruby/config.xjb"
 end
diff --git a/lib/jaxb2ruby/type_util.rb b/lib/jaxb2ruby/type_util.rb
@@ -27,6 +27,7 @@ class TypeUtil  # :nodoc:
     SCHEMA_TO_RUBY = {
       "ID" => :ID,
       "IDREF" => :IDREF,
+      "Name" => "String",
       "NCName" => "String",
       "NMTOKEN" => "String",
       "anySimpleType" => "Object",
@@ -50,6 +51,7 @@ class TypeUtil  # :nodoc:
       "int" => "Integer",
       "integer" => "Integer",
       "long" => "Integer",
+      "language" => "String",
       "nonNegativeInteger" => "Integer",
       "nonPositiveInteger" => "Integer",
       "normalizedString" => "String",