lib/osm/api_access.rb in osm-0.0.11 vs lib/osm/api_access.rb in osm-0.0.12

@@ -8,22 +8,37 @@
     # @!attribute [r] name
     #   @return [String] the name of the API
     # @!attribute [r] permissions
     #   @return [Hash] the permissions assigned to this API by the user in OSM
 
-    # Initialize a new API Access using the hash returned by the API call
-    # @param data the hash of data for the object returned by the API
-    def initialize(data)
-      @id = data['apiid'].to_i
-      @name = data['name']
-      @permissions = data['permissions'].is_a?(Hash) ? data['permissions'] : {}
+    # Initialize a new ApiAccess
+    # @param [Hash] attributes the hash of attributes (see attributes for descriptions, use Symbol of attribute name as the key)
+    def initialize(attributes={})
+      raise ArgumentError, ':id must be a Fixnum > 0' unless (attributes[:id].is_a?(Fixnum) && attributes[:id] > 0)
+      raise ArgumentError, ':name must be a String' unless attributes[:name].is_a?(String)
+      raise ArgumentError, ':permissions must be a Hash' unless attributes[:permissions].is_a?(Hash)
 
+      attributes.each { |k,v| instance_variable_set("@#{k}", v) }
+    end
+
+
+    # Initialize a new ApiAccess from api data
+    # @param [Hash] data the hash of data provided by the API
+    def self.from_api(data)
+      attributes = {}
+      attributes[:id] = data['apiid'].to_i
+      attributes[:name] = data['name']
+      attributes[:permissions] = data['permissions'].is_a?(Hash) ? data['permissions'] : {}
+
       # Rubyfy permissions hash
-      @permissions.keys.each do |key|
-        @permissions[key] = @permissions[key].to_i
-        @permissions[(key.to_sym rescue key) || key] = @permissions.delete(key) # Symbolize key
+      attributes[:permissions].keys.each do |key|
+        attributes[:permissions][key] = attributes[:permissions][key].to_i
+        attributes[:permissions][(key.to_sym rescue key) || key] = attributes[:permissions].delete(key) # Symbolize key
       end
+      attributes[:permissions].freeze
+
+      return new(attributes)
     end
 
     # Determine if this API has read access for the provided permission
     # @param [Symbol] key the permission being queried
     # @return [Boolean] if this API can read the passed permission
@@ -42,8 +57,8 @@
     # @return [Boolean] if this is the API being used
     def our_api?
       return @id == Osm::Api.api_id.to_i
     end
 
-  end
+  end # Class
 
-end
+end # Module