money_s3 0.5.0 → 0.6.0

data/lib/money_s3/builders/zavazek_type.rb

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

data/lib/money_s3/parsers/adresa_type.rb

@@ -6,33 +6,34 @@ module MoneyS3
       include BaseParser
 
       def ulice
-        at :Ulice
+        at 'Ulice'
       end
 
       def misto
-        at :Misto
+        at 'Misto'
       end
 
       def psc
-        at :PSC
+        at 'PSC'
       end
 
       def stat
-        at :Stat
+        at 'Stat'
       end
 
       def kod_statu
-        at :KodStatu
+        at 'KodStatu'
       end
 
       def to_h
-        hash = {}
-
-        hash[:ulice] = ulice if raw.key? :Ulice
-        hash[:misto] = misto if raw.key? :Misto
-        hash[:psc] = psc if raw.key? :PSC
-        hash[:stat] = stat if raw.key? :Stat
-        hash[:kod_statu] = kod_statu if raw.key? :KodStatu
+        hash = WithAttributes.new({})
+        hash.attributes = attributes
+
+        hash[:ulice] = ulice if has? 'Ulice'
+        hash[:misto] = misto if has? 'Misto'
+        hash[:psc] = psc if has? 'PSC'
+        hash[:stat] = stat if has? 'Stat'
+        hash[:kod_statu] = kod_statu if has? 'KodStatu'
 
         hash
       end

data/lib/money_s3/parsers/alternativa_prislusenstvi_type.rb

@@ -8,43 +8,44 @@ module MoneyS3
       include BaseParser
 
       def popis
-        at :Popis
+        at 'Popis'
       end
 
       def poc_mj
-        at :PocMJ
+        at 'PocMJ'
       end
 
       def poradi
-        at :Poradi
+        at 'Poradi'
       end
 
       def druh_komp
-        at :DruhKomp
+        at 'DruhKomp'
       end
 
       def symetric
-        at :Symetric
+        at 'Symetric'
       end
 
       def km_karta
-        submodel_at(KmKartaType, :KmKarta)
+        submodel_at(KmKartaType, 'KmKarta')
       end
 
       def sklad
-        submodel_at(SkladType, :Sklad)
+        submodel_at(SkladType, 'Sklad')
       end
 
       def to_h
-        hash = {}
-
-        hash[:popis] = popis if raw.key? :Popis
-        hash[:poc_mj] = poc_mj if raw.key? :PocMJ
-        hash[:poradi] = poradi if raw.key? :Poradi
-        hash[:druh_komp] = druh_komp if raw.key? :DruhKomp
-        hash[:symetric] = symetric if raw.key? :Symetric
-        hash[:km_karta] = km_karta.to_h if raw.key? :KmKarta
-        hash[:sklad] = sklad.to_h if raw.key? :Sklad
+        hash = WithAttributes.new({})
+        hash.attributes = attributes
+
+        hash[:popis] = popis if has? 'Popis'
+        hash[:poc_mj] = poc_mj if has? 'PocMJ'
+        hash[:poradi] = poradi if has? 'Poradi'
+        hash[:druh_komp] = druh_komp if has? 'DruhKomp'
+        hash[:symetric] = symetric if has? 'Symetric'
+        hash[:km_karta] = km_karta.to_h if has? 'KmKarta'
+        hash[:sklad] = sklad.to_h if has? 'Sklad'
 
         hash
       end