money_s3 0.5.0 → 0.6.0

data/lib/money_s3/parsers/zavazek_type.rb

@@ -13,258 +13,259 @@ module MoneyS3
       include BaseParser
 
       def doklad
-        at :Doklad
+        at 'Doklad'
       end
 
       def zpusob_uctovani
-        at :ZpusobUctovani
+        at 'ZpusobUctovani'
       end
 
       def d_rada
-        at :DRada
+        at 'DRada'
       end
 
       def d_cislo
-        at :DCislo
+        at 'DCislo'
       end
 
       def popis
-        at :Popis
+        at 'Popis'
       end
 
       def pr_dokl
-        at :PrDokl
+        at 'PrDokl'
       end
 
       def puv_c_dokl
-        at :PuvCDokl
+        at 'PuvCDokl'
       end
 
       def var_sym
-        at :VarSym
+        at 'VarSym'
       end
 
       def par_sym
-        at :ParSym
+        at 'ParSym'
       end
 
       def kon_sym
-        at :KonSym
+        at 'KonSym'
       end
 
       def spec_sym
-        at :SpecSym
+        at 'SpecSym'
       end
 
       def dat_uc_pr
-        at :DatUcPr
+        at 'DatUcPr'
       end
 
       def dat_vyst
-        at :DatVyst
+        at 'DatVyst'
       end
 
       def dat_spl
-        at :DatSpl
+        at 'DatSpl'
       end
 
       def dat_pln
-        at :DatPln
+        at 'DatPln'
       end
 
       def doruceno
-        at :Doruceno
+        at 'Doruceno'
       end
 
       def dbrpis
-        at :Dbrpis
+        at 'Dbrpis'
       end
 
       def dobr_duzp
-        at :DobrDUZP
+        at 'DobrDUZP'
       end
 
       def uc_pokl
-        at :UcPokl
+        at 'UcPokl'
       end
 
       def pr_kont
-        at :PrKont
+        at 'PrKont'
       end
 
       def cleneni
-        at :Cleneni
+        at 'Cleneni'
       end
 
       def stred
-        at :Stred
+        at 'Stred'
       end
 
       def zakazka
-        at :Zakazka
+        at 'Zakazka'
       end
 
       def cinnost
-        at :Cinnost
+        at 'Cinnost'
       end
 
       def plnen_dph
-        at :PlnenDPH
+        at 'PlnenDPH'
       end
 
       def ucel_zd_pl
-        at :UcelZdPl
+        at 'UcelZdPl'
       end
 
       def pozn
-        at :Pozn
+        at 'Pozn'
       end
 
       def s_sazba
-        at :SSazba
+        at 'SSazba'
       end
 
       def z_sazba
-        at :ZSazba
+        at 'ZSazba'
       end
 
       def uh_zbyva
-        at :UhZbyva
+        at 'UhZbyva'
       end
 
       def uh_datum
-        at :UhDatum
+        at 'UhDatum'
       end
 
       def uh_dokl
-        at :UhDokl
+        at 'UhDokl'
       end
 
       def pu_datum
-        at :PUDatum
+        at 'PUDatum'
       end
 
       def pu_zbyva
-        at :PUZbyva
+        at 'PUZbyva'
       end
 
       def valuty_k_uhr
-        at :ValutyKUhr
+        at 'ValutyKUhr'
       end
 
       def dat_upom1
-        at :DatUpom1
+        at 'DatUpom1'
       end
 
       def dat_upom2
-        at :DatUpom2
+        at 'DatUpom2'
       end
 
       def dat_upom_l
-        at :DatUpomL
+        at 'DatUpomL'
       end
 
       def typ_dokl
-        at :TypDokl
+        at 'TypDokl'
       end
 
       def zjedn_d
-        at :ZjednD
+        at 'ZjednD'
       end
 
       def vyst
-        at :Vyst
+        at 'Vyst'
       end
 
       def celkem
-        at :Celkem
+        at 'Celkem'
       end
 
       def adresa
