my_data 0.1.0 → 0.9.0

data/lib/my_data/resources/error_type.rb

@@ -3,6 +3,5 @@
 class MyData::Resources::ErrorType
   include MyData::Resource
 
-  attribute :message, :string
-  attribute :code, :integer
+  xsd_complex_type
 end

data/lib/my_data/resources/icls/income_classification.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MyData::Resources::Icls::IncomeClassification
+  include MyData::Resource
+
+  xsd_doc
+end

data/lib/my_data/resources/icls/income_classification_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Icls::IncomeClassificationType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/icls/invoice_income_classification_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Icls::InvoiceIncomeClassificationType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/icls/invoices_income_classification_detail_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Icls::InvoicesIncomeClassificationDetailType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/inv/aade_book_invoice_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Inv::AadeBookInvoiceType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/inv/address_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Inv::AddressType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/inv/cancelled_invoice_type.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MyData::Resources::Inv::CancelledInvoiceType
+  include MyData::Resource
+
+  xsd_complex_type
+end

data/lib/my_data/resources/inv/continuation_token_type.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MyData::Resources::Inv::ContinuationTokenType
+  include MyData::Resource
+
+  xsd_complex_type
+end

data/lib/my_data/resources/inv/invoice_header_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Inv::InvoiceHeaderType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/inv/invoice_row_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Inv::InvoiceRowType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/inv/invoice_summary_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Inv::InvoiceSummaryType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/inv/invoices_doc.rb

@@ -3,15 +3,5 @@
 class MyData::Resources::Inv::InvoicesDoc
   include MyData::Resource
 
-  container_tag "InvoicesDoc", {
-    xmlns: "http://www.aade.gr/myDATA/invoice/v1.0",
-    "xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance",
-    "xsi:schemaLocation": "http://www.aade.gr/myDATA/invoice/v1.0 schema.xsd",
-    "xmlns:icls": "https://www.aade.gr/myDATA/incomeClassificaton/v1.0"
-  }
-
-  attribute :invoice, :resource,
-            class_name: "Inv::AadeBookInvoiceType", collection: true
-
-  validates_presence_of :invoice
+  xsd_doc
 end

data/lib/my_data/resources/inv/party_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Inv::PartyType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/inv/payment_method_detail_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Inv::PaymentMethodDetailType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/inv/request_doc.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MyData::Resources::Inv::RequestDoc
+  include MyData::Resource
+
+  xsd_doc
+end

data/lib/my_data/resources/inv/requested_invoices_doc.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MyData::Resources::Inv::RequestedInvoicesDoc
+  include MyData::Resource
+
+  xsd_doc
+end

data/lib/my_data/resources/inv/ship_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Inv::ShipType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/inv/tax_totals_type.rb

@@ -3,5 +3,5 @@
 class MyData::Resources::Inv::TaxTotalsType
   include MyData::Resource
 
-  xsd_structure
+  xsd_complex_type
 end

data/lib/my_data/resources/invoice_provider_type.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MyData::Resources::InvoiceProviderType
+  include MyData::Resource
+
+  xsd_complex_type
+end

data/lib/my_data/resources/requested_provider_doc.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MyData::Resources::RequestedProviderDoc
+  include MyData::Resource
+
+  xsd_doc
+end

data/lib/my_data/resources/response.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MyData::Resources::Response
+  include MyData::Resource
+
+  xsd_doc
+end

data/lib/my_data/resources/response_type.rb

@@ -3,17 +3,5 @@
 class MyData::Resources::ResponseType
   include MyData::Resource
 
-  attribute :index, :integer
-
-  attribute :invoice_uid, :string
-  attribute :invoice_mark, :integer
-  attribute :classification_mark, :integer
-  attribute :cancellation_mark, :integer
-  attribute :authentication_code, :string
-
-  attribute :errors, :resource,
-            class_name: "ErrorType",
-            collection: true, collection_element_name: "error"
-
-  attribute :status_code, :string
+  xsd_complex_type
 end

