money_s3 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 192257dd24cbd569edaa2343186ee7d82dd37c13
-  data.tar.gz: 10ea5f27e6fdebe746e085366a952faf0a49b1e0
+  metadata.gz: ca2b59d440f8a43c7432c0001b67b5d5d844997b
+  data.tar.gz: 2009e7a6620744674e145c219179f76a8ac3e32d
 SHA512:
-  metadata.gz: e59780f213265bc94f96716bcf471bf172f3f7a0067cb5a6ab5ca46dd2f9a302d580fd06e161fce645ef119dda916dc31101e7c15f71172704b3ea07b177858b
-  data.tar.gz: eed69da9c5d1f407673c62ac57a080cdfcec7a915814afb10ff83a8313d8b632487cbe8299927b357cf57c59424f4575c94825414fac79ad1f1b07aeadb894b3
+  metadata.gz: 45beebb8cc5b5a3cdcf002140b90f0e6206d3f8341f6973949737d5c6f357f195615ca0aab0390b5ef9d4ceb75389406cc358d298d007d0afce98ddab5057855
+  data.tar.gz: 1709cd55aa484803f57ff1bfb50ba87339aa35899fbb24f3b2f10af540ded49d19de2df368e1dbf61cdb3b2dff6d0dae7ca1284b99bb07e977fe70dfed18e5b4

data/README.md

@@ -1,55 +1,6 @@
 # MoneyS3
 
