authlete 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51f422fdb9d470f829c32dccd39f1fcf3e9526a1
-  data.tar.gz: 58c32fcc3f59728bdb36261022aec5c855edcf38
+  metadata.gz: ef1a6c543fcb76bedce08190e164ef4afa738a3c
+  data.tar.gz: 4f64bae2040be8090b0c2f351d64183762a00b75
 SHA512:
-  metadata.gz: 20b1b910cc4f7f8b0f7440edf00c440082442d4e577a3e5188db477c0cbda0bfa5e9fae03bceaac7fd6bf13992a7bcef61351bd1f14222d794068c37284108f3
-  data.tar.gz: a7232fcaa7ef505f92a2712b6969d359196429316e227b261a60f4db5897abe9453073a0074e1f5036b774451d5e57b56c0e2b05c478f490431a4c997c736323
+  metadata.gz: 5261e07397a1abd749201d1077d57501aacd438ea80a3941334d947b28fbe3c97c8c7a4998953ea97876554967926ddea9c284db33459455c18d7fae5406413a
+  data.tar.gz: 668a63e3eec779ba8e816e5671c96e19977a9da6e8dddf3560367cf0b050ec01f0f07f1ef2d9eba915ac5b65cefc3a47ec0a4f59c402db5c5b3d8179dd234b05

data/lib/authlete.rb

@@ -28,11 +28,12 @@ module Authlete
   autoload :Utility, 'authlete/utility'
 
   module Model
-    autoload :Hashable, 'authlete/model/hashable'
     autoload :Client, 'authlete/model/client'
     autoload :ClientList, 'authlete/model/client-list'
     autoload :ClientExtension, 'authlete/model/client-extension'
+    autoload :Hashable, 'authlete/model/hashable'
     autoload :Result, 'authlete/model/result'
+    autoload :Pair, 'authlete/model/pair'
     autoload :Scope, 'authlete/model/scope'
     autoload :Service, 'authlete/model/service'
     autoload :ServiceList, 'authlete/model/service-list'
@@ -49,7 +50,7 @@ module Authlete
       autoload :IntrospectionRequest, 'authlete/model/request/introspection-request'
       autoload :TokenFailRequest, 'authlete/model/request/token-fail-request'
       autoload :TokenIssueRequest, 'authlete/model/request/token-issue-request'
-      autoload :TokenReqeust, 'authlete/model/request/token-request'
+      autoload :TokenRequest, 'authlete/model/request/token-request'
     end
 
     module Response

data/lib/authlete/model/pair.rb

@@ -0,0 +1,103 @@
+# :nodoc:
+#
+# Copyright (C) 2014-2015 Authlete, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+require 'set'
+
+
+module Authlete
+  module Model
+    class Pair < Authlete::Model::Hashable
+      include Authlete::Utility
+      # The key of this pair. (String)
+      attr_accessor :key
+
+      # The value of this pair. (String)
+      attr_accessor :value
+
+      private
+
+      # String attributes.
+      STRING_ATTRIBUTES = ::Set.new([ :key, :value ])
+
+      # The constructor
+      def initialize(hash = nil)
+        # Set default values to string attributes.
+        STRING_ATTRIBUTES.each do |attr|
+          send("#{attr}=", nil)
+        end
+
+        # Set attribute values using the given hash.
+        authlete_model_update(hash)
+      end
+
+      def authlete_model_convert_key(key)
+        key.to_sym
+      end
+
+      def authlete_model_simple_attribute?(key)
+        STRING_ATTRIBUTES.include?(key)
+      end
+
+      def authlete_model_update(hash)
+        return if hash.nil?
+
+        hash.each do |key, value|
+          key = authlete_model_convert_key(key)
+
+          if authlete_model_simple_attribute?(key)
+            send("#{key}=", value)
+          end
+        end
+
+        self
+      end
+
+      public
+
+      # Construct an instance from the given hash.
+      #
+      # If the given argument is nil or is not a Hash, nil is returned.
+      # Otherwise, Scope.new(hash) is returned.
+      def self.parse(hash)
+        if hash.nil? or (hash.kind_of?(Hash) == false)
+          return nil
+        end
+
+        Authlete::Model::Pair.new(hash)
+      end
+
+      # Set attribute values using the given hash.
+      def update(hash)
+        authlete_model_update(hash)
+      end
+
+      # Convert this object into a hash.
+      def to_hash
+        hash = {}
+
+        instance_variables.each do |var|
+          key = var.to_s.delete("@").to_sym
+          val = instance_variable_get(var)
+
+          hash[key] = val
+        end
+
+        hash
+      end
+    end
+  end
+end

data/lib/authlete/model/service.rb

@@ -152,6 +152,9 @@ module Authlete
       alias_method  :jwks_uri,  :jwksUri
       alias_method  :jwks_uri=, :jwksUri=
 
+      # The metadata of the service. (Pair Array)
+      attr_accessor :metadata
+
       # The timestamp at which the service was modified. (Integer)
       attr_accessor :modifiedAt
       alias_method  :modified_at,  :modifiedAt
@@ -173,9 +176,6 @@ module Authlete
       alias_method  :policy_uri,  :policyUri
       alias_method  :policy_uri=, :policyUri=
 
-      # The service properties. (Array)
-      attr_accessor :properties
-
       # The duration of refresh tokens in seconds. (Integer)
       attr_accessor :refreshTokenDuration
       alias_method  :refresh_token_duration,  :refreshTokenDuration
@@ -340,7 +340,7 @@ module Authlete
 
       # String array attributes.
       STRING_ARRAY_ATTRIBUTES = ::Set.new([
-        :properties, :supportedAcrs, :supportedClaimLocales, :supportedClaims,
+        :supportedAcrs, :supportedClaimLocales, :supportedClaims,
         :supportedClaimTypes, :supportedDeveloperSnses, :supportedDisplays,
         :supportedGrantTypes, :supportedResponseTypes, :supportedSnses,
         :supportedTokenAuthMethods, :supportedUiLocales
@@ -422,6 +422,7 @@ module Authlete
 
         # Set default values to special objects.
         @developerSnsCredentials = nil
+        @metadata                = nil
         @snsCredentials          = nil
         @supportedScopes         = nil
 
@@ -459,6 +460,10 @@ module Authlete
             @developerSnsCredentials = get_parsed_array(value) do |element|
               Authlete::Model::SnsCredentials.parse(element)
             end
+          elsif key == :metadata
+            @metadata = get_parsed_array(value) do |element|
+              Authlete::Model::Pair.parse(element)
+            end
           elsif key == :snsCredentials
             @snsCredentials = get_parsed_array(value) do |element|
               Authlete::Model::SnsCredentials.parse(element)

data/lib/authlete/version.rb

@@ -16,5 +16,5 @@
 
 
 module Authlete
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authlete
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Takahiko Kawasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-12 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -74,6 +74,7 @@ files:
 - lib/authlete/model/client-list.rb
 - lib/authlete/model/client.rb
 - lib/authlete/model/hashable.rb
+- lib/authlete/model/pair.rb
 - lib/authlete/model/request/authentication-callback-request.rb
 - lib/authlete/model/request/authorization-fail-request.rb
 - lib/authlete/model/request/authorization-issue-request.rb