Commit 5f9919e

@@ -1,7 +1,7 @@
 module Saml
   module Kit
-    class IdentityProviderMetadata < Metadata
-      class Builder
+    module Builders
+      class IdentityProviderMetadata
         attr_accessor :id, :organization_name, :organization_url, :contact_email, :entity_id, :attributes, :name_id_formats
         attr_accessor :want_authn_requests_signed, :sign
         attr_reader :logout_urls, :single_sign_on_urls
@@ -76,7 +76,7 @@ module Saml
         end
 
         def build
-          IdentityProviderMetadata.new(to_xml)
+          Saml::Kit::IdentityProviderMetadata.new(to_xml)
         end
 
         private

@@ -19,7 +19,7 @@ RSpec.describe Saml::Kit::Bindings::HttpRedirect do
 
   describe "#deserialize" do
     let(:issuer) { FFaker::Internet.http_url }
-    let(:provider) { Saml::Kit::IdentityProviderMetadata::Builder.new.build }
+    let(:provider) { Saml::Kit::Builders::IdentityProviderMetadata.new.build }
 
     before :each do
       allow(Saml::Kit.configuration.registry).to receive(:metadata_for).with(issuer).and_return(provider)

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-RSpec.describe Saml::Kit::IdentityProviderMetadata::Builder do
+RSpec.describe Saml::Kit::Builders::IdentityProviderMetadata do
   subject { described_class.new }
   let(:email) { FFaker::Internet.email }
   let(:org_name) { FFaker::Movie.title }

@@ -76,7 +76,7 @@ RSpec.describe Saml::Kit::AuthenticationRequest do
     end
 
     it 'is invalid when not an AuthnRequest' do
-      xml = Saml::Kit::IdentityProviderMetadata::Builder.new.to_xml
+      xml = Saml::Kit::Builders::IdentityProviderMetadata.new.to_xml
       subject = described_class.new(xml)
       expect(subject).to be_invalid
       expect(subject.errors[:base]).to include(subject.error_message(:invalid))

@@ -9,7 +9,7 @@ RSpec.describe Saml::Kit::DefaultRegistry do
     builder.build
   end
   let(:identity_provider_metadata) do
-    builder = Saml::Kit::IdentityProviderMetadata::Builder.new
+    builder = Saml::Kit::Builders::IdentityProviderMetadata.new
     builder.entity_id = entity_id
     builder.build
   end

@@ -70,7 +70,7 @@ RSpec.describe Saml::Kit::IdentityProviderMetadata do
 
   describe "#validate" do
     it 'valid when given valid identity provider metadata' do
-      builder = described_class::Builder.new
+      builder = Saml::Kit::Builders::IdentityProviderMetadata.new
       builder.attributes = [:email]
       builder.add_single_sign_on_service(FFaker::Internet.http_url, binding: :http_post)
       builder.add_single_sign_on_service(FFaker::Internet.http_url, binding: :http_redirect)
@@ -121,7 +121,7 @@ RSpec.describe Saml::Kit::IdentityProviderMetadata do
     let(:redirect_url) { FFaker::Internet.http_url }
 
     subject do
-      builder = Saml::Kit::IdentityProviderMetadata::Builder.new
+      builder = Saml::Kit::Builders::IdentityProviderMetadata.new
       builder.add_single_sign_on_service(redirect_url, binding: :http_redirect)
       builder.add_single_sign_on_service(post_url, binding: :http_post)
       builder.build
@@ -145,7 +145,7 @@ RSpec.describe Saml::Kit::IdentityProviderMetadata do
   end
 
   describe "#want_authn_requests_signed" do
-    let(:builder) { described_class::Builder.new }
+    let(:builder) { Saml::Kit::Builders::IdentityProviderMetadata.new }
 
     it 'returns true when enabled' do
       builder.want_authn_requests_signed = true
@@ -168,7 +168,7 @@ RSpec.describe Saml::Kit::IdentityProviderMetadata do
   end
 
   describe "#single_logout_service_for" do
-    let(:builder) { described_class::Builder.new }
+    let(:builder) { Saml::Kit::Builders::IdentityProviderMetadata.new }
     let(:redirect_url) { FFaker::Internet.http_url }
     let(:post_url) { FFaker::Internet.http_url }
     let(:subject) { builder.build }

@@ -60,7 +60,7 @@ RSpec.describe Saml::Kit::LogoutRequest do
     end
 
     it 'is invalid when not a LogoutRequest' do
-      xml = Saml::Kit::IdentityProviderMetadata::Builder.new.to_xml
+      xml = Saml::Kit::Builders::IdentityProviderMetadata.new.to_xml
       subject = described_class.new(xml)
       expect(subject).to be_invalid
       expect(subject.errors[:base]).to include(subject.error_message(:invalid))

@@ -62,7 +62,7 @@ RSpec.describe Saml::Kit::Response do
 
     it 'is invalid when not a Response' do
       allow(registry).to receive(:metadata_for).and_return(nil)
-      xml = Saml::Kit::IdentityProviderMetadata::Builder.new.to_xml
+      xml = Saml::Kit::Builders::IdentityProviderMetadata.new.to_xml
       subject = described_class.new(xml)
       expect(subject).to be_invalid
       expect(subject.errors[:base]).to include(subject.error_message(:invalid))