-Simple parser and builder for MoneyS3 XML data
-
-Content:
-1. [About](#about)
-    1. [Naming](#naming)
-    2. [What's missing](#whats-missing)
-2. [Api](#api)
-    1. [Parsers](#parsers)
-    2. [Builder](#builder)
-3. [Performance](#performance)
-4. [External links](#external-links)
-5. [License](#license)
-
-## About
-
-WIP
-
-### Naming
-
-WIP
-
-#### Method names
-
-WIP
-
-#### Class names
-
-WIP
-
-### Missing parts
-
-WIP
-
-## Api
-
-### Parsing a document
-
-WIP
-
-### Creating a document
-
-WIP
-
-## Performance
-
-WIP
-
-## External links
-
-WIP
+Unstable until 1.0.0
 
 ## License
 

data/lib/money_s3/hash_with_attributes.rb

@@ -0,0 +1,40 @@
+module MoneyS3
+  class HashWithAttributes
+    def initialize(hash, attributes = nil)
+      @hash = hash
+      @attributes = attributes if attributes
+    end
+
+    def value
+      @hash
+    end
+
+    def attributes
+      @attributes ||= {}
+    end
+
+    def attributes=(attributes)
+      @attributes = attributes
+    end
+
+    def ==(other)
+      if other.respond_to? :attributes
+        value == other && other.attributes == attributes
+      else
+        value == other
+      end
+    end
+
+    def key?(key)
+      value.key? key
+    end
+
+    def [](key)
+      value[key]
+    end
+
+    def []=(key, key_value)
+      value[key] = key_value
+    end
+  end
+end

data/lib/money_s3/parsers/adresa_type.rb

@@ -25,9 +25,8 @@ module MoneyS3
         at 'KodStatu'
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:ulice] = ulice if has? 'Ulice'
         hash[:misto] = misto if has? 'Misto'

data/lib/money_s3/parsers/alternativa_prislusenstvi_type.rb

@@ -35,17 +35,16 @@ module MoneyS3
         submodel_at(SkladType, 'Sklad')
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, 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[:km_karta] = km_karta.to_h_with_attrs if has? 'KmKarta'
+        hash[:sklad] = sklad.to_h_with_attrs if has? 'Sklad'
 
         hash
       end

data/lib/money_s3/parsers/bank_dokl.rb

@@ -176,9 +176,8 @@ module MoneyS3
         array_of_at(String, ['Dokumenty', 'Dokument'])
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:vydej] = vydej if has? 'Vydej'
         hash[:doklad] = doklad if has? 'Doklad'
@@ -213,13 +212,13 @@ module MoneyS3
         hash[:vyst] = vyst if has? 'Vyst'
         hash[:typ_dokl] = typ_dokl if has? 'TypDokl'
         hash[:celkem] = celkem if has? 'Celkem'
-        hash[:adresa] = adresa.to_h if has? 'Adresa'
-        hash[:valuty] = valuty.to_h if has? 'Valuty'
-        hash[:ucet] = ucet.to_h if has? 'Ucet'
-        hash[:vlajky] = vlajky.to_h if has? 'Vlajky'
-        hash[:souhrn_dph] = souhrn_dph.to_h if has? 'SouhrnDPH'
-        hash[:seznam_norm_polozek] = seznam_norm_polozek.map(&:to_h) if has? 'SeznamNormPolozek'
-        hash[:seznam_rozuct_polozek] = seznam_rozuct_polozek.map(&:to_h) if has? 'SeznamRozuctPolozek'
+        hash[:adresa] = adresa.to_h_with_attrs if has? 'Adresa'
+        hash[:valuty] = valuty.to_h_with_attrs if has? 'Valuty'
+        hash[:ucet] = ucet.to_h_with_attrs if has? 'Ucet'
+        hash[:vlajky] = vlajky.to_h_with_attrs if has? 'Vlajky'
+        hash[:souhrn_dph] = souhrn_dph.to_h_with_attrs if has? 'SouhrnDPH'
+        hash[:seznam_norm_polozek] = seznam_norm_polozek.map(&:to_h_with_attrs) if has? 'SeznamNormPolozek'
+        hash[:seznam_rozuct_polozek] = seznam_rozuct_polozek.map(&:to_h_with_attrs) if has? 'SeznamRozuctPolozek'
         hash[:dokumenty] = dokumenty if has? 'Dokumenty'
 
         hash

data/lib/money_s3/parsers/bank_spojeni_type.rb

@@ -21,9 +21,8 @@ module MoneyS3
         at 'Ucel'
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:ucet] = ucet if has? 'Ucet'
         hash[:kod_banky] = kod_banky if has? 'KodBanky'

data/lib/money_s3/parsers/bank_ucet_pokladna_type.rb

@@ -97,9 +97,8 @@ module MoneyS3
         at 'Pozn'
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:zkrat] = zkrat if has? 'Zkrat'
         hash[:popis] = popis if has? 'Popis'

data/lib/money_s3/parsers/base_parser.rb

@@ -21,9 +21,7 @@ module MoneyS3
         element = raw.locate(locator.to_s).first
 
         if element
-          text = WithAttributes.new(element.text)
-          text.attributes = element.attributes
-          text
+          StringWithAttributes.new(element.text, element.attributes)
         end
       end
 

data/lib/money_s3/parsers/castky.rb

@@ -61,9 +61,8 @@ module MoneyS3
         at 'CerpZuct'
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:celkem] = celkem if has? 'Celkem'
         hash[:zaklad_0] = zaklad_0 if has? 'Zaklad_0'

data/lib/money_s3/parsers/cena_type.rb

@@ -17,9 +17,8 @@ module MoneyS3
         at 'Sleva'
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:limit] = limit if has? 'Limit'
         hash[:cena] = cena if has? 'Cena'

data/lib/money_s3/parsers/cenova_hladina.rb

@@ -30,16 +30,15 @@ module MoneyS3
         submodel_at(MenaType, 'Mena')
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:zkrat] = zkrat if has? 'Zkrat'
         hash[:nazev] = nazev if has? 'Nazev'
         hash[:pozn] = pozn if has? 'Pozn'
         hash[:skup] = skup if has? 'Skup'
         hash[:ceny] = ceny if has? 'Ceny'
-        hash[:mena] = mena.to_h if has? 'Mena'
+        hash[:mena] = mena.to_h_with_attrs if has? 'Mena'
 
         hash
       end

data/lib/money_s3/parsers/cenova_hladina_type.rb

@@ -30,16 +30,15 @@ module MoneyS3
         submodel_at(MenaType, 'Mena')
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:zkrat] = zkrat if has? 'Zkrat'
         hash[:nazev] = nazev if has? 'Nazev'
         hash[:pozn] = pozn if has? 'Pozn'
         hash[:skup] = skup if has? 'Skup'
         hash[:ceny] = ceny if has? 'Ceny'
-        hash[:mena] = mena.to_h if has? 'Mena'
+        hash[:mena] = mena.to_h_with_attrs if has? 'Mena'
 
         hash
       end

data/lib/money_s3/parsers/child_kusovnik_type.rb

@@ -102,9 +102,8 @@ module MoneyS3
         submodel_at(SkladType, 'Sklad')
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:cislo] = cislo if has? 'Cislo'
         hash[:typ] = typ if has? 'Typ'
@@ -129,7 +128,7 @@ module MoneyS3
         hash[:zakazka] = zakazka if has? 'Zakazka'
         hash[:stav] = stav if has? 'Stav'
         hash[:poznamka] = poznamka if has? 'Poznamka'
-        hash[:sklad] = sklad.to_h if has? 'Sklad'
+        hash[:sklad] = sklad.to_h_with_attrs if has? 'Sklad'
 
         hash
       end

