my_data 0.1.0 → 0.9.0

data/lib/my_data/xsd/complex_type.rb

@@ -3,17 +3,17 @@
 class MyData::Xsd::ComplexType
   attr_reader :doc, :namespace
 
-  def initialize(doc, namespace:)
+  def initialize(doc, namespace: nil)
     @doc = doc
     @namespace = namespace
   end
 
   def name
-    @name ||= doc.attributes["name"].value
+    @name ||= doc.attributes["name"].value.camelize
   end
 
   def elements
-    @elements ||= doc.xpath("xs:sequence/xs:element").map do |element|
+    @elements ||= extract_elements(doc).flatten.map do |element|
       MyData::Xsd::Element.new(element)
     end
   end
@@ -21,4 +21,12 @@ class MyData::Xsd::ComplexType
   def inspect
     "ComplexType: { name: #{name.to_json}, elements: #{elements} }"
   end
+
+  private
+
+  def extract_elements(node)
+    return node if node.name == "element"
+
+    node.element_children.map { |child| extract_elements(child) }
+  end
 end

data/lib/my_data/xsd/doc.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+class MyData::Xsd::Doc
+  attr_reader :doc
+
+  DEFAULT_ATTRS = {
+    "xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance"
+  }.freeze
+
+  def initialize(doc)
+    @doc = doc
+  end
+
+  def target_namespace
+    return @target_namespace if defined? @target_namespace
+
+    @target_namespace =
+      (doc.namespaces.find { |_k, v| v == target_namespace_value }.first.split(":").last if target_namespace_value)
+  end
+
+  def attributes
+    @attributes ||= DEFAULT_ATTRS
+                    .merge(target_namespace_attributes)
+                    .merge(namespace_attributes)
+  end
+
+  def elements
+    @elements ||=
+      begin
+        sequence = doc.child.xpath("xs:element/xs:complexType/xs:sequence").first
+        elements = sequence.xpath("xs:element")
+        collection = elements.count == 1 && sequence.attributes["maxOccurs"].present?
+
+        sequence.xpath("xs:element").map do |element|
+          MyData::Xsd::Element.new(element, force_collection: collection)
+        end
+      end
+  end
+
+  def complex_types
+    @complex_types ||= doc.xpath("//xs:schema/xs:complexType").map do |node|
+      MyData::Xsd::ComplexType.new(node, namespace: target_namespace)
+    end
+  end
+
+  def simple_types
+    @simple_types ||= doc.xpath("//xs:schema/xs:simpleType").map do |node|
+      MyData::Xsd::Element.new(node, namespace: target_namespace)
+    end
+  end
+
+  def inspect
+    "<Schema target_namespace: #{target_namespace.to_json}, attributes: #{attributes}>"
+  end
+
+  private
+
+  def target_namespace_value
+    doc.child.attributes["targetNamespace"]&.value
+  end
+
+  def target_namespace_attributes
+    return {} unless target_namespace_value
+
+    {
+      "xmlns" => target_namespace_value,
+      "xmlns:schema" => "#{target_namespace_value} schemaLocation.xsd"
+    }
+  end
+
+  def namespace_attributes
+    @namespace_attributes ||= doc
+                              .namespaces
+                              .reject { |k, _| k == "xmlns:xs" }
+                              .reject { |_, v| v == target_namespace }
+  end
+end

data/lib/my_data/xsd/element.rb

@@ -3,9 +3,10 @@
 class MyData::Xsd::Element
   attr_reader :element, :namespace
 
-  def initialize(element, namespace: nil)
+  def initialize(element, namespace: nil, force_collection: nil)
     @element = element
     @namespace = namespace
+    force_collection && @collection = force_collection
   end
 
   def name
@@ -14,13 +15,14 @@ class MyData::Xsd::Element
 
   def type
     @type =
-      if element.attributes["type"].present?
-        element.attributes["type"]
-      elsif element.xpath(".//xs:restriction[@base]").any?
-        element.xpath(".//xs:restriction[@base]").first.attributes["base"]
-      elsif element.xpath(".//xs:element[@type]").any?
-        element.xpath(".//xs:element[@type]").first.attributes["type"]
-      end.value
+      begin
+        extracted_type =
+          element.attributes["type"] ||
+          element.at_xpath(".//xs:element[@type]")&.attributes.try(:[], "type") ||
+          element.at_xpath(".//xs:restriction[@base]")&.attributes.try(:[], "base")
+
+        camelize_type(extracted_type.value)
+      end
   end
 
   def collection?
@@ -46,4 +48,14 @@ class MyData::Xsd::Element
   def inspect
     "Element: { name: #{name.to_json}, type: #{type.to_json}, collection: #{collection?} }"
   end
