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

@@ -6,59 +6,77 @@
       class Parser
         module Handlers
           class Module
             include Utils
 
-            attr_accessor :name, :namespace, :methods, :includes
+            attr_accessor :name, :namespace, :methods, :includes, :inherit_from
 
-            def initialize(name = nil, methods = [])
-              @name = name&.camelize
+            def initialize(source = nil, methods = [])
+              @name = "Groups::#{source.name.camelize}"
               @methods = methods
 
+              @namespace = source.xmlns_prefix&.camelize
+
               yield self if block_given?
             end
 
             def schema(_)
               STACK
             end
 
+            def name_with_prefix
+              [namespace, name].compact.map(&:camelize).join('::')
+            end
+
             def to_s
-              ModuleTemplate.new(name.demodulize) do |template|
-                template.namespaces = ['Groups', 'Parsers', namespace].compact
+              string =
+                ModuleTemplate.new(name.demodulize) do |template|
+                  template.namespaces = ['Groups'].compact
 
-                methods.each { |method| template.methods << indent(method.to_s.lines).join  }
+                  methods.each { |method| template.methods << indent(method.to_s.lines).join  }
 
-                meth = StringIO.new
-                meth.puts "  def to_h_with_attrs"
-                meth.puts "    hash = HashWithAttributes.new({}, attributes)"
-                meth.puts
-                methods.each { |method| meth.puts "    #{method.to_h_with_attrs_method}" }
-                meth.puts
-                meth.puts "    hash"
-                meth.puts "  end"
+                  meth = StringIO.new
+                  meth.puts "  def to_h_with_attrs"
+                  meth.puts "    hash = ParserCore::HashWithAttributes.new({}, attributes)"
+                  meth.puts
+                  methods.each { |method| meth.puts "    #{method.to_h_with_attrs_method}" }
+                  meth.puts
+                  meth.puts "    hash"
+                  meth.puts "  end"
 
-                template.methods << meth.string
-              end.to_s
+                  template.methods << meth.string
+                end.to_s
+
+              wrapped = string
+              wrapped = wrap_in_namespace(wrapped, namespace) if namespace
+
+              wrapped
             end
 
             def to_builder_s
-              ModuleTemplate.new(name.demodulize) do |template|
-                template.namespaces = ['Groups', 'Builders', namespace].compact
+              string =
+                ModuleTemplate.new(name.demodulize) do |template|
+                  template.namespaces = ['Groups'].compact
 
-                meth = StringIO.new
-                meth.puts "  def builder"
-                meth.puts "    root = Ox::Element.new(name)"
-                meth.puts "    if data.respond_to? :attributes"
-                meth.puts "      data.attributes.each { |k, v| root[k] = v }"
-                meth.puts "    end"
-                meth.puts
-                meth.puts methods.map { |method| indent(indent(method.to_builder.lines)).join  }.join("\n")
-                meth.puts
-                meth.puts "    root"
-                meth.puts "  end"
+                  meth = StringIO.new
+                  meth.puts "  def builder"
+                  meth.puts "    root = Ox::Element.new(name)"
+                  meth.puts "    if data.respond_to? :attributes"
+                  meth.puts "      data.attributes.each { |k, v| root[k] = v }"
+                  meth.puts "    end"
+                  meth.puts
+                  meth.puts methods.map { |method| indent(indent(method.to_builder.lines)).join  }.join("\n")
+                  meth.puts
+                  meth.puts "    root"
+                  meth.puts "  end"
 
-                template.methods = [meth.string]
-              end.to_s
+                  template.methods = [meth.string]
+                end.to_s
+
+              wrapped = string
+              wrapped = wrap_in_namespace(wrapped, namespace) if namespace
+
+              wrapped
             end
           end
         end
       end
     end