data/lib/money_s3/parsers/cinnost.rb

@@ -17,9 +17,8 @@ module MoneyS3
         at 'Pozn'
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:zkrat] = zkrat if has? 'Zkrat'
         hash[:nazev] = nazev if has? 'Nazev'

data/lib/money_s3/parsers/clen_dph.rb

@@ -45,9 +45,8 @@ module MoneyS3
         at 'Pozn'
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:zkrat] = zkrat if has? 'Zkrat'
         hash[:datum_od] = datum_od if has? 'DatumOd'

data/lib/money_s3/parsers/dalsi_sazba.rb

@@ -25,9 +25,8 @@ module MoneyS3
         at 'DPH'
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:popis] = popis if has? 'Popis'
         hash[:hladina_dph] = hladina_dph if has? 'HladinaDPH'

data/lib/money_s3/parsers/data.rb

@@ -14,12 +14,11 @@ module MoneyS3
         submodel_at(FakturaType, 'FaktPrij')
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
-        hash[:fakt_vyd] = fakt_vyd.to_h if has? 'FaktVyd'
-        hash[:fakt_prij] = fakt_prij.to_h if has? 'FaktPrij'
+        hash[:fakt_vyd] = fakt_vyd.to_h_with_attrs if has? 'FaktVyd'
+        hash[:fakt_prij] = fakt_prij.to_h_with_attrs if has? 'FaktPrij'
 
         hash
       end

data/lib/money_s3/parsers/def_sub_pol_type.rb

@@ -14,12 +14,11 @@ module MoneyS3
         submodel_at(PolSklDoklType, 'Polozka')
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:mj_na_sadu] = mj_na_sadu if has? 'MJNaSadu'
-        hash[:polozka] = polozka.to_h if has? 'Polozka'
+        hash[:polozka] = polozka.to_h_with_attrs if has? 'Polozka'
 
         hash
       end

data/lib/money_s3/parsers/dl_prij.rb

@@ -220,9 +220,8 @@ module MoneyS3
         array_of_at(String, ['Dokumenty', 'Dokument'])
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:cislo_dokla] = cislo_dokla if has? 'CisloDokla'
         hash[:zpusob_uctovani] = zpusob_uctovani if has? 'ZpusobUctovani'
@@ -263,17 +262,17 @@ module MoneyS3
         hash[:i_doklad_id] = i_doklad_id if has? 'iDokladID'
         hash[:i_dokl_agend] = i_dokl_agend if has? 'iDoklAgend'
         hash[:celkem] = celkem if has? 'Celkem'
-        hash[:eet] = eet.to_h if has? 'EET'
-        hash[:valuty] = valuty.to_h if has? 'Valuty'
-        hash[:dod_odb] = dod_odb.to_h if has? 'DodOdb'
-        hash[:konec_prij] = konec_prij.to_h if has? 'KonecPrij'
-        hash[:import] = import.to_h if has? 'Import'
-        hash[:sklad_pro_pr] = sklad_pro_pr.to_h if has? 'SkladProPr'
-        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[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
-        hash[:seznam_nep_plateb] = seznam_nep_plateb.map(&:to_h) if has? 'SeznamNepPlateb'
+        hash[:eet] = eet.to_h_with_attrs if has? 'EET'
+        hash[:valuty] = valuty.to_h_with_attrs if has? 'Valuty'
+        hash[:dod_odb] = dod_odb.to_h_with_attrs if has? 'DodOdb'
+        hash[:konec_prij] = konec_prij.to_h_with_attrs if has? 'KonecPrij'
+        hash[:import] = import.to_h_with_attrs if has? 'Import'
+        hash[:sklad_pro_pr] = sklad_pro_pr.to_h_with_attrs if has? 'SkladProPr'
+        hash[:moje_firma] = moje_firma.to_h_with_attrs if has? 'MojeFirma'
+        hash[:vlajky] = vlajky.to_h_with_attrs if has? 'Vlajky'
+        hash[:souhrn_dph] = souhrn_dph.to_h_with_attrs if has? 'SouhrnDPH'
+        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
+        hash[:seznam_nep_plateb] = seznam_nep_plateb.map(&:to_h_with_attrs) if has? 'SeznamNepPlateb'
         hash[:dokumenty] = dokumenty if has? 'Dokumenty'
 
         hash

data/lib/money_s3/parsers/dl_vyd.rb

@@ -220,9 +220,8 @@ module MoneyS3
         array_of_at(String, ['Dokumenty', 'Dokument'])
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:cislo_dokla] = cislo_dokla if has? 'CisloDokla'
         hash[:zpusob_uctovani] = zpusob_uctovani if has? 'ZpusobUctovani'
