base.rb in conjur-api-4.1.1

- old
+ new

@@ -1,5 +1,25 @@
+#
+# Copyright (C) 2013 Conjur Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'rest-client'
 require 'json'
 require 'base64'
 
 require 'conjur/exists'
@@ -25,26 +45,26 @@
 
       # Parse a resource id into [ account, 'resources', kind, id ]
       def parse_resource_id(id)
         parse_id id, 'resources'
       end
-      
+    
+      # Converts flat id into path components, with mixed-in "super-kind" 
+      #                                     (not that kind which is part of id)
+      # NOTE: name is a bit confusing, as result of 'parse' is just recombined
+      #       representation of parts, not an object of higher abstraction level
       def parse_id(id, kind)
-        if id.is_a?(Hash)
-          tokens = id['id'].split(':')
-          [ id['account'], kind, tokens[0], tokens[1..-1].join(':') ]
-        elsif id.is_a?(String)
-          paths = path_escape(id).split(':')
-          if paths.size < 2
-            raise "Expecting at least two tokens in #{id}"
-          elsif paths.size == 2
-            paths.unshift Conjur::Core::API.conjur_account
-          end
-          [ paths[0], kind, paths[1], paths[2..-1].join(':') ]
-        else
-          raise "Unexpected class #{id.class} for #{id}"
+        # Structured IDs (hashes) are no more supported
+        raise "Unexpected class #{id.class} for #{id}" unless id.is_a?(String)
+        paths = path_escape(id).split(':')
+        if paths.size < 2
+          raise "Expecting at least two tokens in #{id}"
+        elsif paths.size == 2
+          paths.unshift Conjur::Core::API.conjur_account
         end
+        # I would strongly recommend to encapsulate this into object 
+        [ paths[0], kind, paths[1], paths[2..-1].join(':') ]
       end
 
       def new_from_key(username, api_key)
         self.new username, api_key, nil
       end
@@ -80,6 +100,6 @@
     # Tokens are cached by username for a short period of time.
     def credentials
       { headers: { authorization: "Token token=\"#{Base64.strict_encode64 token.to_json}\"" }, username: username }
     end
   end
-end
+end
\ No newline at end of file