xml2go 0.0.3 → 0.0.4

data/lib/xml2go/parser.rb

@@ -44,7 +44,8 @@ module Xml2Go
 
     # take 's' out of string and return if it was plural or not
     def singularize(string)
-      if string[-1] == "s" then
+      # I need a singulizer util :(
+      if string[-1] == "s" && string[-1] != string[-2] then
           s = string[0..-2]
           return [s, true]
       end
@@ -59,9 +60,9 @@ module Xml2Go
     end
 
     def add_field_to_struct(struct, var_name, type, xml_tag)
-      if struct.fields.has_key?(var_name) && 
+      if struct.fields.has_key?(var_name) &&
           !struct.fields[var_name].type.include?("[]") then
-        
+
         type, sing = singularize(struct.fields[var_name].type)
 
         struct.fields[var_name].type = "[]" + type
@@ -121,6 +122,7 @@ module Xml2Go
 
     def parse_element(element)
       struct_name = normalize(element.name)
+      struct_name, s = singularize(struct_name)
       # TODO: maybe we DO want to process repeated structs
       # to capture arrays don't process to structs
       return if @structs.has_key?(struct_name)
@@ -143,7 +145,7 @@ module Xml2Go
         end
       end
 
-      @structs[struct.name] = struct
+      @structs[struct.type] = struct
     end
 
     # analyses the xml element to try and fetch the type

data/lib/xml2go/struct.rb

@@ -1,42 +1,42 @@
 
 module Xml2Go
 
-  # class representing a Go struct
-  class Struct
-    attr_accessor :fields, :name
-
-    # represents member variables
-    class Field
-      attr_accessor :type, :name, :xml_tag, :value
-
-      def initialize(name, type, xml_tag, value)
-        @name = name
-        @type = type
-        @xml_tag = xml_tag
-        @value = value
-        @const_name = Xml2Go::get_const_name(@name)
-      end
+  # represents member variables
+  class Field
+    attr_accessor :type, :name, :xml_tag, :value
 
-      def to_s
-        "#{@name} #{@type} `xml:\"#{@xml_tag}\"`"
-      end
+    def initialize(name, type, xml_tag, value)
+      @name = name
+      @type = type
+      @xml_tag = xml_tag
+      @value = value
+      @const_name = Xml2Go::get_const_name(@name)
+    end
 
-      def to_declaration
-        value = @value.nil? ? Xml2Go::low(@name) : @const_name
-        "#{@name}: #{value},"
-      end
+    def to_s
+      "#{@name} #{@type} `xml:\"#{@xml_tag}\"`"
+    end
 
-      def to_const
-        if !value.nil? then
-          return "#{@const_name} = \"#{@value}\""
-        end
-        return ""
-      end
+    def to_declaration
+      value = @value.nil? ? Xml2Go::low(@name) : @const_name
+      "#{@name}: #{value},"
+    end
 
+    def to_const
+      if !value.nil? then
+        return "#{@const_name} = \"#{@value}\""
+      end
+      return ""
     end
 
-    def initialize(name)
-      @name = name
+  end # class Field
+
+  # class representing a Go struct
+  class Struct
+    attr_accessor :fields, :type
+
+    def initialize(type)
+      @type = type
       @fields = {}
     end
 
@@ -52,7 +52,7 @@ module Xml2Go
 
     def to_s
       fields_string = @fields.values.join("\n")
-      "type #{@name} struct {\n
+      "type #{@type} struct {\n
       #{fields_string}
       }
       "
@@ -60,15 +60,17 @@ module Xml2Go
 
     def to_declaration
       fields_string = @fields.values.map { |v| v.to_declaration}
-      "#{Xml2Go::low(@name)} := #{@name} {
+      "#{Xml2Go::low(@type)} := #{@type} {
       #{fields_string.join("\n")}
       }"
     end
 
     def get_consts
       consts_string = @fields.values.map{ |v| v.to_const}
-      "// #{@name} info \n" << consts_string.join("\n")
+      "// #{@type} info \n" << consts_string.join("\n")
     end
 
   end
+
+
 end

data/lib/xml2go/version.rb

@@ -1,3 +1,3 @@
 module Xml2go
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml2go
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler