lib/scaffold_parser/scaffolders/xsd/parser/handlers/sequence.rb in scaffold_parser-0.6.0 vs lib/scaffold_parser/scaffolders/xsd/parser/handlers/sequence.rb in scaffold_parser-0.7.0

@@ -2,42 +2,26 @@
   module Scaffolders
     class XSD
       class Parser
         module Handlers
           class Sequence
+            include OrderElements
             attr_accessor :elements
 
             def initialize(elements = [])
               @elements = [*elements]
             end
 
-            def sequence(_)
-              flattened = elements.flat_map do |element|
-                case element
-                when Sequence, Choice, All
-                  then element.elements
-                else
-                  element
-                end
-              end
-
-              Sequence.new flattened
-            end
-
             def complex_type(source)
               if source.has_name?
-                STACK.push Klass.new(source.name, elements)
+                STACK.push Klass.new(source, elements)
               end
 
               ComplexType.new elements
             end
 
             def group(source)
-              STACK.push Module.new("Groups::#{source.name.camelize}", elements)
-            end
-
-            def choice(_)
-              self
+              STACK.push Module.new(source, elements)
             end
 
             def extension(source)
               Extension.new elements, source.attributes
             end