data/lib/my_data/response_parser.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class MyData::ResponseParser
+  def initialize(response, resource: nil, root: nil)
+    @original_response = response
+    @resource = resource
+    @root = root
+  end
+
+  def success?
+    original_response.status == 200 &&
+      (!response_type? || response.response.all? { |r| r.status_code == "Success" })
+  end
+
+  def errors
+    @errors ||=
+      if success?
+        []
+      elsif response_type?
+        response.response.map(&:errors).flatten
+      else
+        [MyData::Resources::ErrorType.new(JSON.parse(original_response.body))]
+      end
+  end
+
+  def response
+    return @response if defined? @response
+
+    @response =
+      if original_response.status == 200
+        MyData::XmlParser.xml_to_resource(xml: original_response.body, resource: resource, root: root)
+      end
+  end
+
+  private
+
+  def response_type?
+    response&.is_a?(MyData::Resources::Response)
+  end
+
+  attr_reader :original_response, :resource, :root
+end

data/lib/my_data/type_caster.rb

@@ -11,8 +11,7 @@ module MyData
       :date,
       :time,
       :boolean,
-      :resource,
-      :ignore
+      :resource
     ].freeze
 
     def valid_type?(type)
@@ -28,7 +27,7 @@ module MyData
     private
 
     def type_cast_string(value)
-      value.to_s.strip
+      value ? value.to_s.strip : nil
     end
 
     def type_cast_integer(value)
@@ -48,7 +47,9 @@ module MyData
     end
 
     def type_cast_boolean(value)
-      value.downcase == "true"
+      return value if value.nil?
+
+      value.is_a?(String) ? value.downcase == "true" : value == true
     end
 
     def type_cast_resource(value, resource)

data/lib/my_data/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MyData
-  VERSION = "0.1.0"
+  VERSION = "0.9.0"
 end

data/lib/my_data/xml_generator.rb

@@ -22,28 +22,40 @@ module MyData
 
     def to_xml_structure
       resource.attributes.each_with_object([]) do |(key, value), structure|
-        attr_mappings = mappings[key]
-        next if value.nil?
-
-        if attr_mappings[:collection]
-          val = value.map { |v| attr_mappings[:resource] ? self.class.new(v, parent_namespace: namespace).to_xml_structure : v.to_s }
-
-          if attr_mappings[:collection_element_name]
-            struct = val.map { |v| attr_structure(attr_mappings[:collection_element_name], v) }
-            structure.push(attr_structure(key, struct))
-          else
-            struct = val.map { |v| attr_structure(key, v) }
-            structure.push(*struct)
-          end
-        else
-          val = attr_mappings[:resource] ? self.class.new(value, parent_namespace: namespace).to_xml_structure : value.to_s
-          structure.push(attr_structure(key, val))
-        end
+        next if value.nil? || (value.respond_to?(:empty?) && value.empty?)
+
+        value = value_to_xml_structure(key, value)
+
+        structure.push(*extract_attributes(key, value))
       end
     end
 
     private
 
+    def value_to_xml_structure(key, value)
+      is_resource = mappings[key][:resource].present?
+
+      transform = lambda do |v|
+        is_resource ? self.class.new(v, parent_namespace: namespace).to_xml_structure : v.to_s
+      end
+
+      value.is_a?(Array) ? value.map(&transform) : transform.call(value)
+    end
+
+    def extract_attributes(key, value)
+      collection, collection_element_name = mappings[key].values_at(:collection, :collection_element_name)
+
+      if !collection
+        [attr_structure(key, value)]
+      elsif collection_element_name
+        attrs = value.map { |v| attr_structure(collection_element_name, v) }
+
+        [attr_structure(key, attrs)]
+      else
+        value.map { |v| attr_structure(key, v) }
+      end
+    end
+
     def attr_structure(key, value)
       prefix = parent_namespace && namespace != parent_namespace ? "#{namespace}:" : ""
 

data/lib/my_data/xml_parser.rb

@@ -1,96 +1,57 @@
 # frozen_string_literal: true
 
-module MyData
-  class XmlParser
-    attr_reader :doc, :mappings, :class_name
+module MyData::XmlParser
+  extend self
 