-        submodel_at(DokladFirmaType, :Adresa)
+        submodel_at(DokladFirmaType, 'Adresa')
       end
 
       def valuty
-        submodel_at(Valuty, :Valuty)
+        submodel_at(Valuty, 'Valuty')
       end
 
       def moje_firma
-        submodel_at(MojeFirmaType, :MojeFirma)
+        submodel_at(MojeFirmaType, 'MojeFirma')
       end
 
       def vlajky
-        submodel_at(Vlajky, :Vlajky)
+        submodel_at(Vlajky, 'Vlajky')
       end
 
       def souhrn_dph
-        submodel_at(SouhrnDPHType, :SouhrnDPH)
+        submodel_at(SouhrnDPHType, 'SouhrnDPH')
       end
 
       def seznam_rozuct_polozek
-        array_of_at(RozuctPolozUDType, [:SeznamRozuctPolozek, :RozuctPolozka])
+        array_of_at(RozuctPolozUDType, ['SeznamRozuctPolozek', 'RozuctPolozka'])
       end
 
       def seznam_norm_polozek
-        array_of_at(NormPolozUDType, [:SeznamNormPolozek, :NormPolozka])
+        array_of_at(NormPolozUDType, ['SeznamNormPolozek', 'NormPolozka'])
       end
 
       def dokumenty
-        array_of_at(String, [:Dokumenty, :Dokument])
+        array_of_at(String, ['Dokumenty', 'Dokument'])
       end
 
       def to_h