@@ -263,17 +262,17 @@ module MoneyS3
         hash[:i_doklad_id] = i_doklad_id if has? 'iDokladID'
         hash[:i_dokl_agend] = i_dokl_agend if has? 'iDoklAgend'
         hash[:celkem] = celkem if has? 'Celkem'
-        hash[:eet] = eet.to_h if has? 'EET'
-        hash[:valuty] = valuty.to_h if has? 'Valuty'
-        hash[:dod_odb] = dod_odb.to_h if has? 'DodOdb'
-        hash[:konec_prij] = konec_prij.to_h if has? 'KonecPrij'
-        hash[:import] = import.to_h if has? 'Import'
-        hash[:sklad_pro_pr] = sklad_pro_pr.to_h if has? 'SkladProPr'
-        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[:polozka] = polozka.map(&:to_h) if has? 'Polozka'
-        hash[:seznam_nep_plateb] = seznam_nep_plateb.map(&:to_h) if has? 'SeznamNepPlateb'
+        hash[:eet] = eet.to_h_with_attrs if has? 'EET'
+        hash[:valuty] = valuty.to_h_with_attrs if has? 'Valuty'
+        hash[:dod_odb] = dod_odb.to_h_with_attrs if has? 'DodOdb'
+        hash[:konec_prij] = konec_prij.to_h_with_attrs if has? 'KonecPrij'
+        hash[:import] = import.to_h_with_attrs if has? 'Import'
+        hash[:sklad_pro_pr] = sklad_pro_pr.to_h_with_attrs if has? 'SkladProPr'
+        hash[:moje_firma] = moje_firma.to_h_with_attrs if has? 'MojeFirma'
+        hash[:vlajky] = vlajky.to_h_with_attrs if has? 'Vlajky'
+        hash[:souhrn_dph] = souhrn_dph.to_h_with_attrs if has? 'SouhrnDPH'
+        hash[:polozka] = polozka.map(&:to_h_with_attrs) if has? 'Polozka'
+        hash[:seznam_nep_plateb] = seznam_nep_plateb.map(&:to_h_with_attrs) if has? 'SeznamNepPlateb'
         hash[:dokumenty] = dokumenty if has? 'Dokumenty'
 
         hash

data/lib/money_s3/parsers/dodavka_type.rb

@@ -21,9 +21,8 @@ module MoneyS3
         at 'Cena'
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:oznaceni] = oznaceni if has? 'Oznaceni'
         hash[:dat_exp] = dat_exp if has? 'DatExp'

data/lib/money_s3/parsers/dokl_ref_type.rb

@@ -26,15 +26,14 @@ module MoneyS3
         submodel_at(EETType, 'EET')
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:id_dokladu] = id_dokladu if has? 'IDDokladu'
         hash[:cislo_dokladu] = cislo_dokladu if has? 'CisloDokladu'
         hash[:druh_dokladu] = druh_dokladu if has? 'DruhDokladu'
         hash[:rok] = rok if has? 'Rok'
-        hash[:eet] = eet.to_h if has? 'EET'
+        hash[:eet] = eet.to_h_with_attrs if has? 'EET'
 
         hash
       end

data/lib/money_s3/parsers/doklad.rb

@@ -37,9 +37,8 @@ module MoneyS3
         at 'PlnenoDPH'
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:druh] = druh if has? 'Druh'
         hash[:cislo] = cislo if has? 'Cislo'

data/lib/money_s3/parsers/doklad_firma_type.rb

@@ -109,9 +109,8 @@ module MoneyS3
         submodel_at(Eshop, 'eshop')
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:obch_nazev] = obch_nazev if has? 'ObchNazev'
         hash[:fakt_nazev] = fakt_nazev if has? 'FaktNazev'
@@ -130,14 +129,14 @@ module MoneyS3
         hash[:v_symb] = v_symb if has? 'VSymb'
         hash[:spec_sym] = spec_sym if has? 'SpecSym'
         hash[:kod_partn] = kod_partn if has? 'KodPartn'