-    def initialize(doc, mappings, class_name)
-      @doc = doc
-      @mappings = mappings
-      @class_name = class_name
-    end
-
-    def parse_xml
-      doc.children.select(&:element?).each_with_object({}) do |element, parse_attrs|
-        attr_names = extract_attr_names(element)
-
-        attr_names.each do |attr_name|
-          value = extract_value(element, attr_name)
-          parse_attrs[attr_name] = value if value
-        end
-      end
-    end
+  def xml_to_resource(xml:, resource:, root: nil)
+    h = transofrm_xml_to_hash(fix_xml(xml))
+    h = h[root] if root
 
-    private
-
-    def extract_attr_names(element)
-      posible_attrs = mappings.select { |_, opts| element.name == opts[:tag_name] }
+    resource.new hash_mapping(h, resource)
+  end
 
-      if posible_attrs.present?
-        attr_names = posible_attrs
-                     .select { |_name, opts| match_static_tag_attributes?(element, opts[:static_tag_attrs]) }
-      else
-        attr_names = []
-        # raise "Not implemented: #{class_name}: #{element.name}"
-      end
+  private
 
-      if attr_names.empty?
-        # raise("Tag attributes not matched: #{class_name}: #{element.name}, element attrs: #{element.attributes}")
-      end
+  def hash_mapping(hash, resource)
+    flatten(hash, resource).each_with_object({}) do |(key, value), h|
+      mappings = resource.mappings[key]
 
-      attr_names.map(&:first)
+      h[key] = value_mapping(value, mappings)
     end
+  end
 
-    def extract_value(element, attr_name)
-      value = element
-      attr_opts = mappings[attr_name]
-
-      # TODO: current we dont check that the attribute setting matcing the elements
-      if attr_opts[:nested_tags].present?
-        attr_opts[:nested_tags].each do |tag|
-          return if value.nil?
+  def value_mapping(value, mappings)
+    return value if mappings[:resource].nil?
 
-          value = value.children.select(&:element?).find { |element| element.name == tag[:name].to_s }
-        end
+    if mappings[:collection]
+      value = value.is_a?(Array) ? value : [value]
+      value.map { |v| hash_mapping(v, mappings[:resource]) }
+    else
+      hash_mapping(value, mappings[:resource])
+    end
+  end
 
-        return value if value.nil?
-      end
+  def fix_xml(xml)
+    xml.strip.gsub("&lt;", "<").gsub("&gt;", ">")
+  end
 
-      if attr_opts[:collection]
-        value.children.select(&:element?).map { |val| get_value(val, attr_opts) }
-      else
-        get_value(value, attr_opts)
-      end
-    end
+  def transofrm_xml_to_hash(xml)
+    Hash
+      .from_xml(xml)
+      .deep_transform_keys(&:underscore)["string"]
+  end
 
-    def get_value(value, attr_opts)
-      if attr_opts[:type] == :model
-        nested_parser = self.class.new(
-          value,
-          attr_opts[:class_name].mappings,
-          attr_opts[:class_name].name
-        )
-        value = nested_parser.parse_xml
-      else
-        value = if attr_opts[:dynamic_tag_attr].present?
-                  value.attributes[attr_opts[:dynamic_tag_attr]].value
-                else
-                  value.text
-                end
-      end
-    end
+  def flatten(hash, resource)
+    return {} unless hash
 
-    def match_static_tag_attributes?(element, static_tag_attributes)
-      static_tag_attributes.all? do |tag_attribute|
-        element_attr = element.attributes[tag_attribute.name]
+    hash.each_with_object({}) do |(k, v), h|
+      next if resource.attributes.none?(k) || !v
 
-        next false unless element_attr
+      mappings = resource.mappings[k]
 
-        matched = (element_attr.value == tag_attribute.value) &&
-                  (tag_attribute.namespace.nil? || tag_attribute.namespace == element_attr.namespace.prefix)
+      next h[k] = v unless mappings[:collection] && mappings[:collection_element_name]
 
-        matched
-      end
+      h[k] = v[mappings[:collection_element_name]]
     end
   end
 end