libsaml 2.14.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68cc374f731a02daa6a0f13462a40dc0fb5187f5
-  data.tar.gz: ad65e6af3a361ae5266dfcbf26625433b134f8ae
+  metadata.gz: 067b8675cd140dfdc7b65eefba942c99dda19d49
+  data.tar.gz: d38738ba962dd8e98010cb75d4be3e094b0d48b8
 SHA512:
-  metadata.gz: b2768e1991f8909d74c673c2819b71194a617a171952c4fbc65ca261e259fe99f4c5bf7832b8f46fe3916fa627b5adbf44904493851bbccaf73c02a34a72dd72
-  data.tar.gz: 6af57acd2b87f93cb6621d55a65498585056c890abc5cb1b1a286c267b417d8238a1c0e0e0fa8914be633383509568a5ad549ac5c5ac33c9591f21b028a25424
+  metadata.gz: 7dc9d91c9f0a90ce5f784a53b41b56dfb092102c1e5b30354d3a160e459c3a2e6d2e45b8a70ddb8927e2003d5eb36ada254f02c4e0407af04dbd33f4dcf04402
+  data.tar.gz: 9594ae1ac0be7494e4d4458b12efedea85d5665a7adec0c554823818e3511eea3f24deaf2d3b02675b7cfbada999686a7d86698de678a54ebb21877e141fb17c

data/README.md

@@ -114,7 +114,7 @@ class SamlController < ApplicationController
       # provider should be of type Saml::Provider
       @response = Saml::Bindings::HTTPArtifact.resolve(request, provider.artifact_resolution_service_url)
     elsif params["SAMLResponse"]
-      @response = Saml::Bindings::HTTPost.receive_message(request, :response)
+      @response = Saml::Bindings::HTTPPost.receive_message(request, :response)
     else
        # handle invalid request
     end

data/lib/libsaml.rb

@@ -0,0 +1 @@
+require 'saml'

data/lib/saml/artifact.rb

@@ -1,6 +1,6 @@
 module Saml
   class Artifact
-    include ::HappyMapper
+    include ::XmlMapper
 
     TYPE_CODE      = "\000\004"
     ENDPOINT_INDEX = "\000\000"

data/lib/saml/base.rb

@@ -1,21 +1,21 @@
-require 'happymapper'
+require 'xmlmapper'
 
 module Saml
   module Base
     extend ActiveSupport::Concern
 
     included do
-      include ::HappyMapper
+      include ::XmlMapper
       include ::ActiveModel::Validations
 
       attr_accessor :xml_value
       has_xml_content
 
-      extend HappyMapperClassMethods
-      include HappyMapperInstanceMethods
+      extend XmlMapperClassMethods
+      include XmlMapperInstanceMethods
     end
 
-    module HappyMapperInstanceMethods
+    module XmlMapperInstanceMethods
       def initialize(attributes = {})
         attributes.each do |key, value|
           send("#{key}=", value) if respond_to?("#{key}=") && value.present?
@@ -29,7 +29,7 @@ module Saml
       end
     end
 
-    module HappyMapperClassMethods
+    module XmlMapperClassMethods
       def parse(xml, options = {})
         if xml.is_a?(String)
           ActiveSupport::XmlMini_REXML.parse(xml)

data/lib/saml/complex_types/indexed_endpoint_type.rb

@@ -6,7 +6,7 @@ module Saml
 
       included do
         attribute :index, Integer, :tag => "index"
-        attribute :is_default, HappyMapper::Boolean, :tag => "isDefault"
+        attribute :is_default, XmlMapper::Boolean, :tag => "isDefault"
 
         validates :index, :presence => true
       end

data/lib/saml/complex_types/request_abstract_type.rb

@@ -1,4 +1,4 @@
-require 'happymapper'
+require 'xmlmapper'
 
 module Saml
   module ComplexTypes

data/lib/saml/complex_types/statement_abstract_type.rb

@@ -1,7 +1,7 @@
 module Saml
   module ComplexTypes
     class StatementAbstractType
-      include HappyMapper
+      include XmlMapper
 
       register_namespace 'xsi', Saml::XSI_NAMESPACE
 

data/lib/saml/complex_types/status_response_type.rb

