lib/amee/profile.rb in Floppy-amee-0.3.1 vs lib/amee/profile.rb in Floppy-amee-0.4.0

@@ -1,93 +1,95 @@
 module AMEE
-  class Profile < AMEE::ProfileObject
-    
-    def self.list(connection)
-      # Load data from path
-      response = connection.get('/profiles')      
-      # Parse data from response
-      profiles = []
-      if response.is_json?
-        # Read JSON
-        doc = JSON.parse(response)
-        doc['profiles'].each do |p|
+  module Profile
+    class Profile < AMEE::Profile::Object
+
+      def self.list(connection)
+        # Load data from path
+        response = connection.get('/profiles')
+        # Parse data from response
+        profiles = []
+        if response.is_json?
+          # Read JSON
+          doc = JSON.parse(response)
+          doc['profiles'].each do |p|
+            data = {}
+            data[:uid] = p['uid']
+            data[:created] = DateTime.parse(p['created'])
+            data[:modified] = DateTime.parse(p['modified'])
+            data[:name] = p['name']
+            data[:path] = "/#{p['path']}"
+            # Create profile
+            profile = Profile.new(data)
+            # Store in array
+            profiles << profile
+          end
+        else
+          # Read XML
+          doc = REXML::Document.new(response)
+          REXML::XPath.each(doc, '/Resources/ProfilesResource/Profiles/Profile') do |p|
+            data = {}
+            data[:uid] = p.attributes['uid'].to_s
+            data[:created] = DateTime.parse(p.attributes['created'].to_s)
+            data[:modified] = DateTime.parse(p.attributes['modified'].to_s)
+            data[:name] = p.elements['Name'].text || data[:uid]
+            data[:path] = "/#{p.elements['Path'].text || data[:uid]}"
+            # Create profile
+            profile = Profile.new(data)
+            # Store connection in profile object
+            profile.connection = connection
+            # Store in array
+            profiles << profile
+          end
+        end
+        # Done
+        return profiles
+      rescue
+        raise AMEE::BadData.new("Couldn't load Profile list.")
+      end
+
+      def self.create(connection)
+        # Create new profile
+        response = connection.post('/profiles', :profile => true)
+        # Parse data from response
+        if response.is_json?
+          # Read JSON
+          doc = JSON.parse(response)
+          p = doc['profile']
           data = {}
           data[:uid] = p['uid']
           data[:created] = DateTime.parse(p['created'])
           data[:modified] = DateTime.parse(p['modified'])
           data[:name] = p['name']
-          data[:path] = "/#{p['path']}"
+          data[:path] = p['path']
           # Create profile
-          profile = AMEE::Profile.new(data)
-          # Store in array
-          profiles << profile
-        end
-      else
-        # Read XML
-        doc = REXML::Document.new(response)
-        REXML::XPath.each(doc, '/Resources/ProfilesResource/Profiles/Profile') do |p|
+          profile = Profile.new(data)
+          # Done
+          return profile
+        else
+          # Read XML
+          doc = REXML::Document.new(response)
+          p = REXML::XPath.first(doc, '/Resources/ProfilesResource/Profile')
           data = {}
           data[:uid] = p.attributes['uid'].to_s
           data[:created] = DateTime.parse(p.attributes['created'].to_s)
           data[:modified] = DateTime.parse(p.attributes['modified'].to_s)
           data[:name] = p.elements['Name'].text || data[:uid]
-          data[:path] = "/#{p.elements['Path'].text || data[:uid]}"
+          data[:path] = p.elements['Path'].text || data[:uid]
           # Create profile
-          profile = AMEE::Profile.new(data)
+          profile = Profile.new(data)
           # Store connection in profile object
           profile.connection = connection
-          # Store in array
-          profiles << profile
+          # Done
+          return profile
         end
+      rescue
+        raise AMEE::BadData.new("Couldn't create Profile.")
       end
-      # Done
-      return profiles
-    rescue
-      raise AMEE::BadData.new("Couldn't load Profile list.")
-    end
 
-    def self.create(connection)
-      # Create new profile
-      response = connection.post('/profiles', :profile => true)
-      # Parse data from response
-      if response.is_json?
-        # Read JSON
-        doc = JSON.parse(response)
-        p = doc['profile']
-        data = {}
-        data[:uid] = p['uid']
-        data[:created] = DateTime.parse(p['created'])
-        data[:modified] = DateTime.parse(p['modified'])
-        data[:name] = p['name']
-        data[:path] = p['path']
-        # Create profile
-        profile = AMEE::Profile.new(data)
-        # Done
-        return profile
-      else
-        # Read XML
-        doc = REXML::Document.new(response)
-        p = REXML::XPath.first(doc, '/Resources/ProfilesResource/Profile')
-        data = {}
-        data[:uid] = p.attributes['uid'].to_s
-        data[:created] = DateTime.parse(p.attributes['created'].to_s)
-        data[:modified] = DateTime.parse(p.attributes['modified'].to_s)
-        data[:name] = p.elements['Name'].text || data[:uid]
-        data[:path] = p.elements['Path'].text || data[:uid]
-        # Create profile
-        profile = AMEE::Profile.new(data)
-        # Store connection in profile object
-        profile.connection = connection
-        # Done
-        return profile
-      end
-    rescue
-      raise AMEE::BadData.new("Couldn't create Profile.")
+  #    def delete
+  #      # Create new profile
+  #      response = connection.delete(full_path)
+  #    end
+
     end
-   
-#    def delete
-#      # Create new profile
-#      response = connection.delete(full_path)
-#    end
-    
   end
 end