libsaml 2.17.0 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6533e2ced1cadafa719484e26db20a90655567c6
-  data.tar.gz: 6c6dc3ba78ea7c268945c992fad01084f3d9b2c5
+  metadata.gz: 73a0241659419df0fec12c8812aac9f42c7b82f9
+  data.tar.gz: 36dbc7b1e49ead6ec16029060b1025aadb2ee23d
 SHA512:
-  metadata.gz: 0d3d0ceab9c2f3523162f8bf5e1347518a2b96d67e1b1f6d1e32f5b632a76804d06db64aefb6e0ccc1f28855b48bfc600933195f7e61e00dcaad9465e54c5fb8
-  data.tar.gz: 547ad0e4f947f322f9b22554dad25ac729a5bcd0c94a009460a5ffffeaf104ad7c517ed50da13867a28cd25bad5ba6d4f7e8a59dd2965aaa5ce6a7ec7f59009e
+  metadata.gz: 93715c9835434ee25ba4df7da290041b142fa379e0a68a3e197e36974f36fb78aedacb75d52d81637623f0447b19dd8109d02be9c28ce2b2d0af8c4b716fe068
+  data.tar.gz: 5ef0339348b56368adb47c585a0d74b62cf641bc9fb170be7c4171aebae6e2cf4eed45e22c1acf8745af07915528de4a0c62e8ba26046461f906b6b0abb1baed

data/lib/saml.rb

@@ -5,6 +5,7 @@ require 'saml/xml_helpers'
 require 'saml/encoding'
 require 'saml/util'
 require 'saml/notification'
+require 'saml/attribute_fetcher'
 require 'xmlenc'
 require 'xmldsig'
 require "net/https"
@@ -112,6 +113,7 @@ module Saml
     require 'saml/elements/authenticating_authority'
     require 'saml/elements/subject_locality'
     require 'saml/elements/authn_context'
+    require 'saml/elements/audience'
     require 'saml/elements/audience_restriction'
     require 'saml/elements/sub_status_code'
     require 'saml/elements/status_code'

data/lib/saml/assertion.rb

@@ -55,8 +55,8 @@ module Saml
 
     def add_attribute(key, value)
       self.attribute_statement ||= Saml::Elements::AttributeStatement.new
-      self.attribute_statement.attribute ||= []
-      self.attribute_statement.attribute << Saml::Elements::Attribute.new(name: key, attribute_value: value)
+      self.attribute_statement.attributes ||= []
+      self.attribute_statement.attributes << Saml::Elements::Attribute.new(name: key, attribute_value: value)
     end
 
     def fetch_attribute(key)
@@ -65,7 +65,7 @@ module Saml
 
     def fetch_attributes(key)
       return unless self.attribute_statements
-      return unless self.attribute_statements.flat_map(&:attribute)
+      return unless self.attribute_statements.flat_map(&:attributes)
       attribute_statements.flat_map { |attribute_statement| attribute_statement.fetch_attributes(key) }
     end
 
@@ -75,7 +75,7 @@ module Saml
 
     def fetch_attribute_values(key)
       return unless self.attribute_statements
-      return unless self.attribute_statements.flat_map(&:attribute)
+      return unless self.attribute_statements.flat_map(&:attributes)
       attribute_statements.flat_map { |attribute_statement| attribute_statement.fetch_attribute_values(key) }
     end
 

data/lib/saml/attribute_fetcher.rb

@@ -0,0 +1,23 @@
+module Saml
+  module AttributeFetcher
+    extend ActiveSupport::Concern
+
+    included do
+      def fetch_attribute(key)
+        fetch_attribute_value(key).content
+      end
+
+      def fetch_attributes(key)
+        fetch_attribute_values(key).map(&:content)
+      end
+
+      def fetch_attribute_value(key)
+        fetch_attribute_values(key).first
+      end
+
+      def fetch_attribute_values(key)
+        attributes.find_all { |attr| attr.name == key }.flat_map(&:attribute_values)
+      end
+    end
+  end
+end

data/lib/saml/elements/attribute_statement.rb

@@ -2,28 +2,23 @@ module Saml
   module Elements
     class AttributeStatement
       include Saml::Base
+      include Saml::AttributeFetcher
 
       tag 'AttributeStatement'
       register_namespace 'saml', Saml::SAML_NAMESPACE
       namespace 'saml'
 
-      has_many :attribute, Saml::Elements::Attribute
+      has_many :attributes, Saml::Elements::Attribute
       has_many :encrypted_attributes, Saml::Elements::EncryptedAttribute
 
-      def fetch_attribute(key)
-        fetch_attribute_value(key).content
+      def attribute
+        warn '[DEPRECATED] please use #attributes'
+        attributes
       end
 
-      def fetch_attributes(key)
-        fetch_attribute_values(key).map(&:content)
-      end
-
-      def fetch_attribute_value(key)
-        fetch_attribute_values(key).first
-      end
-
-      def fetch_attribute_values(key)
-        attribute.find_all { |attr| attr.name == key }.flat_map(&:attribute_values)
+      def attribute=(attributes)
+        warn '[DEPRECATED] please use #attributes='
+        self.attributes = attributes
       end
     end
   end

data/lib/saml/elements/audience.rb

@@ -0,0 +1,12 @@
+module Saml
+  module Elements
+    class Audience
+      include Saml::Base
+
+      tag 'Audience'
+      namespace 'saml'
+
+      content :value, String
+    end
+  end
+end

data/lib/saml/elements/audience_restriction.rb

@@ -6,7 +6,7 @@ module Saml
       tag 'AudienceRestriction'
       namespace 'saml'
 
-      has_many :audiences, String, tag: 'Audience'
+      has_many :audiences, Saml::Elements::Audience
 
       def audience
         Array(audiences).first

data/lib/saml/elements/samlp_extensions.rb

@@ -3,6 +3,7 @@ module Saml
     class SAMLPExtensions
       include Saml::Base
       include Saml::XMLHelpers
+      include Saml::AttributeFetcher
 
       tag "Extensions"
       namespace "samlp"

data/lib/saml/version.rb

@@ -1,3 +1,3 @@
 module Saml
-  VERSION = "2.17.0"
+  VERSION = "2.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libsaml
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 2.18.0
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,6 +127,7 @@ files:
 - lib/saml/artifact_resolve.rb
 - lib/saml/artifact_response.rb
 - lib/saml/assertion.rb
+- lib/saml/attribute_fetcher.rb
 - lib/saml/authn_request.rb
 - lib/saml/base.rb
 - lib/saml/basic_provider.rb
@@ -155,6 +156,7 @@ files:
 - lib/saml/elements/attribute_query.rb
 - lib/saml/elements/attribute_statement.rb
 - lib/saml/elements/attribute_value.rb
+- lib/saml/elements/audience.rb
 - lib/saml/elements/audience_restriction.rb
 - lib/saml/elements/authenticating_authority.rb
 - lib/saml/elements/authn_context.rb