spid-es 0.0.29 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 914b31e7840c617f7853dc604a2f89bc73d13b6ffd112d1486e7545ad7436d7f
-  data.tar.gz: 931465c5e2d56a53738da3b2d165f8a17231ba8009a22dfb7faf38edc88b7318
+  metadata.gz: 7ed5dd9deffda781e9e126176bdd46717f782238f4c8687b00b1175ad30e07ab
+  data.tar.gz: 52c1374518e92fbdc554a90097ec6153cbde8988a6b2e50cd0ade5d005730637
 SHA512:
-  metadata.gz: 673f12a17aba77f61dad64c49cecaf5ccddc6a11238575765777b23b7b8c22dd0c4c085413527afff9ec621ebcd7d1418206172dbd30286abbb66f0bdcef99a7
-  data.tar.gz: 1e4ec887b388b9a25eacfa0a2d98dac6852436cf77de558d49f2659345a486a640af3f815b66d2bcc4741362c48b8b8c427200df43fed7d1a8d6967277031867
+  metadata.gz: d40b64c97bdba22bdb724f78cb516458aed2151295698cd29f2e1ea5c82496ece03f66505800292f4e818d47148e0c2b03191047624de067967b7a3fcfb42061
+  data.tar.gz: 35cf2b17a7d6f36b11476df563309e64b5c93ea6d9145ffc31a697fdcea0256f06612323bf460ca2dfa3095ae44a7724f55bbd8d047d1ad3f44cd382d794fe7b

data/lib/spid/ruby-saml/metadata.rb

@@ -235,16 +235,9 @@ module Spid
             "contactType" => "other",
             "spid:entityType" => "spid:aggregator"
           }
-          company = contact_person_aggregatore.add_element "md:Company"
-          company.text = settings.hash_aggregatore['soggetto_aggregatore']
-
-          email_address = contact_person_aggregatore.add_element "md:EmailAddress"
-          email_address.text = settings.hash_aggregatore['email_address']
-
-          telephone_number = contact_person_aggregatore.add_element "md:TelephoneNumber"
-          telephone_number.text = settings.hash_aggregatore['telephone_number']
 
           extensions_aggregatore = contact_person_aggregatore.add_element "md:Extensions"
+
           unless settings.hash_aggregatore['piva_aggregatore'].blank?
             vat_number_aggregatore = extensions_aggregatore.add_element "spid:VATNumber"
             vat_number_aggregatore.text = settings.hash_aggregatore['piva_aggregatore']
@@ -262,26 +255,56 @@ module Spid
 
           tipo_aggregatore = extensions_aggregatore.add_element "spid:PublicServicesFullAggregator"
 
+          unless settings.hash_aggregatore['soggetto_aggregatore'].blank?
+            company_aggregatore = contact_person_aggregatore.add_element "md:Company"
+            company_aggregatore.text = settings.hash_aggregatore['soggetto_aggregatore']
+          end
+
+          unless settings.hash_aggregatore['email_aggregatore'].blank?
+            email_address_aggregatore = contact_person_aggregatore.add_element "md:EmailAddress"
+            email_address_aggregatore.text = settings.hash_aggregatore['email_aggregatore']
+          end
+
+          unless settings.hash_aggregatore['telefono_aggregatore'].blank?
+            telephone_number_aggregatore = contact_person_aggregatore.add_element "md:TelephoneNumber"
+            telephone_number_aggregatore.text = settings.hash_aggregatore['telefono_aggregatore']
+          end
+
           contact_person_aggregato = root.add_element "md:ContactPerson", {
             "contactType" => "other",
             "spid:entityType" => "spid:aggregated"
           }
-          company = contact_person_aggregato.add_element "md:Company"
-          company.text = settings.organization['org_name']
 
           extensions_aggregato = contact_person_aggregato.add_element "md:Extensions"
-          unless settings.hash_aggregatore['soggetto_aggregato']['vat_number'].blank?
-            vat_number_aggregato = extensions_aggregato.add_element "spid:VATNumber"
-            vat_number_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['vat_number']
-          end
           unless settings.hash_aggregatore['soggetto_aggregato']['ipa_code'].blank?
             ipa_code_aggregato = extensions_aggregato.add_element "spid:IPACode" 
             ipa_code_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['ipa_code']
           end
+          unless settings.hash_aggregatore['soggetto_aggregato']['vat_number'].blank?
+            vat_number_aggregato = extensions_aggregato.add_element "spid:VATNumber"
+            vat_number_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['vat_number']
+          end
           unless settings.hash_aggregatore['soggetto_aggregato']['fiscal_code'].blank?
             fiscal_code_aggregato = extensions_aggregato.add_element "spid:FiscalCode" 
             fiscal_code_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['fiscal_code']
           end
+          unless settings.hash_aggregatore['soggetto_aggregato']['ipa_code'].blank?
+            tipo_aggregato = extensions_aggregato.add_element "spid:Public" 
+          end
+
+          company_aggregato = contact_person_aggregato.add_element "md:Company"
+          company_aggregato.text = settings.organization['org_name']
+
+          unless settings.hash_aggregatore['soggetto_aggregato']['email_address'].blank?
+            email_address_aggregato = contact_person_aggregato.add_element "md:EmailAddress"
+            email_address_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['email_address']
+          end
+
+          unless settings.hash_aggregatore['soggetto_aggregato']['telephone_number'].blank?
+            telephone_number_aggregato = contact_person_aggregato.add_element "md:TelephoneNumber"
+            telephone_number_aggregato.text = settings.hash_aggregatore['soggetto_aggregato']['telephone_number']
+          end
+          
         end
 
         #meta_doc << REXML::XMLDecl.new(version='1.0', encoding='UTF-8')

data/spid-es.gemspec

@@ -2,7 +2,7 @@ $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name = 'spid-es'
-  s.version = '0.0.29'
+  s.version = '0.0.34'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fabiano Pavan"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spid-es
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.34
 platform: ruby
 authors:
 - Fabiano Pavan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: canonix