-        hash = {}
-
-        hash[:doklad] = doklad if raw.key? :Doklad
-        hash[:zpusob_uctovani] = zpusob_uctovani if raw.key? :ZpusobUctovani
-        hash[:d_rada] = d_rada if raw.key? :DRada
-        hash[:d_cislo] = d_cislo if raw.key? :DCislo
-        hash[:popis] = popis if raw.key? :Popis
-        hash[:pr_dokl] = pr_dokl if raw.key? :PrDokl
-        hash[:puv_c_dokl] = puv_c_dokl if raw.key? :PuvCDokl
-        hash[:var_sym] = var_sym if raw.key? :VarSym
-        hash[:par_sym] = par_sym if raw.key? :ParSym
-        hash[:kon_sym] = kon_sym if raw.key? :KonSym
-        hash[:spec_sym] = spec_sym if raw.key? :SpecSym
-        hash[:dat_uc_pr] = dat_uc_pr if raw.key? :DatUcPr
-        hash[:dat_vyst] = dat_vyst if raw.key? :DatVyst
-        hash[:dat_spl] = dat_spl if raw.key? :DatSpl
-        hash[:dat_pln] = dat_pln if raw.key? :DatPln
-        hash[:doruceno] = doruceno if raw.key? :Doruceno
-        hash[:dbrpis] = dbrpis if raw.key? :Dbrpis
-        hash[:dobr_duzp] = dobr_duzp if raw.key? :DobrDUZP
-        hash[:uc_pokl] = uc_pokl if raw.key? :UcPokl
-        hash[:pr_kont] = pr_kont if raw.key? :PrKont
-        hash[:cleneni] = cleneni if raw.key? :Cleneni
-        hash[:stred] = stred if raw.key? :Stred
-        hash[:zakazka] = zakazka if raw.key? :Zakazka
-        hash[:cinnost] = cinnost if raw.key? :Cinnost
-        hash[:plnen_dph] = plnen_dph if raw.key? :PlnenDPH
-        hash[:ucel_zd_pl] = ucel_zd_pl if raw.key? :UcelZdPl
-        hash[:pozn] = pozn if raw.key? :Pozn
-        hash[:s_sazba] = s_sazba if raw.key? :SSazba
-        hash[:z_sazba] = z_sazba if raw.key? :ZSazba
-        hash[:uh_zbyva] = uh_zbyva if raw.key? :UhZbyva
-        hash[:uh_datum] = uh_datum if raw.key? :UhDatum
-        hash[:uh_dokl] = uh_dokl if raw.key? :UhDokl
-        hash[:pu_datum] = pu_datum if raw.key? :PUDatum
-        hash[:pu_zbyva] = pu_zbyva if raw.key? :PUZbyva
-        hash[:valuty_k_uhr] = valuty_k_uhr if raw.key? :ValutyKUhr
-        hash[:dat_upom1] = dat_upom1 if raw.key? :DatUpom1
-        hash[:dat_upom2] = dat_upom2 if raw.key? :DatUpom2
-        hash[:dat_upom_l] = dat_upom_l if raw.key? :DatUpomL
-        hash[:typ_dokl] = typ_dokl if raw.key? :TypDokl
-        hash[:zjedn_d] = zjedn_d if raw.key? :ZjednD
-        hash[:vyst] = vyst if raw.key? :Vyst
-        hash[:celkem] = celkem if raw.key? :Celkem
-        hash[:adresa] = adresa.to_h if raw.key? :Adresa
-        hash[:valuty] = valuty.to_h if raw.key? :Valuty
-        hash[:moje_firma] = moje_firma.to_h if raw.key? :MojeFirma
-        hash[:vlajky] = vlajky.to_h if raw.key? :Vlajky
-        hash[:souhrn_dph] = souhrn_dph.to_h if raw.key? :SouhrnDPH
-        hash[:seznam_rozuct_polozek] = seznam_rozuct_polozek.map(&:to_h) if raw.key? :SeznamRozuctPolozek
-        hash[:seznam_norm_polozek] = seznam_norm_polozek.map(&:to_h) if raw.key? :SeznamNormPolozek
-        hash[:dokumenty] = dokumenty if raw.key? :Dokumenty
+        hash = WithAttributes.new({})
+        hash.attributes = attributes
+
+        hash[:doklad] = doklad if has? 'Doklad'
+        hash[:zpusob_uctovani] = zpusob_uctovani if has? 'ZpusobUctovani'
+        hash[:d_rada] = d_rada if has? 'DRada'
+        hash[:d_cislo] = d_cislo if has? 'DCislo'
+        hash[:popis] = popis if has? 'Popis'
+        hash[:pr_dokl] = pr_dokl if has? 'PrDokl'
+        hash[:puv_c_dokl] = puv_c_dokl if has? 'PuvCDokl'
+        hash[:var_sym] = var_sym if has? 'VarSym'
+        hash[:par_sym] = par_sym if has? 'ParSym'
+        hash[:kon_sym] = kon_sym if has? 'KonSym'
+        hash[:spec_sym] = spec_sym if has? 'SpecSym'
+        hash[:dat_uc_pr] = dat_uc_pr if has? 'DatUcPr'
+        hash[:dat_vyst] = dat_vyst if has? 'DatVyst'
+        hash[:dat_spl] = dat_spl if has? 'DatSpl'
+        hash[:dat_pln] = dat_pln if has? 'DatPln'
+        hash[:doruceno] = doruceno if has? 'Doruceno'
+        hash[:dbrpis] = dbrpis if has? 'Dbrpis'
+        hash[:dobr_duzp] = dobr_duzp if has? 'DobrDUZP'
+        hash[:uc_pokl] = uc_pokl if has? 'UcPokl'
+        hash[:pr_kont] = pr_kont if has? 'PrKont'
+        hash[:cleneni] = cleneni if has? 'Cleneni'
+        hash[:stred] = stred if has? 'Stred'
+        hash[:zakazka] = zakazka if has? 'Zakazka'
+        hash[:cinnost] = cinnost if has? 'Cinnost'
+        hash[:plnen_dph] = plnen_dph if has? 'PlnenDPH'
+        hash[:ucel_zd_pl] = ucel_zd_pl if has? 'UcelZdPl'
+        hash[:pozn] = pozn if has? 'Pozn'
+        hash[:s_sazba] = s_sazba if has? 'SSazba'
+        hash[:z_sazba] = z_sazba if has? 'ZSazba'
+        hash[:uh_zbyva] = uh_zbyva if has? 'UhZbyva'
+        hash[:uh_datum] = uh_datum if has? 'UhDatum'
+        hash[:uh_dokl] = uh_dokl if has? 'UhDokl'
+        hash[:pu_datum] = pu_datum if has? 'PUDatum'
+        hash[:pu_zbyva] = pu_zbyva if has? 'PUZbyva'
+        hash[:valuty_k_uhr] = valuty_k_uhr if has? 'ValutyKUhr'
+        hash[:dat_upom1] = dat_upom1 if has? 'DatUpom1'
+        hash[:dat_upom2] = dat_upom2 if has? 'DatUpom2'
+        hash[:dat_upom_l] = dat_upom_l if has? 'DatUpomL'
+        hash[:typ_dokl] = typ_dokl if has? 'TypDokl'
+        hash[:zjedn_d] = zjedn_d if has? 'ZjednD'
+        hash[:vyst] = vyst if has? 'Vyst'
+        hash[:celkem] = celkem if has? 'Celkem'
+        hash[:adresa] = adresa.to_h if has? 'Adresa'
+        hash[:valuty] = valuty.to_h if has? 'Valuty'
+        hash[:moje_firma] = moje_firma.to_h if has? 'MojeFirma'
+        hash[:vlajky] = vlajky.to_h if has? 'Vlajky'
+        hash[:souhrn_dph] = souhrn_dph.to_h if has? 'SouhrnDPH'
+        hash[:seznam_rozuct_polozek] = seznam_rozuct_polozek.map(&:to_h) if has? 'SeznamRozuctPolozek'
+        hash[:seznam_norm_polozek] = seznam_norm_polozek.map(&:to_h) if has? 'SeznamNormPolozek'
+        hash[:dokumenty] = dokumenty if has? 'Dokumenty'
 
         hash
       end