+
+  private
+
+  def camelize_type(extracted_type)
+    return extracted_type if extracted_type.starts_with?("xs:")
+
+    ns, name = extracted_type.include?(":") ? extracted_type.split(":") : [nil, extracted_type]
+
+    [ns, name.camelize].compact.join(":")
+  end
 end

data/lib/my_data/xsd/resource_generator.rb

@@ -4,32 +4,45 @@ require "fileutils"
 
 # This class is for development reason only, to generate resources
 module MyData::Xsd::ResourceGenerator
-  module_function
+  extend self
 
-  def generate
-    MyData::Xsd::Structure.complex_types.each do |_, type|
-      folder_name = File.join(MyData.root, "lib/my_data/resources", type.namespace.to_s)
-      FileUtils.mkdir_p(folder_name)
-
-      class_name = "#{type.namespace.capitalize}::#{type.name}"
+  def generate_docs
+    MyData::Xsd::Structure.docs.each do |name, doc|
+      generate_file(name: name, namespace: doc.target_namespace, xsd_mode: "xsd_doc")
+    end
 
-      puts "Create file: #{folder_name} #{type.name}"
+    "done"
+  end
 
-      file = File.new(File.join(folder_name, "#{type.name.underscore}.rb"), "w")
-      file.write(class_string(class_name))
-      file.close
+  def generate_types
+    MyData::Xsd::Structure.complex_types.each do |_, type|
+      generate_file(name: type.name, namespace: type.namespace, xsd_mode: "xsd_complex_type")
     end
 
     "done"
   end
 
-  def class_string(class_name)
+  private
+
+  def generate_file(name:, namespace:, xsd_mode:)
+    folder_name = File.join(MyData.root, "lib/my_data/resources", namespace.to_s)
+    FileUtils.mkdir_p(folder_name)
+
+    class_name = [namespace&.camelize, name.camelize].compact.join("::")
+    puts "Create file: #{folder_name}, #{name}"
+
+    file = File.new(File.join(folder_name, "#{name.underscore}.rb"), "w")
+    file.write(class_string(class_name, xsd_mode))
+    file.close
+  end
+
+  def class_string(class_name, xsd_mode)
     string = "# frozen_string_literal: true\n"
     string += "\n"
     string += "class MyData::Resources::#{class_name}\n"
     string += "  include MyData::Resource\n"
     string += "\n"
-    string += "  xsd_structure\n"
+    string += "  #{xsd_mode}\n"
     string += "end\n"
 
     string

data/lib/my_data/xsd/structure.rb

@@ -5,51 +5,65 @@ module MyData::Xsd::Structure
 
   PATH = File.join(MyData.root, "lib/my_data/xsd/docs")
 
-  def resource_attributes(class_name)
+  def doc(class_name)
+    name = class_name.split("::").last
+    [name, docs[name]]
+  end
+
+  def resource_attributes(class_name, type)
     namespace, name = class_name.split("::").last(2)
+    key = namespace == "Resources" ? name : [namespace.downcase, name].join(":")
 
-    complex_types["#{namespace.downcase}:#{name}"].elements.map do |element|
-      type = type_mapping(element.type)
-
-      [
-        element.name.underscore,
-        type,
-        {
-          collection: element.collection?,
-          collection_element_name: element.collection_element_name,
-          class_name: type == :resource ? classify(element.type) : nil,
-          required: element.required?
-        }
-      ]
-    end
+    current_doc = type == :complex_type ? complex_types[key] : docs[name]
+
+    current_doc.elements.map { |element| element_attributes(element) }
   end
 
-  def complex_types
-    @complex_types ||= docs.each_with_object({}) do |(namespace, doc), types|
-      doc.xpath("//xs:schema/xs:complexType").each do |node|
-        type = MyData::Xsd::ComplexType.new(node, namespace: namespace)
+  def docs
+    @docs ||= Dir.glob("*.xsd", base: PATH).map do |file_name|
+      [file_name.sub(/-.+$/, "").camelize, MyData::Xsd::Doc.new(read_xsd(file_name))]
+    end.to_h
+  end
 
-        types["#{type.namespace}:#{type.name}"] = type
+  def complex_types
+    @complex_types ||= docs.values.each_with_object({}) do |document, types|
+      document.complex_types.each do |type|
+        name = [type.namespace, type.name].compact.join(":")
+        types[name] = type
       end
     end
   end
 
   def simple_types
-    @simple_types ||= docs.each_with_object({}) do |(namespace, doc), types|
-      doc.xpath("//xs:schema/xs:simpleType").each do |node|
-        type = MyData::Xsd::Element.new(node, namespace: namespace)
-
-        types["#{type.namespace}:#{type.name}"] = type
+    @simple_types ||= docs.values.each_with_object({}) do |document, types|
+      document.simple_types.each do |type|
+        name = [type.namespace, type.name].compact.join(":")
+        types[name] = type
       end
     end
   end
 
   private
 
