spid-es 0.0.28 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb8b587fc1cfcdcd48c3036862abaeb4ead7a9cdc4dd49e5d8eff6aa3f957b21
-  data.tar.gz: 02c2db9b713ff0660ba9866fe3ad4b85f2ffb7329993df80a41da35f1f94d65a
+  metadata.gz: 678eabae1888696ae13ef20f1d9c3a6e180bb244453593798ff6535da3d180d5
+  data.tar.gz: fe6f4201824240ec8dffd40a3891d95a726170f3b40f358935bcfba9b220d060
 SHA512:
-  metadata.gz: a505c385493da04481b3ff5846b4f7202485468946d10b6270fa9c5058aed656368784a383b73bfe6f8e046a78b06d4b91240ace162fd26859da25719d9ad44e
-  data.tar.gz: 9b4f324436969186405ff0c76caa5bd9ef8dc00250266924d549c6d7244307635da631002758c0aaf9fb45c2aa0314f7274dd7b54df3dadd2421988fff2be706
+  metadata.gz: 0a52274c11b1d38726295bbaff4d7cbf9a2b7ec3ca06128e5c7b1c36bbf10ad4ae8a346078fd40808c7ac1361bade9ac57111328b99f8577484c4c2f231210bb
+  data.tar.gz: a30bb7df8b93cab978687467dee2e9eb42a6de0ce1af282de1e4387763609ee24b63b3954bec0665dc7586ad9fa10bdf8e9c058612fa62367688ce23da562d67

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

@@ -223,7 +223,7 @@ module Spid
             "xml:lang" => "it"
         }
     
-        org_display_name.text = settings.organization['org_display_name']+(settings.aggregato ? " tramite #{settings.hash_aggregatore['soggetto_aggregatore']}" : '')
+        org_display_name.text = settings.organization['org_display_name'] #+(settings.aggregato ? " tramite #{settings.hash_aggregatore['soggetto_aggregatore']}" : '')
         org_url = organization.add_element "md:OrganizationURL", {
             "xml:lang" => "it"
         }
@@ -235,39 +235,76 @@ module Spid
             "contactType" => "other",
             "spid:entityType" => "spid:aggregator"
           }
-          company = contact_person_aggregatore.add_element "md:Company"
-          company.text = settings.hash_aggregatore['soggetto_aggregatore']
 
           extensions_aggregatore = contact_person_aggregatore.add_element "md:Extensions"
-          vat_number_aggregatore = extensions_aggregatore.add_element "spid:VATNumber"
-          vat_number_aggregatore.text = settings.hash_aggregatore['piva_aggregatore']
-          
-          ipa_code_aggregatore = extensions_aggregatore.add_element "spid:IPACode"
-          ipa_code_aggregatore.text = settings.hash_aggregatore['cipa_aggregatore']
 
-          fiscal_code_aggregatore = extensions_aggregatore.add_element "spid:FiscalCode"
-          fiscal_code_aggregatore.text = settings.hash_aggregatore['cf_aggregatore']
+          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']
+          end
+
+          unless settings.hash_aggregatore['cipa_aggregatore'].blank?
+            ipa_code_aggregatore = extensions_aggregatore.add_element "spid:IPACode"
+            ipa_code_aggregatore.text = settings.hash_aggregatore['cipa_aggregatore']
+          end
+
+          unless settings.hash_aggregatore['cf_aggregatore'].blank?
+            fiscal_code_aggregatore = extensions_aggregatore.add_element "spid:FiscalCode"
+            fiscal_code_aggregatore.text = settings.hash_aggregatore['cf_aggregatore']
+          end 
+
+          tipo_aggregatore = extensions_aggregatore.add_element "spid:PublicServicesFullAggregator"
+
+          unless settings.hash_aggregatore['soggetto_aggregatore'].blank?
+            company = contact_person_aggregatore.add_element "md:Company"
+            company.text = settings.hash_aggregatore['soggetto_aggregatore']
+          end
+
+          unless settings.hash_aggregatore['email_aggregatore'].blank?
+            email_address = contact_person_aggregatore.add_element "md:EmailAddress"
+            email_address.text = settings.hash_aggregatore['email_aggregatore']
+          end
+
+          unless settings.hash_aggregatore['telefono_aggregatore'].blank?
+            telephone_number = contact_person_aggregatore.add_element "md:TelephoneNumber"
+            telephone_number.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 = contact_person_aggregato.add_element "md:Company"
+          company.text = settings.organization['org_name']
+
+          unless settings.hash_aggregatore['soggetto_aggregato']['email_address'].blank?
+            email_address = contact_person_aggregato.add_element "md:EmailAddress"
+            email_address.text = settings.hash_aggregatore['soggetto_aggregato']['email_address']
+          end
+
+          unless settings.hash_aggregatore['soggetto_aggregato']['telephone_number'].blank?
+            telephone_number = contact_person_aggregato.add_element "md:TelephoneNumber"
+            telephone_number.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.28'
+  s.version = '0.0.33'
 
   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.28
+  version: 0.0.33
 platform: ruby
 authors:
 - Fabiano Pavan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: canonix