-        hash[:obch_adresa] = obch_adresa.to_h if has? 'ObchAdresa'
-        hash[:fakt_adresa] = fakt_adresa.to_h if has? 'FaktAdresa'
-        hash[:adresa] = adresa.to_h if has? 'Adresa'
-        hash[:tel] = tel.to_h if has? 'Tel'
-        hash[:fax] = fax.to_h if has? 'Fax'
-        hash[:mobil] = mobil.to_h if has? 'Mobil'
-        hash[:isdoc] = isdoc.to_h if has? 'ISDOC'
-        hash[:eshop] = eshop.to_h if has? 'eshop'
+        hash[:obch_adresa] = obch_adresa.to_h_with_attrs if has? 'ObchAdresa'
+        hash[:fakt_adresa] = fakt_adresa.to_h_with_attrs if has? 'FaktAdresa'
+        hash[:adresa] = adresa.to_h_with_attrs if has? 'Adresa'
+        hash[:tel] = tel.to_h_with_attrs if has? 'Tel'
+        hash[:fax] = fax.to_h_with_attrs if has? 'Fax'
+        hash[:mobil] = mobil.to_h_with_attrs if has? 'Mobil'
+        hash[:isdoc] = isdoc.to_h_with_attrs if has? 'ISDOC'
+        hash[:eshop] = eshop.to_h_with_attrs if has? 'eshop'
 
         hash
       end

data/lib/money_s3/parsers/doklad_hraz.rb

@@ -26,15 +26,14 @@ module MoneyS3
         submodel_at(EETType, 'EET')
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:id_dokladu] = id_dokladu if has? 'IDDokladu'
         hash[:cislo_dokladu] = cislo_dokladu if has? 'CisloDokladu'
         hash[:druh_dokladu] = druh_dokladu if has? 'DruhDokladu'
         hash[:rok] = rok if has? 'Rok'
-        hash[:eet] = eet.to_h if has? 'EET'
+        hash[:eet] = eet.to_h_with_attrs if has? 'EET'
 
         hash
       end

data/lib/money_s3/parsers/e_shop_info.rb

@@ -17,9 +17,8 @@ module MoneyS3
         at 'eSaleID'
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:e_shop_id] = e_shop_id if has? 'eShopID'
         hash[:e_shop_name] = e_shop_name if has? 'eShopName'

data/lib/money_s3/parsers/eet_type.rb

@@ -91,9 +91,8 @@ module MoneyS3
         submodel_at(VysledekOdesl, 'VysledekOdesl')
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:eet_odesl] = eet_odesl if has? 'EETOdesl'
         hash[:prod_misto] = prod_misto if has? 'ProdMisto'
@@ -114,8 +113,8 @@ module MoneyS3
         hash[:fik] = fik if has? 'FIK'
         hash[:cert_pkp] = cert_pkp if has? 'CertPKP'
         hash[:cert_eet] = cert_eet if has? 'CertEET'
-        hash[:castky] = castky.to_h if has? 'Castky'
-        hash[:vysledek_odesl] = vysledek_odesl.to_h if has? 'VysledekOdesl'
+        hash[:castky] = castky.to_h_with_attrs if has? 'Castky'
+        hash[:vysledek_odesl] = vysledek_odesl.to_h_with_attrs if has? 'VysledekOdesl'
 
         hash
       end

data/lib/money_s3/parsers/ekategorie_type.rb

@@ -35,17 +35,16 @@ module MoneyS3
         array_of_at(EkategorieType, ['SeznamPodrKategorii', 'eKategorie'])
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:id] = id if has? 'ID'
         hash[:name] = name if has? 'Name'
         hash[:descript] = descript if has? 'Descript'
         hash[:in_changed] = in_changed if has? 'IN_Changed'
         hash[:no_public] = no_public if has? 'NoPublic'
-        hash[:e_shop_info] = e_shop_info.to_h if has? 'eShopInfo'
-        hash[:seznam_podr_kategorii] = seznam_podr_kategorii.map(&:to_h) if has? 'SeznamPodrKategorii'
+        hash[:e_shop_info] = e_shop_info.to_h_with_attrs if has? 'eShopInfo'
+        hash[:seznam_podr_kategorii] = seznam_podr_kategorii.map(&:to_h_with_attrs) if has? 'SeznamPodrKategorii'
 
         hash
       end

data/lib/money_s3/parsers/ekategorie_zasoba_type.rb

@@ -34,9 +34,8 @@ module MoneyS3
         submodel_at(EkategorieZasobaType, 'Parent')
       end
 
-      def to_h
-        hash = WithAttributes.new({})
-        hash.attributes = attributes
+      def to_h_with_attrs
+        hash = HashWithAttributes.new({}, attributes)
 
         hash[:id] = id if has? 'ID'
         hash[:name] = name if has? 'Name'
@@ -44,7 +43,7 @@ module MoneyS3
         hash[:poznamka] = poznamka if has? 'Poznamka'
         hash[:changed] = changed if has? 'Changed'
         hash[:public] = public if has? 'Public'
-        hash[:parent] = parent.to_h if has? 'Parent'
+        hash[:parent] = parent.to_h_with_attrs if has? 'Parent'
 
         hash
       end