money_s3 0.6.0 → 0.7.0

data/lib/money_s3/parsers/zauctovani_dph_type.rb

@@ -42,9 +42,8 @@ module MoneyS3
         array_of_at(ObdobiDPH, ['SeznamObdobiDPH', 'ObdobiDPH'])
       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[:typ] = typ if has? 'Typ'
@@ -54,7 +53,7 @@ module MoneyS3
         hash[:zd_uc_md] = zd_uc_md if has? 'ZDUcMD'
         hash[:zd_uc_d] = zd_uc_d if has? 'ZDUcD'
         hash[:pozn] = pozn if has? 'Pozn'
-        hash[:seznam_obdobi_dph] = seznam_obdobi_dph.map(&:to_h) if has? 'SeznamObdobiDPH'
+        hash[:seznam_obdobi_dph] = seznam_obdobi_dph.map(&:to_h_with_attrs) if has? 'SeznamObdobiDPH'
 
         hash
       end

data/lib/money_s3/parsers/zavazek_type.rb

@@ -212,9 +212,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[:doklad] = doklad if has? 'Doklad'
         hash[:zpusob_uctovani] = zpusob_uctovani if has? 'ZpusobUctovani'
@@ -258,13 +257,13 @@ module MoneyS3
         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[:adresa] = adresa.to_h_with_attrs if has? 'Adresa'
+        hash[:valuty] = valuty.to_h_with_attrs if has? 'Valuty'
+        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[:seznam_rozuct_polozek] = seznam_rozuct_polozek.map(&:to_h_with_attrs) if has? 'SeznamRozuctPolozek'
+        hash[:seznam_norm_polozek] = seznam_norm_polozek.map(&:to_h_with_attrs) if has? 'SeznamNormPolozek'
         hash[:dokumenty] = dokumenty if has? 'Dokumenty'
 
         hash

data/lib/money_s3/string_with_attributes.rb

@@ -0,0 +1,28 @@
+module MoneyS3
+  class StringWithAttributes
+    def initialize(string, attributes = nil)
+      @string = string
+      @attributes = attributes if attributes
+    end
+
+    def value
+      @string
+    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
+  end
+end

data/lib/money_s3.rb

@@ -1,7 +1,8 @@
 require 'ox'
 require 'money_s3/parsers/money_data'
 require 'money_s3/builders/money_data'
-require 'money_s3/with_attributes'
+require 'money_s3/string_with_attributes'
+require 'money_s3/hash_with_attributes'
 
 module MoneyS3
   def self.parse(raw)

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.6.0'
+  spec.version       = '0.7.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.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Premysl Donat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
@@ -312,6 +312,7 @@ files:
 - lib/money_s3/builders/zauctovani_dph_detype.rb
 - lib/money_s3/builders/zauctovani_dph_type.rb
 - lib/money_s3/builders/zavazek_type.rb
+- lib/money_s3/hash_with_attributes.rb
 - lib/money_s3/parsers/adresa_type.rb
 - lib/money_s3/parsers/alternativa_prislusenstvi_type.rb
 - lib/money_s3/parsers/bank_dokl.rb
@@ -485,7 +486,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
+- lib/money_s3/string_with_attributes.rb
 - money_s3.gemspec
 - xsd/Dochazka/Dochazka.xsd
 - xsd/Dochazka/Zamestnanci.xsd

data/lib/money_s3/with_attributes.rb

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