data/lib/money_s3/with_attributes.rb

@@ -0,0 +1,13 @@
+module MoneyS3
+  class WithAttributes < SimpleDelegator
+    alias_method :value, :__getobj__
+
+    def attributes
+      @attributes ||= {}
+    end
+
+    def attributes=(attributes)
+      @attributes = attributes
+    end
+  end
+end

data/lib/money_s3.rb

@@ -1,27 +1,17 @@
 require 'ox'
 require 'money_s3/parsers/money_data'
 require 'money_s3/builders/money_data'
+require 'money_s3/with_attributes'
 
 module MoneyS3
   def self.parse(raw)
-    hash = Ox.load(raw, mode: :hash)
+    parsed = Ox.load(raw)
+    content = parsed.locate('MoneyData').first
 
-    if hash.key? :MoneyData
-      content = hash[:MoneyData]
-
-      raw =
-        if content.is_a? Array
-          content.shift
-          content.inject({}) { |memo, member| memo.merge(member) }
-        else
-          content
-        end
-
-      Parsers::MoneyData.new(raw)
-    end
+    Parsers::MoneyData.new(content)
   end
 
   def self.build(data)
-    Builders::MoneyData.new(data, 'MoneyData').to_xml
+    Builders::MoneyData.new('MoneyData', data).to_xml
   end
 end

data/money_s3.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "money_s3"
-  spec.version       = '0.5.0'
+  spec.version       = '0.6.0'
   spec.authors       = ["Premysl Donat"]
   spec.email         = ["pdonat@seznam.cz"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money_s3
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Premysl Donat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-24 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
@@ -485,6 +485,7 @@ files:
 - lib/money_s3/parsers/zauctovani_dph_detype.rb
 - lib/money_s3/parsers/zauctovani_dph_type.rb
 - lib/money_s3/parsers/zavazek_type.rb
+- lib/money_s3/with_attributes.rb
 - money_s3.gemspec
 - xsd/Dochazka/Dochazka.xsd
 - xsd/Dochazka/Zamestnanci.xsd