authlete 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82936474309206c929f213e650c466e8b3b5e9fd
-  data.tar.gz: 3e99cc8e876bbb5b27f558d4d56d2e9b7b53663d
+  metadata.gz: ab0dea663641f59f6f122fb29dcf71efb7f2cec8
+  data.tar.gz: c54970c03b22d27edaaa072b174a4512e8cf8067
 SHA512:
-  metadata.gz: 22c790f2fb9243ca50114a02fe77a4ca5c2ced9c7d40e9c85b85a25802bb36ca0e2fa1b2c7cc3c034ad93d8cf2549d350b741cf6935ca1db18f8ad114481114d
-  data.tar.gz: 1003c046225523684c56be97c1667bebdf55ace7cb32fa8127651272c3a203b58ebb9fce5ab47338c570d223f081672871d80ed0a83062c4dc323d14b262081d
+  metadata.gz: 20ed509dc656372f88babd36d812969c58e333c08675df697d52bad23802e572be239decbbff89db509cc95b8b6c69390ae83f89a95eb6a056e20b6ed8c00dd6
+  data.tar.gz: 962d058d75905062b4721d361ea0288483fbb5954c4542a50cd742634d03560a474dc192c91a3036e3f185304954915cbad7b3e76dd4dd2e69e25af00ab707db

data/lib/authlete.rb

@@ -25,7 +25,6 @@ module Authlete
   autoload :AuthenticationServer, 'authlete/authentication-server'
   autoload :Api, 'authlete/api'
   autoload :Exception, 'authlete/exception'
-  autoload :Host, 'authlete/host'
   autoload :Utility, 'authlete/utility'
 
   module Model

data/lib/authlete/authentication-server.rb

@@ -227,4 +227,4 @@ module Authlete
       '/authentication'
     end
   end
-end
+end

data/lib/authlete/model/client.rb

@@ -247,7 +247,7 @@ module Authlete
       # (String)
       attr_accessor :description
 
-      # Descriptions about the client application with language tags. (TaggesValue array)
+      # Descriptions about the client application with language tags. (TaggedValue array)
       attr_accessor :descriptions
 
       # The timestamp at which the client was created. (Integer)

data/lib/authlete/model/request/authorization-request.rb

@@ -99,4 +99,4 @@ module Authlete
       end
     end
   end
-end
+end

data/lib/authlete/model/request/developer-authentication-callback-request.rb

@@ -82,4 +82,4 @@ module Authlete
       end
     end
   end
-end
+end

data/lib/authlete/model/request/introspection-request.rb

@@ -37,4 +37,4 @@ module Authlete
       end
     end
   end
-end
+end

data/lib/authlete/model/request/token-issue-request.rb

@@ -99,4 +99,4 @@ module Authlete
       end
     end
   end
-end
+end

data/lib/authlete/model/request/token-request.rb

@@ -119,4 +119,4 @@ module Authlete
       end
     end
   end
-end
+end

data/lib/authlete/model/response/authorization-issue-response.rb

@@ -46,4 +46,4 @@ module Authlete
       end
     end
   end
-end
+end

data/lib/authlete/model/response/authorization-response.rb

@@ -162,4 +162,4 @@ module Authlete
       end
     end
   end
-end
+end

data/lib/authlete/model/response/introspection-response.rb

@@ -130,4 +130,4 @@ module Authlete
       end
     end
   end
-end
+end

data/lib/authlete/model/response/token-fail-response.rb

@@ -47,4 +47,4 @@ module Authlete
       end
     end
   end
-end
+end

data/lib/authlete/model/response/token-issue-response.rb

@@ -47,4 +47,4 @@ module Authlete
       end
     end
   end
-end
+end

data/lib/authlete/model/scope.rb

@@ -21,9 +21,14 @@ require 'set'
 module Authlete
   module Model
     class Scope < Authlete::Model::Hashable
+      include Authlete::Utility
       # The description about this scope. (String)
       attr_accessor :description
 
+      # The descriptions about this scope with language tags.
+      # (TaggedValue array)
+      attr_accessor :descriptions
+
       # The name of this scope. (String)
       attr_accessor :name
 
@@ -41,6 +46,9 @@ module Authlete
       # String attributes.
       STRING_ATTRIBUTES = ::Set.new([ :description, :name ])
 
+      # Tagged value array attributes.
+      TAGGED_VALUE_ARRAY_ATTRIBUTES = ::Set.new([ :descriptions ])
+
       # Mapping from snake cases to camel cases.
       SNAKE_TO_CAMEL = { :default_entry => :defaultEntry }
 
@@ -56,6 +64,11 @@ module Authlete
           send("#{attr}=", nil)
         end
 
+        # Set default values to tagged value array attributes.
+        TAGGED_VALUE_ARRAY_ATTRIBUTES.each do |attr|
+          send("#{attr}=", nil)
+        end
+
         # Set attribute values using the given hash.
         authlete_model_update(hash)
       end
@@ -84,6 +97,13 @@ module Authlete
 
           if authlete_model_simple_attribute?(key)
             send("#{key}=", value)
+          elsif TAGGED_VALUE_ARRAY_ATTRIBUTES.include?(key)
+            # Get an array consisting of "TaggedValue" objects.
+            parsed = get_parsed_array(value) do |element|
+              Authlete::Model::TaggedValue.parse(element)
+            end
+
+            send("#{key}=", parsed)
           end
         end
 
@@ -117,7 +137,11 @@ module Authlete
           key = var.to_s.delete("@").to_sym
           val = instance_variable_get(var)
 
-          hash[key] = val
+          if authlete_model_simple_attribute?(key) or val.nil?
+            hash[key] = val
+          elsif val.kind_of?(Array)
+            hash[key] = val.map { |element| element.to_hash }
+          end
         end
 
         hash

data/lib/authlete/model/tagged-value.rb

@@ -30,7 +30,7 @@ module Authlete
       private
 
       # String attributes.
-      STRING_ATTRIBUTES = ::Set.new([:tag, :value])
+      STRING_ATTRIBUTES = ::Set.new([ :tag, :value ])
 
       # The constructor
       def initialize(hash = nil)
@@ -44,14 +44,7 @@ module Authlete
       end
 
       def authlete_model_convert_key(key)
-        key = key.to_sym
-
-        # Convert snakecase to camelcase, if necessary.
-        if SNAKE_TO_CAMEL.has_key?(key)
-          key = SNAKE_TO_CAMEL[key]
-        end
-
-        key
+        key.to_sym
       end
 
       def authlete_model_simple_attribute?(key)

data/lib/authlete/version.rb

@@ -16,5 +16,5 @@
 
 
 module Authlete
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authlete
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Takahiko Kawasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -70,7 +70,6 @@ files:
 - lib/authlete/api.rb
 - lib/authlete/authentication-server.rb
 - lib/authlete/exception.rb
-- lib/authlete/host.rb
 - lib/authlete/model/client-list.rb
 - lib/authlete/model/client.rb
 - lib/authlete/model/hashable.rb

data/lib/authlete/host.rb

@@ -1,23 +0,0 @@
-# :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.
-
-
-module Authlete
-  module Host
-    DEVELOPMENT = 'https://dev-api.authlete.com'
-    PRODUCTION  = 'https://api.authlete.com'
-  end
-end