authlete 0.3.6 → 0.3.7

data/lib/authlete/model/service-owner.rb

@@ -20,7 +20,7 @@ require 'set'
 
 module Authlete
   module Model
-    class ServiceOwner
+    class ServiceOwner < Authlete::Model::Hashable
       # The API key of the service owner. (Long)
       attr_accessor :apiKey
       alias_method  :api_key,  :apiKey
@@ -55,6 +55,7 @@ module Authlete
         :apiKey, :number
       ])
 
+
       # String attributes.
       STRING_ATTRIBUTES = ::Set.new([
         :apiSecret, :email, :loginId, :name, :plan
@@ -80,10 +81,10 @@ module Authlete
         end
 
         # Set attribute values using the given hash.
-        authlete_model_service_update(hash)
+        authlete_model_update(hash)
       end
 
-      def authlete_model_service_to_key(key)
+      def authlete_model_convert_key(key)
         key = key.to_sym
 
         # Convert snakecase to camelcase, if necessary.
@@ -94,27 +95,23 @@ module Authlete
         return key
       end
 
-      def authlete_model_service_simple_attribute?(key)
+      def authlete_model_simple_attribute?(key)
         INTEGER_ATTRIBUTES.include?(key) or
         STRING_ATTRIBUTES.include?(key)
       end
 
-      def authlete_model_service_update(hash)
-        if hash.nil?
-          return
-        end
+      def authlete_model_update(hash)
+        return if hash.nil?
 
         hash.each do |key, value|
-          key = authlete_model_service_to_key(key)
+          key = authlete_model_convert_key(key)
 
-          # If the attribute is a simple one.
-          if authlete_model_service_simple_attribute?(key)
+          if authlete_model_simple_attribute?(key)
             send("#{key}=", value)
-            next
           end
         end
 
-        return self
+        self
       end
 
       public
@@ -122,18 +119,18 @@ module Authlete
       # Construct an instance from the given hash.
       #
       # If the given argument is nil or is not a Hash, nil is returned.
-      # Otherwise, Service.new(hash) is returned.
+      # Otherwise, ServiceOwner.new(hash) is returned.
       def self.parse(hash)
         if hash.nil? or (hash.kind_of?(Hash) == false)
           return nil
         end
 
-        return Service.new(hash)
+        ServiceOwner.new(hash)
       end
 
       # Set attribute values using the given hash.
       def update(hash)
-        authlete_model_service_update(hash)
+        authlete_model_update(hash)
       end
 
       # Convert this object into a hash.
@@ -144,34 +141,13 @@ module Authlete
           key = var.to_s.delete("@").to_sym
           val = instance_variable_get(var)
 
-          if authlete_model_service_simple_attribute?(key) or val.nil?
+          if authlete_model_simple_attribute?(key) or val.nil?
             hash[key] = val
           end
         end
 
-        return hash
-      end
-
-      def [](key)
-        key = authlete_model_service_to_key(key)
-
-        if respond_to?(key)
-          return send(key)
-        else
-          return nil
-        end
-      end
-
-      def []=(key, value)
-        key = authlete_model_service_to_key(key)
-        method = "#{key}="
-
-        if respond_to?(method)
-          return send(method, value)
-        else
-          return nil
-        end
+        hash
       end
     end
   end
-end
+end

data/lib/authlete/model/service.rb

@@ -20,7 +20,8 @@ require 'set'
 
 module Authlete
   module Model
-    class Service
+    class Service < Authlete::Model::Hashable
+      include Authlete::Utility
       # The duration of access tokens in seconds. (Integer)
       attr_accessor :accessTokenDuration
       alias_method  :access_token_duration,  :accessTokenDuration
@@ -395,10 +396,10 @@ module Authlete
         @supportedScopes         = nil
 
         # Set attribute values using the given hash.
-        authlete_model_service_update(hash)
+        authlete_model_update(hash)
       end
 
-      def authlete_model_service_to_key(key)
+      def authlete_model_convert_key(key)
         key = key.to_sym
 
         # Convert snakecase to camelcase, if necessary.
@@ -406,71 +407,40 @@ module Authlete
           key = SNAKE_TO_CAMEL[key]
         end
 
-        return key
+        key
       end
 
-      def authlete_model_service_simple_attribute?(key)
+      def authlete_model_simple_attribute?(key)
         INTEGER_ATTRIBUTES.include?(key) or
         BOOLEAN_ATTRIBUTES.include?(key) or
         STRING_ATTRIBUTES.include?(key) or
         STRING_ARRAY_ATTRIBUTES.include?(key)
       end
 
-      def authlete_model_service_update(hash)
-        if hash.nil?
-          return
-        end
+      def authlete_model_update(hash)
+        return if hash.nil?
 
         hash.each do |key, value|
-          key = authlete_model_service_to_key(key)
+          key = authlete_model_convert_key(key)
 
-          # If the attribute is a simple one.
-          if authlete_model_service_simple_attribute?(key)
+          if authlete_model_simple_attribute?(key)
             send("#{key}=", value)
-            next
-          end
-
-          if key == :developerSnsCredentials
-            # The attribute 'developerSnsCredentials'.
-            @developerSnsCredentials = authlete_model_service_parse_array(value) do |element|
+          elsif key == :developerSnsCredentials
+            @developerSnsCredentials = get_parsed_array(value) do |element|
               Authlete::Model::SnsCredentials.parse(element)
             end
           elsif key == :snsCredentials
-            # The attribute 'snsCredentials'.
-            @snsCredentials = authlete_model_service_parse_array(value) do |element|
+            @snsCredentials = get_parsed_array(value) do |element|
               Authlete::Model::SnsCredentials.parse(element)
             end
           elsif key == :supportedScopes
-            # The attribute 'supportedScopes'.
-            @supportedScopes = authlete_model_service_parse_array(value) do |element|
+            @supportedScopes = get_parsed_array(value) do |element|
               Authlete::Model::Scope.parse(element)
             end
           end
         end
 
-        return self
-      end
-
-      def authlete_model_service_parse_array(array)
-        if array.nil? or (array.kind_of?(Array) == false) or (array.length == 0)
-          return nil
-        end
-
-        elements = []
-
-        array.each do |element|
-          parsed_element = yield(element)
-
-          if parsed_element.nil? == false
-            elements.push(parsed_element)
-          end
-        end
-
-        if elements.length == 0
-          return nil
-        end
-
-        return elements
+        self
       end
 
       public
@@ -484,12 +454,7 @@ module Authlete
           return nil
         end
 
-        return Service.new(hash)
-      end
-
-      # Set attribute values using the given hash.
-      def update(hash)
-        authlete_model_service_update(hash)
+        Service.new(hash)
       end
 
       # Convert this object into a hash.
@@ -500,36 +465,15 @@ module Authlete
           key = var.to_s.delete("@").to_sym
           val = instance_variable_get(var)
 
-          if authlete_model_service_simple_attribute?(key) or val.nil?
+          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}
+            hash[key] = val.map { |element| element.to_hash }
           end
         end
 
-        return hash
-      end
-
-      def [](key)
-        key = authlete_model_service_to_key(key)
-
-        if respond_to?(key)
-          return send(key)
-        else
-          return nil
-        end
-      end
-
-      def []=(key, value)
-        key = authlete_model_service_to_key(key)
-        method = "#{key}="
-
-        if respond_to?(method)
-          return send(method, value)
-        else
-          return nil
-        end
+        hash
       end
     end
   end
-end
+end

data/lib/authlete/model/sns-credentials.rb

@@ -20,7 +20,7 @@ require 'set'
 
 module Authlete
   module Model
-    class SnsCredentials
+    class SnsCredentials < Authlete::Model::Hashable
       # The API key. (String)
       attr_accessor :apiKey
       alias_method  :api_key,  :apiKey
@@ -33,13 +33,13 @@ module Authlete
 
       # The SNS. (String)
       #
-      # Valid values are "FACEBOOK".
+      # Currently, the only valid value is "FACEBOOK".
       attr_accessor :sns
 
       private
 
       # String attributes.
-      STRING_ATTRIBUTES = ::Set.new([:apiKey, :apiSecret, :sns])
+      STRING_ATTRIBUTES = ::Set.new([ :apiKey, :apiSecret, :sns ])
 
       # Mapping from snake cases to camel cases.
       SNAKE_TO_CAMEL = {
@@ -55,10 +55,10 @@ module Authlete
         end
 
         # Set attribute values using the given hash.
-        authlete_model_snsCredentials_update(hash)
+        authlete_model_update(hash)
       end
 
-      def authlete_model_snsCredentials_to_key(key)
+      def authlete_model_convert_key(key)
         key = key.to_sym
 
         # Convert snakecase to camelcase, if necessary.
@@ -66,29 +66,25 @@ module Authlete
           key = SNAKE_TO_CAMEL[key]
         end
 
-        return key
+        key
       end
 
-      def authlete_model_snsCredentials_simple_attribute?(key)
+      def authlete_model_simple_attribute?(key)
         STRING_ATTRIBUTES.include?(key)
       end
 
-      def authlete_model_snsCredentials_update(hash)
-        if hash.nil?
-          return
-        end
+      def authlete_model_update(hash)
+        return if hash.nil?
 
         hash.each do |key, value|
-          key = authlete_model_snsCredentials_to_key(key)
+          key = authlete_model_convert_key(key)
 
-          # If the attribute is a simple one.
-          if authlete_model_snsCredentials_simple_attribute?(key)
+          if authlete_model_simple_attribute?(key)
             send("#{key}=", value)
-            next
           end
         end
 
-        return self
+        self
       end
 
       public
@@ -102,12 +98,12 @@ module Authlete
           return nil
         end
 
-        return Authlete::Model::SnsCredentials.new(hash)
+        Authlete::Model::SnsCredentials.new(hash)
       end
 
       # Set attribute values using the given hash.
       def update(hash)
-        authlete_model_snsCredentials_update(hash)
+        authlete_model_update(hash)
       end
 
       # Convert this object into a hash.
@@ -121,29 +117,8 @@ module Authlete
           hash[key] = val
         end
 
-        return hash
-      end
-
-      def [](key)
-        key = authlete_model_snsCredentials_to_key(key)
-
-        if respond_to?(key)
-          return send(key)
-        else
-          return nil
-        end
-      end
-
-      def []=(key, value)
-        key = authlete_model_snsCredentials_to_key(key)
-        method = "#{key}="
-
-        if respond_to?(method)
-          return send(method, value)
-        else
-          return nil
-        end
+        hash
       end
     end
   end
-end
+end

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

@@ -1,135 +1,105 @@
-# :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 TaggedValue
-      # The language tag part. (String)
-      attr_accessor :tag
-
-      # The value part. (String)
-      attr_accessor :value
-
-
-      private
-
-      # String attributes.
-      STRING_ATTRIBUTES = ::Set.new([:tag, :value])
-
-      # The constructor
-      def initialize(hash = new)
-        # Set default values to string attributes.
-        STRING_ATTRIBUTES.each do |attr|
-          send("#{attr}=", nil)
-        end
-
-        # Set attribute values using the given hash.
-        authlete_model_taggedValue_update(hash)
-      end
-
-      def authlete_model_taggedValue_to_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
-
-        return key
-      end
-
-      def authlete_model_taggedValue_simple_attribute?(key)
-        STRING_ATTRIBUTES.include?(key)
-      end
-
-      def authlete_model_taggedValue_update(hash)
-        if hash.nil?
-          return
-        end
-
-        hash.each do |key, value|
-          key = authlete_model_taggedValue_to_key(key)
-
-          # If the attribute is a simple one.
-          if authlete_model_taggedValue_simple_attribute?(key)
-            send("#{key}=", value)
-            next
-          end
-        end
-
-        return 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, TaggedValue.new(hash) is returned.
-      def self.parse(hash)
-        if hash.nil? or (hash.kind_of?(Hash) == false)
-          return nil
-        end
-
-        return Authlete::Model::TaggedValue.new(hash)
-      end
-
-      # Set attribute values using the given hash.
-      def update(hash)
-        authlete_model_taggedValue_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
-
-        return hash
-      end
-
-      def [](key)
-        key = authlete_model_taggedValue_to_key(key)
-
-        if respond_to?(key)
-          return send(key)
-        else
-          return nil
-        end
-      end
-
-      def []=(key, value)
-        key = authlete_model_taggedValue_to_key(key)
-        method = "#{key}="
-
-        if respond_to?(method)
-          return send(method, value)
-        else
-          return nil
-        end
-      end
-    end
-  end
-end
+# :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 TaggedValue < Authlete::Model::Hashable
+      # The language tag part. (String)
+      attr_accessor :tag
+
+      # The value part. (String)
+      attr_accessor :value
+
+      private
+
+      # String attributes.
+      STRING_ATTRIBUTES = ::Set.new([:tag, :value])
+
+      # The constructor
+      def initialize(hash = new)
+        # 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 = key.to_sym
+
+        # Convert snakecase to camelcase, if necessary.
+        if SNAKE_TO_CAMEL.has_key?(key)
+          key = SNAKE_TO_CAMEL[key]
+        end
+
+        key
+      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 the attribute is a simple one.
+          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, TaggedValue.new(hash) is returned.
+      def self.parse(hash)
+        if hash.nil? or (hash.kind_of?(Hash) == false)
+          return nil
+        end
+
+        Authlete::Model::TaggedValue.new(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