sendregning 0.1.1 → 0.2.2

data/lib/sendregning/invoice_parser.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Sendregning
+  class InvoiceParser
+    class << self
+      def parse(response, invoice = Sendregning::Invoice.new)
+        new(response, invoice).parse
+      end
+    end
+
+    def initialize(response, invoice)
+      @response = response
+      @invoice = invoice
+    end
+
+    def parse
+      attributes = @response["invoices"]["invoice"]
+
+      # Flatten optional and shipment attributes
+      %w[optional shipment].each do |section|
+        if attributes.key?(section)
+          attributes = attributes.merge(attributes[section])
+          attributes.delete(section)
+        end
+      end
+
+      lines = attributes["lines"]["line"]
+      attributes.delete("lines")
+
+      @invoice.update(stringify_hash(attributes))
+      @invoice.lines = lines.map do |l|
+        Sendregning::Line.new(stringify_hash(l))
+      end
+      @invoice
+    end
+
+    protected
+
+    def stringify_hash(hash)
+      new_hash = {}
+      hash.each do |key, value|
+        new_hash[key] = value.to_s
+      end
+      new_hash
+    end
+  end
+end

data/lib/sendregning/invoice_serializer.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Sendregning
+  class InvoiceSerializer < Sendregning::XmlSerializer
+    def build
+      builder.invoices do |invoices|
+        invoices.invoice do |invoice|
+          invoice.name item.name
+          invoice.zip  item.zip
+          invoice.city item.city
+
+          lines(invoice)
+          optional_attributes(invoice)
+          shipment_attributes(invoice)
+        end
+      end
+    end
+
+    protected
+
+    def lines(invoice)
+      if item.lines.any?
+        invoice.lines do |line_builder|
+          item.lines.each { |l| l.to_xml(builder: line_builder) }
+        end
+      end
+    end
+
+    def optional_attributes(invoice)
+      if item.optional.any?
+        invoice.optional do |optional|
+          item.optional.each do |key, value|
+            key = key.to_sym
+            if value.is_a?(Date) || value.is_a?(Time)
+              value = value.strftime("%d.%m.%y")
+            end
+            optional.tag! key, value
+          end
+        end
+      end
+    end
+
+    def shipment_attributes(invoice)
+      if item.shipment.any?
+        invoice.shipment do |shipment|
+          shipment.text! item.shipment_mode
+          item.shipment.each do |key, values|
+            key = key.to_sym
+            next if key == :shipment
+
+            shipment.tag! key do |emails|
+              Array(values).each { |v| emails.email v }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sendregning/line.rb

@@ -1,59 +1,44 @@
+# frozen_string_literal: true
+
 module Sendregning
+  class Line
+    # Quantity, as decimal. Example: '7,5'
+    attr_accessor :qty
+
+    # Product code. String, max length: 9
+    attr_accessor :prodCode
+
+    # Description. String, max length: 75
+    attr_accessor :desc
+
+    # Price per unit in decimal. Example: '250,00'
+    attr_accessor :unitPrice
+
+    # Discount in percentage as decimal. Optional, defaults to 0
+    attr_accessor :discount
+
+    # Tax rate. Valid rates are: '0', '8', '13' and '25'. Default: '25'
+    attr_accessor :tax
+
+    attr_accessor :itemNo, :lineTaxAmount, :lineTotal
+
+    def initialize(new_attributes = {})
+      self.attributes = new_attributes
+    end
+
+    # Renders line to XML
+    def to_xml(options = {})
+      LineSerializer.build(self, options)
+    end
+
+    protected
 
-	class Line
-
-		# Quantity, as decimal. Example: '7,5'
-		attr_accessor :qty
-		
-		# Product code. String, max length: 9
-		attr_accessor :prodCode
-		
-		# Description. String, max length: 75
-		attr_accessor :desc
-		
-		# Price per unit in decimal. Example: '250,00'
-		attr_accessor :unitPrice
-		
-		# Discount in percentage as decimal. Optional, defaults to 0
-		attr_accessor :discount
-
-		# Tax rate. Valid rates are: '0', '8', '13' and '25'. Default: '25'
-		attr_accessor :tax
-		
-		attr_accessor :itemNo, :lineTaxAmount, :lineTotal
-
-		def initialize(new_attributes={})
-			self.attributes = new_attributes
-		end
-		
-		# Renders line to XML
-		def to_xml(options={})
-			if options[:builder]
-				xml = options[:builder]
-			else
-				xml = Builder::XmlMarkup.new(:indent=>2)
-				xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-			end
-			xml.line do |line|
-				line.qty       self.qty       if @qty
-				line.prodCode  self.prodCode  if @prodCode
-				line.desc      self.desc      if @desc
-				line.unitPrice self.unitPrice if @unitPrice
-				line.discount  self.discount  if @discount
-				line.tax       self.tax       if @tax
-			end
-		end
-
-		protected
-
-			def attributes=(attributes={})
-				attributes.each do |key, value|
-					set_method = "#{key.to_s}=".to_sym
-					self.send(set_method, value) if self.respond_to?(set_method)
-				end
-				attributes
-			end
-
-	end
-	
-end
+    def attributes=(attributes = {})
+      attributes.each do |key, value|
+        set_method = "#{key}=".to_sym
+        send(set_method, value) if respond_to?(set_method)
+      end
+      attributes
+    end
+  end
+end