+  def element_attributes(element)
+    type = type_mapping(element.type)
+
+    [
+      element.name.underscore,
+      type,
+      {
+        collection: element.collection?,
+        collection_element_name: element.collection_element_name,
+        class_name: type == :resource ? classify(element.type) : nil,
+        required: element.required?
+      }
+    ]
+  end
+
   def classify(type)
-    namespace, name = type.split(":")
+    namespace, name = type.split(":").map(&:camelize)
 
-    "#{namespace.capitalize}::#{name}"
+    "#{namespace}::#{name}"
   end
 
   def type_mapping(type)
@@ -66,14 +80,6 @@ module MyData::Xsd::Structure
     end
   end
 
-  def docs
-    @docs ||= {
-      inv: read_xsd("InvoicesDoc-v1.0.2.xsd"),
-      icls: read_xsd("incomeClassification-v1.0.2.xsd"),
-      ecls: read_xsd("expensesClassification-v1.0.2.xsd")
-    }
-  end
-
   def read_xsd(name)
     Nokogiri::XML(File.read(File.join(PATH, name)))
   end

data/my_data.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Api client for AADE myData"
   spec.homepage      = "https://github.com/mikezaby/my_data"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
@@ -26,10 +26,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "~> 1.0"
-  spec.add_dependency "activesupport", ">= 3.2"
   spec.add_dependency "activemodel", ">= 3.2"
+  spec.add_dependency "activesupport", ">= 3.2"
+  spec.add_dependency "faraday", "~> 1.0"
   spec.add_dependency "nokogiri", ">= 1.10"
+  spec.add_dependency "zeitwerk", ">= 2.4"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: my_data
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Michalis Zamparas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.4'
 description: Api client for AADE myData
 email:
 - mikezaby@gmail.com
@@ -73,10 +87,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/lint.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -85,35 +101,41 @@ files:
 - lib/my_data.rb
 - lib/my_data/client.rb
 - lib/my_data/resource.rb
-- lib/my_data/resources.rb
-- lib/my_data/resources/ecls.rb
+- lib/my_data/resources/continuation_token_type.rb
+- lib/my_data/resources/ecls/expenses_classification.rb
 - lib/my_data/resources/ecls/expenses_classification_type.rb
 - lib/my_data/resources/ecls/invoice_expenses_classification_type.rb
 - lib/my_data/resources/ecls/invoices_expenses_classification_detail_type.rb
 - lib/my_data/resources/error_type.rb
-- lib/my_data/resources/icls.rb
+- lib/my_data/resources/icls/income_classification.rb
 - lib/my_data/resources/icls/income_classification_type.rb
 - lib/my_data/resources/icls/invoice_income_classification_type.rb
 - lib/my_data/resources/icls/invoices_income_classification_detail_type.rb
-- lib/my_data/resources/inv.rb
 - lib/my_data/resources/inv/aade_book_invoice_type.rb
 - lib/my_data/resources/inv/address_type.rb
+- lib/my_data/resources/inv/cancelled_invoice_type.rb
+- lib/my_data/resources/inv/continuation_token_type.rb
 - lib/my_data/resources/inv/invoice_header_type.rb
 - lib/my_data/resources/inv/invoice_row_type.rb
 - lib/my_data/resources/inv/invoice_summary_type.rb
 - lib/my_data/resources/inv/invoices_doc.rb
 - lib/my_data/resources/inv/party_type.rb
 - lib/my_data/resources/inv/payment_method_detail_type.rb
+- lib/my_data/resources/inv/request_doc.rb
+- lib/my_data/resources/inv/requested_invoices_doc.rb
 - lib/my_data/resources/inv/ship_type.rb
 - lib/my_data/resources/inv/tax_totals_type.rb
+- lib/my_data/resources/invoice_provider_type.rb
+- lib/my_data/resources/requested_provider_doc.rb
+- lib/my_data/resources/response.rb
 - lib/my_data/resources/response_type.rb
-- lib/my_data/resources/responses_doc.rb
+- lib/my_data/response_parser.rb
 - lib/my_data/type_caster.rb
 - lib/my_data/version.rb
 - lib/my_data/xml_generator.rb
 - lib/my_data/xml_parser.rb
-- lib/my_data/xsd.rb
 - lib/my_data/xsd/complex_type.rb
+- lib/my_data/xsd/doc.rb
 - lib/my_data/xsd/docs/InvoicesDoc-v1.0.2.xsd
 - lib/my_data/xsd/docs/RequestedProviderDoc-v1.0.2.xsd
 - lib/my_data/xsd/docs/expensesClassification-v1.0.2.xsd
@@ -139,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="