@@ -1,4 +1,4 @@
-require 'happymapper'
+require 'xmlmapper'
 
 module Saml
   module ComplexTypes

data/lib/saml/elements/attribute_consuming_service.rb

@@ -8,7 +8,7 @@ module Saml
       namespace "md"
 
       attribute :index, Integer, :tag => "index"
-      attribute :is_default, HappyMapper::Boolean, :tag => "isDefault"
+      attribute :is_default, XmlMapper::Boolean, :tag => "isDefault"
 
       has_many :service_names, ServiceName
       has_many :service_descriptions, ServiceDescription

data/lib/saml/elements/attribute_query.rb

@@ -1,7 +1,7 @@
 module Saml
   module Elements
     class AttributeQuery
-      include HappyMapper
+      include XmlMapper
       include Saml::Base
       include Saml::ComplexTypes::AttributeQueryType
 

data/lib/saml/elements/encrypted_id.rb

@@ -1,7 +1,7 @@
 module Saml
   module Elements
     class EncryptedID
-      include ::HappyMapper
+      include ::XmlMapper
       include ::Saml::Base
       include ::Saml::XMLHelpers
 
@@ -34,7 +34,7 @@ module Saml
         )
         encrypted_key = self.encrypted_data.encrypt(name_id_xml, key_options)
         encrypted_key.set_encryption_method(
-          algorithm: 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p', 
+          algorithm: 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p',
           digest_method_algorithm: 'http://www.w3.org/2000/09/xmldsig#sha1'
         )
         encrypted_key.set_key_name key_name

data/lib/saml/elements/evidence.rb

@@ -1,7 +1,7 @@
 module Saml
   module Elements
     class Evidence
-      include HappyMapper
+      include XmlMapper
       include Saml::Base
       include Saml::ComplexTypes::EvidenceType
 

data/lib/saml/elements/idp_sso_descriptor.rb

@@ -10,7 +10,7 @@ module Saml
 
       tag 'IDPSSODescriptor'
 
-      attribute :want_authn_requests_signed, HappyMapper::Boolean, :tag => "WantAuthnRequestsSigned", :default => false
+      attribute :want_authn_requests_signed, XmlMapper::Boolean, :tag => "WantAuthnRequestsSigned", :default => false
 
       has_many :single_sign_on_services, SingleSignOnService
 

data/lib/saml/elements/requested_attribute.rb

@@ -8,7 +8,7 @@ module Saml
       register_namespace "md", Saml::MD_NAMESPACE
       namespace "md"
 
-      attribute :is_required, HappyMapper::Boolean, :tag => "isRequired"
+      attribute :is_required, XmlMapper::Boolean, :tag => "isRequired"
     end
   end
 end

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.14.0"
+  VERSION = "2.15.1"
 end

data/lib/saml/xml_helpers.rb

@@ -1,3 +1,4 @@
+
 module Saml
   module XMLHelpers
     extend ActiveSupport::Concern
@@ -16,7 +17,12 @@ module Saml
       write_xml            = builder.nil? ? true : false
       builder              ||= Nokogiri::XML::Builder.new
       builder.doc.encoding = "UTF-8"
-      result               = super(builder, default_namespace)
+      result = if xml_value
+        builder << xml_value
+        builder
+      else
+        super(builder, default_namespace)
+      end
 
       if write_xml
         instruct ? result.to_xml(nokogiri_options(options)) : result.doc.root
@@ -43,9 +49,9 @@ module Saml
 
     def nokogiri_options(options)
       nokogiri_options             = {
-          save_with: Nokogiri::XML::Node::SaveOptions::AS_XML | Nokogiri::XML::Node::SaveOptions::FORMAT
+          save_with: Nokogiri::XML::Node::SaveOptions::AS_XML
       }
-      nokogiri_options[:save_with] = Nokogiri::XML::Node::SaveOptions::AS_XML if options[:no_space]
+      nokogiri_options[:save_with] |= Nokogiri::XML::Node::SaveOptions::FORMAT if options[:formatted]
       nokogiri_options
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.14.0
+  version: 2.15.1
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri-happymapper
+  name: xmlmapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: xmldsig
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: xmlenc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- lib/libsaml.rb
 - lib/saml.rb
 - lib/saml/artifact.rb
 - lib/saml/artifact_resolve.rb