data/lib/sendregning/line_serializer.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Sendregning
+  class LineSerializer < Sendregning::XmlSerializer
+    def build
+      builder.line do |line|
+        line.qty       item.qty       if item.qty
+        line.prodCode  item.prodCode  if item.prodCode
+        line.desc      item.desc      if item.desc
+        line.unitPrice item.unitPrice if item.unitPrice
+        line.discount  item.discount  if item.discount
+        line.tax       item.tax       if item.tax
+      end
+    end
+  end
+end

data/lib/sendregning/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Sendregning
+  VERSION = "0.2.2" unless Sendregning.const_defined?("VERSION")
+end

data/lib/sendregning/xml_serializer.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Sendregning
+  class XmlSerializer
+    class << self
+      def build(item, options = {})
+        builder = options[:builder] || xml_builder
+        new(item, builder).build
+      end
+
+      protected
+
+      def xml_builder
+        xml = Builder::XmlMarkup.new(indent: 2)
+        xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
+        xml
+      end
+    end
+
+    def initialize(item, builder)
+      @item = item
+      @builder = builder
+    end
+
+    def build
+      raise("XmlSerializer is an abstract class, subclass and overwrite " \
+            "the build method")
+    end
+
+    protected
+
+    attr_reader :builder
+
+    attr_reader :item
+  end
+end

data/sendregning.gemspec

@@ -1,63 +1,29 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+require "sendregning/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{sendregning}
-  s.version = "0.1.1"
+  s.name        = "sendregning"
+  s.version     = Sendregning::VERSION
+  s.summary     = "Ruby client for the SendRegning Web Service"
+  s.description = "Ruby client for the SendRegning Web Service"
+  s.authors     = ["Inge Jørgensen"]
+  s.email       = "inge@elektronaut.no"
+  s.homepage    = "https://github.com/elektronaut/sendregning"
+  s.license     = "MIT"
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Inge J\303\270rgensen"]
-  s.date = %q{2011-01-04}
-  s.description = %q{Ruby client for the SendRegning Web Service}
-  s.email = %q{inge@manualdesign.no}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/sendregning.rb",
-     "lib/sendregning/client.rb",
-     "lib/sendregning/invoice.rb",
-     "lib/sendregning/line.rb",
-     "sendregning.gemspec",
-     "test/helper.rb",
-     "test/test_sendregning.rb"
-  ]
-  s.homepage = %q{http://github.com/elektronaut/sendregning}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map do |f|
+    File.basename(f)
+  end
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Ruby client for the SendRegning Web Service}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_sendregning.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_runtime_dependency "builder",        "~> 3.1"
+  s.add_runtime_dependency "httmultiparty",  "~> 0.3"
+  s.add_runtime_dependency "httparty",       "~> 0.13"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0.6.1"])
-      s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_runtime_dependency(%q<multipart-post>, [">= 1.0.1"])
-    else
-      s.add_dependency(%q<httparty>, [">= 0.6.1"])
-      s.add_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_dependency(%q<multipart-post>, [">= 1.0.1"])
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0.6.1"])
-    s.add_dependency(%q<builder>, [">= 2.1.2"])
-    s.add_dependency(%q<multipart-post>, [">= 1.0.1"])
-  end
+  s.add_development_dependency "rake"
 end
-

metadata

@@ -1,128 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sendregning
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.2.2
 platform: ruby
-authors: 
-- "Inge J\xC3\xB8rgensen"
+authors:
+- Inge Jørgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-04 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: httparty
+date: 2020-06-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: httmultiparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multipart-post
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
-        version: 1.0.1
-  type: :runtime
-  version_requirements: *id003
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby client for the SendRegning Web Service
-email: inge@manualdesign.no
+email: inge@elektronaut.no
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- .document
-- .gitignore
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- Gemfile
+- Gemfile.lock
 - LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
+- README.md
 - lib/sendregning.rb
 - lib/sendregning/client.rb
 - lib/sendregning/invoice.rb
+- lib/sendregning/invoice_parser.rb
+- lib/sendregning/invoice_serializer.rb
 - lib/sendregning/line.rb
+- lib/sendregning/line_serializer.rb
+- lib/sendregning/version.rb
+- lib/sendregning/xml_serializer.rb
 - sendregning.gemspec
-- test/helper.rb
-- test/test_sendregning.rb
-has_rdoc: true
-homepage: http://github.com/elektronaut/sendregning
-licenses: []
-
+homepage: https://github.com/elektronaut/sendregning
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: 1.9.3
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby client for the SendRegning Web Service
-test_files: 
-- test/helper.rb
-- test/test_sendregning.rb
+test_files: []