shale 0.4.0 → 0.7.0

data/lib/shale/schema/xml_generator/import.rb

@@ -35,8 +35,8 @@ module Shale
         def as_xml(doc)
           import = doc.create_element('xs:import')
 
-          doc.add_attribute(import, 'namespace', @namespace)
-          doc.add_attribute(import, 'schemaLocation', @location)
+          doc.add_attribute(import, 'namespace', @namespace) if @namespace
+          doc.add_attribute(import, 'schemaLocation', @location) if @location
 
           import
         end

data/lib/shale/schema/xml_generator.rb

@@ -94,12 +94,12 @@ module Shale
         )
         schemas[default_namespace.name].add_child(root_element)
 
-        composites = []
-        collect_composite_types(composites, klass, klass.xml_mapping.default_namespace.name)
+        complexes = []
+        collect_complex_types(complexes, klass, klass.xml_mapping.default_namespace.name)
 
-        composites.each do |composite|
-          type = composite[:type]
-          namespace = composite[:namespace]
+        complexes.each do |complex|
+          type = complex[:type]
+          namespace = complex[:namespace]
           children = []
 
           type.xml_mapping.elements.values.each do |mapping|
@@ -222,13 +222,11 @@ module Shale
       def to_schemas(klass, base_name = nil, pretty: false, declaration: false)
         schemas = as_schemas(klass, base_name)
 
-        options = [
-          pretty ? :pretty : nil,
-          declaration ? :declaration : nil,
-        ]
-
         schemas.to_h do |schema|
-          [schema.name, Shale.xml_adapter.dump(schema.as_xml, *options)]
+          [
+            schema.name,
+            Shale.xml_adapter.dump(schema.as_xml, pretty: pretty, declaration: declaration),
+          ]
         end
       end
 
@@ -252,7 +250,7 @@ module Shale
       # @param [String, nil] namespace
       #
       # @api private
-      def collect_composite_types(types, type, namespace)
+      def collect_complex_types(types, type, namespace)
         types << { type: type, namespace: namespace }
 
         type.xml_mapping.elements.values.each do |mapping|
@@ -263,7 +261,7 @@ module Shale
           is_included = types.include?({ type: attribute.type, namespace: namespace })
 
           if is_mapper && !is_included
-            collect_composite_types(types, attribute.type, mapping.namespace.name)
+            collect_complex_types(types, attribute.type, mapping.namespace.name)
           end
         end
       end

data/lib/shale/schema.rb

@@ -3,6 +3,7 @@
 require_relative 'schema/json_generator'
 require_relative 'schema/json_compiler'
 require_relative 'schema/xml_generator'
+require_relative 'schema/xml_compiler'
 
 module Shale
   # Module for handling JSON and XML schema
@@ -66,5 +67,20 @@ module Shale
     def self.to_xml(klass, base_name = nil, pretty: false, declaration: false)
       XMLGenerator.new.to_schemas(klass, base_name, pretty: pretty, declaration: declaration)
     end
+
+    # Generate Shale model from XML Schema
+    #
+    # @param [Array<String>] schemas
+    #
+    # @return [Array<String>]
+    #
+    # @example
+    #   Shale::Schema.from_xml([xml_schema1, xml_schema2])
+    #   # => [model1, model2, model3]
+    #
+    # @api public
+    def self.from_xml(schemas)
+      XMLCompiler.new.to_models(schemas)
+    end
   end
 end