sakai-info 0.1.0 → 0.2.0

data/lib/sakai-info/announcement.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Announcement library
 #
 # Created 2012-02-16 daveadams@gmail.com
-# Last updated 2012-02-16 daveadams@gmail.com
+# Last updated 2012-02-24 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -18,19 +18,16 @@ module SakaiInfo
 
     def self.find(id)
       if @@cache[id].nil?
-        next_id = nil
         xml = ""
-        DB.connect.exec("select next_id, xml from announcement_channel " +
-                        "where channel_id = :id", id) do |row|
-          nextid = row[0].to_i
-          REXML::Document.new(row[1].read).write(xml, 2)
-        end
-        if nextid.nil?
+        row = DB.connect[:announcement_channel].filter(:channel_id => id).first
+        if row.nil?
           raise ObjectNotFoundException.new(AnnouncementChannel, id)
         end
-        new_announcement = AnnouncementChannel.new(id, nextid, xml)
-        @@cache[id] = new_announcement
-        @@site_cache[new_announcement.site_id] = new_announcement
+        nextid = row[:next_id].to_i
+        REXML::Document.new(row[:xml].read).write(xml, 2)
+        channel = AnnouncementChannel.new(id, nextid, xml)
+        @@cache[id] = channel
+        @@site_cache[channel.site_id] = channel
       end
       @@cache[id]
     end
@@ -91,22 +88,21 @@ module SakaiInfo
     @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
-        channel = draft = pubview = owner = date = nil
         xml = ""
-        DB.connect.exec("select channel_id, draft, pubview, owner, " +
-                        "to_char(message_date,'YYYY-MM-DD HH24:MI:SS'), xml " +
-                        "from announcement_message " +
-                        "where message_id = :id", id) do |row|
-          channel = AnnouncementChannel.find(row[0])
-          draft = row[1]
-          pubview = row[2]
-          owner = User.find(row[3])
-          date = row[4]
-          REXML::Document.new(row[5].read).write(xml, 2)
-        end
-        if date.nil?
+        row = DB.connect.fetch("select channel_id, draft, pubview, owner, xml, " +
+                               "to_char(message_date,'YYYY-MM-DD HH24:MI:SS') as message_date " +
+                               "from announcement_message " +
+                               "where message_id = ?", id).first
+        if row.nil?
           raise ObjectNotFoundException.new(Announcement, id)
         end
+
+        channel = AnnouncementChannel.find(row[:channel_id])
+        draft = row[:draft]
+        pubview = row[:pubview]
+        owner = User.find(row[:owner])
+        date = row[:message_date]
+        REXML::Document.new(row[:xml].read).write(xml, 2)
         @@cache[id] = Announcement.new(id, channel, draft, pubview, owner, date, xml)
       end
       @@cache[id]
@@ -129,17 +125,17 @@ module SakaiInfo
       announcements = []
       channel = AnnouncementChannel.find(channel_id)
 
-      DB.connect.exec("select message_id, draft, pubview, owner, " +
-                      "to_char(message_date,'YYYY-MM-DD HH24:MI:SS'), xml " +
-                      "from announcement_message " +
-                      "where channel_id = :channel_id", channel_id) do |row|
+      DB.connect.fetch("select message_id, draft, pubview, owner, xml, " +
+                       "to_char(message_date,'YYYY-MM-DD HH24:MI:SS') as message_date " +
+                       "from announcement_message " +
+                       "where channel_id = ?", channel_id) do |row|
         xml = ""
-        id = row[0]
-        draft = row[1]
-        pubview = row[2]
-        owner = User.find(row[3])
-        date = row[4]
-        REXML::Document.new(row[5].read).write(xml, 2)
+        id = row[:message_id]
+        draft = row[:draft]
+        pubview = row[:pubview]
+        owner = User.find(row[:owner])
+        REXML::Document.new(row[:xml].read).write(xml, 2)
+        date = row[:message_date]
 
         @@cache[id] = Announcement.new(id, channel, draft, pubview, owner, date, xml)
         announcements << @@cache[id]

data/lib/sakai-info/assignment.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Assignment library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-02-17 daveadams@gmail.com
+# Last updated 2012-02-24 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -16,16 +16,13 @@ module SakaiInfo
     @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
-        site = nil
         xml = ""
-        DB.connect.exec("select context, xml from assignment_assignment " +
-                      "where assignment_id = :id", id) do |row|
-          site = Site.find(row[0])
-          REXML::Document.new(row[1].read).write(xml, 2)
-        end
-        if site.nil?
+        row = DB.connect[:assignment_assigment].filter(:assignment_id => id).first
+        if row.nil?
           raise ObjectNotFoundException.new(Assignment, id)
         end
+        site = Site.find(row[:context])
+        REXML::Document.new(row[:xml].read).write(xml, 2)
         @@cache[id] = Assignment.new(id, site, xml)
       end
       @@cache[id]
@@ -42,24 +39,18 @@ module SakaiInfo
     # set lookup
     def self.find_by_site_id(site_id)
       assignments = []
-      DB.connect.exec("select assignment_id, context, xml from assignment_assignment " +
-                      "where context = :site_id", site_id) do |row|
-        id = row[0]
-        site = Site.find(row[1])
+      site = Site.find(site_id)
+      DB.connect[:assignment_assignment].filter(:context => site_id).all.each do |row|
+        id = row[:assignment_id]
         xml = ""
-        REXML::Document.new(row[2].read).write(xml, 2)
+        REXML::Document.new(row[:xml].read).write(xml, 2)
         assignments << Assignment.new(id, site, xml)
       end
       return assignments
     end
 
     def self.count_by_site_id(site_id)
-      assignment_count = 0
-      DB.connect.exec("select count(*) from assignment_assignment " +
-                      "where context = :site_id", site_id) do |row|
-        assignment_count = row[0].to_i
-      end
-      return assignment_count
+      DB.connect[:assignment_assignment].filter(:context => site_id).count
     end
 
     # getters
@@ -115,19 +106,17 @@ module SakaiInfo
       if @@cache[id].nil?
         assignment = submitter = submitted_at = submitted = graded = nil
         xml = ""
-        DB.connect.exec("select context, xml, submitter_id, " +
-                        "submitted, graded from assignment_submission " +
-                        "where submission_id = :id", id) do |row|
-          assignment = Assignment.find(row[0])
-          xml = ""
-          REXML::Document.new(row[1].read).write(xml, 2)
-          submitter = User.find(row[2])
-          submitted = (row[3] == "true")
-          graded = (row[4] == "true")
-        end
-        if assignment.nil?
+        row = DB.connect[:assignment_submission].filter(:submission_id => id).first
+        if row.nil?
           raise ObjectNotFoundException.new(AssignmentSubmission, id)
         end
+
+        assignment = Assignment.find(row[:context])
+        REXML::Document.new(row[:xml].read).write(xml, 2)
+        submitter = User.find(row[:submitter_id])
+        submitted = (row[:submitted] == "true")
+        graded = (row[:graded] == "true")
+
         @@cache[id] = AssignmentSubmission.new(id, assignment, xml, submitter, submitted, graded)
       end
       @@cache[id]
@@ -147,54 +136,40 @@ module SakaiInfo
 
     def self.find_by_assignment_id(assignment_id)
       submissions = []
-      DB.connect.exec("select submission_id, context, xml, submitter_id, " +
-                      "submitted, graded from assignment_submission " +
-                      "where context = :assignment_id", assignment_id) do |row|
-        id = row[0]
-        assignment = Assignment.find(row[1])
+      assignment = Assignment.find(assignment_id)
+      DB.connect[:assignment_submission].filter(:context => assignment_id).all.each do |row|
+        id = row[:submission_id]
         xml = ""
-        REXML::Document.new(row[2].read).write(xml, 2)
-        submitter = User.find(row[3])
-        submitted = (row[4] == "true")
-        graded = (row[5] == "true")
+        REXML::Document.new(row[:xml].read).write(xml, 2)
+        submitter = User.find(row[:submitter_id])
+        submitted = (row[:submitted] == "true")
+        graded = (row[:graded] == "true")
         submissions << AssignmentSubmission.new(id, assignment, xml, submitter, submitted, graded)
       end
       return submissions
     end
 
     def self.count_by_assignment_id(assignment_id)
-      submission_count = 0
-      DB.connect.exec("select count(*) from assignment_submission " +
-                      "where context = :assignment_id", assignment_id) do |row|
-        submission_count = row[0].to_i
-      end
-      return submission_count
+      DB.connect[:assignment_submission].filter(:context => assignment_id).count
     end
 
     def self.find_by_user_id(user_id)
       submissions = []
-      DB.connect.exec("select submission_id, context, xml, submitter_id, " +
-                      "submitted, graded from assignment_submission " +
-                      "where submitter_id = :user_id", user_id) do |row|
-        id = row[0]
-        assignment = Assignment.find(row[1])
+      submitter = User.find(user_id)
+      DB.connect[:assignment_submission].filter(:submitter_id => user_id).all.each do |row|
+        id = row[:submission_id]
+        assignment = Assignment.find(row[:context])
         xml = ""
-        REXML::Document.new(row[2].read).write(xml, 2)
-        submitter = User.find(row[3])
-        submitted = (row[4] == "true")
-        graded = (row[5] == "true")
+        REXML::Document.new(row[:xml].read).write(xml, 2)
+        submitted = (row[:submitted] == "true")
+        graded = (row[:graded] == "true")
         submissions << AssignmentSubmission.new(id, assignment, xml, submitter, submitted, graded)
       end
       return submissions
     end
 
     def self.count_by_user_id(user_id)
-      submission_count = 0
-      DB.connect.exec("select count(*) from assignment_submission " +
-                      "where submitter_id = :user_id", user_id) do |row|
-        submission_count = row[0].to_i
-      end
-      return submission_count
+      DB.connect[:assignment_submission].filter(:submitter_id => user_id).count
     end
 
     # yaml/json serialization
@@ -236,41 +211,31 @@ module SakaiInfo
     @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
-        context = nil
-        xml = ""
-        DB.connect.exec("select context, xml from assignment_content " +
-                      "where content_id = :id", id) do |row|
-          context = row[0]
-          REXML::Document.new(row[1].read).write(xml, 2)
-        end
-        if context.nil?
+        row = DB.connect[:assignment_content].filter(:content_id => id).first
+        if row.nil?
           raise ObjectNotFoundException.new(AssignmentContent, id)
         end
-        @@cache[id] = AssignmentContent.new(id, context, xml)
+        xml = ""
+        REXML::Document.new(row[:xml].read).write(xml, 2)
+        @@cache[id] = AssignmentContent.new(id, row[:context], xml)
       end
       @@cache[id]
     end
 
     def self.find_by_user_id(user_id)
       contents = []
-      DB.connect.exec("select content_id, context, xml from assignment_content " +
-                      "where context = :user_id", user_id) do |row|
-        id = row[0]
-        context = row[1]
+      DB.connect[:assignment_content].filter(:context => user_id).all.each do |row|
+        id = row[:content_id]
+        context = row[:context]
         xml = ""
-        REXML::Document.new(row[2].read).write(xml, 2)
+        REXML::Document.new(row[:xml].read).write(xml, 2)
         contents << AssignmentContent.new(id, context, xml)
       end
       return contents
     end
 
     def self.count_by_user_id(user_id)
-      content_count = 0
-      DB.connect.exec("select count(*) from assignment_content " +
-                      "where context = :user_id", user_id) do |row|
-        content_count = row[0].to_i
-      end
-      content_count
+      DB.connect[:assignment_content].filter(:context => user_id).count
     end
 
     # getters

data/lib/sakai-info/authz.rb

@@ -26,15 +26,12 @@ module SakaiInfo
     def self.find_by_id(id)
       id = id.to_s
       if @@cache[id].nil?
-        name = nil
-        DB.connect.exec("select role_name from sakai_realm_role " +
-                        "where role_key = :id", id.to_i) do |row|
-          name = row[0]
-        end
-        if name.nil?
+        row = DB.connect.fetch("select role_name from sakai_realm_role " +
+                               "where role_key = ?", id.to_i).first
+        if row.nil?
           raise ObjectNotFoundException.new(AuthzRole, id)
         end
-        @@cache[id] = AuthzRole.new(id, name)
+        @@cache[id] = AuthzRole.new(id, row[:role_name])
         @@cache[name] = @@cache[id]
       end
       @@cache[id]
@@ -45,14 +42,12 @@ module SakaiInfo
         raise ObjectNotFoundException.new(AuthzRole, "")
       end
       if @@cache[name].nil?
-        id = nil
-        DB.connect.exec("select role_key from sakai_realm_role " +
-                        "where role_name = :name", name) do |row|
-          id = row[0].to_i.to_s
-        end
-        if id.nil?
+        row = DB.connect.fetch("select role_key from sakai_realm_role " +
+                               "where role_name = ?", name).first
+        if row.nil?
           raise ObjectNotFoundException.new(AuthzRole, name)
         end
+        id = row[:role_key].to_i.to_s
         @@cache[name] = AuthzRole.new(id, name)
         @@cache[id] = @@cache[name]
       end
@@ -76,13 +71,13 @@ module SakaiInfo
 
     def self.find_by_realm_id_and_function_id(realm_id, function_id)
       roles = []
-      DB.connect.exec("select role_key, role_name from " +
-                      "sakai_realm_role where role_key in " +
-                      "(select role_key from sakai_realm_rl_fn " +
-                      "where realm_key=:realm_id and function_key=:function_id) " +
-                      "order by role_name", realm_id, function_id) do |row|
-        role_id = row[0].to_i.to_s
-        role_name = row[1]
+      DB.connect.fetch("select role_key, role_name from " +
+                       "sakai_realm_role where role_key in " +
+                       "(select role_key from sakai_realm_rl_fn " +
+                       "where realm_key=? and function_key=?) " +
+                       "order by role_name", realm_id, function_id) do |row|
+        role_id = row[:role_key].to_i.to_s
+        role_name = row[:role_name]
         roles << AuthzRole.new(role_id, role_name)
       end
       roles
@@ -105,16 +100,13 @@ module SakaiInfo
     def self.find_by_id(id)
       id = id.to_s
       if @@cache[id].nil?
-        name = nil
-        DB.connect.exec("select function_name from sakai_realm_function " +
-                        "where function_key = :id", id.to_i) do |row|
-          name = row[0]
-        end
-        if name.nil?
+        row = DB.connect.fetch("select function_name from sakai_realm_function " +
+                               "where function_key = ?", id.to_i).first
+        if row.nil?
           raise ObjectNotFoundException.new(AuthzFunction, id)
         end
-        @@cache[id] = AuthzFunction.new(id, name)
-        @@cache[name] = @@cache[id]
+        @@cache[id] = AuthzFunction.new(id, row[:function_name])
+        @@cache[row[:function_name]] = @@cache[id]
       end
       @@cache[id]
     end
@@ -122,13 +114,12 @@ module SakaiInfo
     def self.find_by_name(name)
       if @@cache[name].nil?
         id = nil
-        DB.connect.exec("select function_key from sakai_realm_function " +
-                        "where function_name = :name", name) do |row|
-          id = row[0].to_i.to_s
-        end
-        if id.nil?
+        row = DB.connect.fetch("select function_key from sakai_realm_function " +
+                               "where function_name = ?", name).first
+        if row.nil?
           raise ObjectNotFoundException.new(AuthzFunction, name)
         end
+        id = row[:function_key].to_i.to_s
         @@cache[name] = AuthzFunction.new(id, name)
         @@cache[id] = @@cache[name]
       end
@@ -151,24 +142,19 @@ module SakaiInfo
     end
 
     def self.count_by_realm_id_and_role_id(realm_id, role_id)
-      count = 0
-      DB.connect.exec("select count(*) from sakai_realm_rl_fn " +
-                      "where realm_key=:realm_id and role_key=:role_id",
-                      realm_id, role_id) do |row|
-        count = row[0].to_i
-      end
-      count
+      DB.connect[:sakai_realm_rl_fn].
+        filter(:realm_key => realm_id, :role_key => role_id).count
     end
 
     def self.find_by_realm_id_and_role_id(realm_id, role_id)
       functions = []
-      DB.connect.exec("select function_key, function_name from " +
-                      "sakai_realm_function where function_key in " +
-                      "(select function_key from sakai_realm_rl_fn " +
-                      "where realm_key=:realm_id and role_key=:role_id) " +
-                      "order by function_name", realm_id, role_id) do |row|
-        function_id = row[0].to_i.to_s
-        function_name = row[1]
+      DB.connect.fetch("select function_key, function_name from " +
+                       "sakai_realm_function where function_key in " +
+                       "(select function_key from sakai_realm_rl_fn " +
+                       "where realm_key=? and role_key=?) " +
+                       "order by function_name", realm_id, role_id) do |row|
+        function_id = row[:function_key].to_i.to_s
+        function_name = row[:function_name]
         functions << AuthzFunction.new(function_id, function_name)
       end
       functions
@@ -209,21 +195,21 @@ module SakaiInfo
     def self.find_by_id(id)
       id = id.to_s
       if @@cache[id].nil?
-        name = providers = maintain_role = nil
-        DB.connect.exec("select realm_id, provider_id, maintain_role " +
-                        "from sakai_realm " +
-                        "where realm_key = :id", id.to_i) do |row|
-          name = row[0]
-          providers = row[1]
-          if row[2].nil? or row[2] == ""
-            maintain_role = nil
-          else
-            maintain_role = AuthzRole.find_by_id(row[2].to_i)
-          end
-        end
-        if name.nil?
+        row = DB.connect.fetch("select realm_id, provider_id, maintain_role " +
+                               "from sakai_realm " +
+                               "where realm_key = ?", id.to_i).first
+        if row.nil?
           raise ObjectNotFoundException.new(AuthzRealm, id)
         end
+
+        name = row[:realm_id]
+        providers = row[:provider_id]
+        maintain_role = nil
+        if row[:maintain_role].nil? or row[:maintain_role] == ""
+          maintain_role = nil
+        else
+          maintain_role = AuthzRole.find_by_id(row[:maintain_role].to_i)
+        end
         @@cache[id] = AuthzRealm.new(id, name, providers, maintain_role)
         @@cache[name] = @@cache[id]
       end
@@ -232,21 +218,21 @@ module SakaiInfo
 
     def self.find_by_name(name)
       if @@cache[name].nil?
-        id = providers = maintain_role = nil
-        DB.connect.exec("select realm_key, provider_id, maintain_role " +
-                        "from sakai_realm " +
-                        "where realm_id = :name", name) do |row|
-          id = row[0].to_i.to_s
-          providers = row[1]
-          if row[2].nil? or row[2] == ""
-            maintain_role = nil
-          else
-            maintain_role = AuthzRole.find_by_id(row[2].to_i)
-          end
-        end
-        if id.nil?
+        row = DB.connect.fetch("select realm_key, provider_id, maintain_role " +
+                               "from sakai_realm " +
+                               "where realm_id = ?", name).first
+        if row.nil?
           raise ObjectNotFoundException.new(AuthzRealm, name)
         end
+
+        id = row[:realm_key].to_i.to_s
+        providers = row[:provider_id]
+        maintain_role = nil
+        if row[:maintain_role].nil? or row[:maintain_role] == ""
+          maintain_role = nil
+        else
+          maintain_role = AuthzRole.find_by_id(row[:maintain_role].to_i)
+        end
         @@cache[name] = AuthzRealm.new(id, name, providers, maintain_role)
         @@cache[id] = @@cache[name]
       end
@@ -304,11 +290,11 @@ module SakaiInfo
     def self.find_by_realm_id(realm_id)
       realm_roles = []
       realm = AuthzRealm.find_by_id(realm_id)
-      DB.connect.exec("select distinct role_key from " +
-                      "sakai_realm_rl_fn where " +
-                      "realm_key = :realm_id", realm_id) do |row|
+      DB.connect.fetch("select distinct role_key from " +
+                       "sakai_realm_rl_fn where " +
+                       "realm_key = ?", realm_id) do |row|
         begin
-          role = AuthzRole.find_by_id(row[0].to_i)
+          role = AuthzRole.find_by_id(row[:role_key].to_i)
           realm_roles << AuthzRealmRole.new(realm, role)
         rescue AuthzRoleNotFoundException
         end
@@ -345,32 +331,29 @@ module SakaiInfo
 
     def self.find_by_realm_id(realm_id)
       results = []
-      DB.connect.exec("select srrg.user_id, srr.role_name " +
-                      "from sakai_realm_rl_gr srrg, sakai_realm_role srr " +
-                      "where srrg.role_key = srr.role_key " +
-                      "and srrg.realm_key = :realm_id", realm_id) do |row|
-        results << AuthzRealmMembership.new(realm_id, row[0], row[1])
+      DB.connect.fetch("select srrg.user_id as user_id, " +
+                       "srr.role_name as role_name " +
+                       "from sakai_realm_rl_gr srrg, sakai_realm_role srr " +
+                       "where srrg.role_key = srr.role_key " +
+                       "and srrg.realm_key = ?", realm_id) do |row|
+        results << AuthzRealmMembership.new(realm_id, row[:user_id], row[:role_name])
       end
       results
     end
 
     def self.count_by_realm_id(realm_id)
-      count = 0
-      DB.connect.exec("select count(*) from sakai_realm_rl_gr " +
-                      "where realm_key = :realm_id", realm_id) do |row|
-        count = row[0].to_i
-      end
-      count
+      DB.connect[:sakai_realm_rl_gr].filter(:realm_key => realm_id).count
     end
 
     def self.find_by_user_id(user_id)
       results = []
-      DB.connect.exec("select sr.realm_id, srr.role_name " +
-                      "from sakai_realm_rl_gr srrg, sakai_realm_role srr, sakai_realm sr " +
-                      "where srrg.role_key = srr.role_key " +
-                      "and srrg.realm_key = sr.realm_key " +
-                      "and srrg.user_id = :user_id", user_id) do |row|
-        results << AuthzRealmMembership.new(row[0], user_id, row[1])
+      DB.connect.fetch("select sr.realm_id as realm_id, " +
+                       "srr.role_name as role_name " +
+                       "from sakai_realm_rl_gr srrg, sakai_realm_role srr, sakai_realm sr " +
+                       "where srrg.role_key = srr.role_key " +
+                       "and srrg.realm_key = sr.realm_key " +
+                       "and srrg.user_id = ?", user_id) do |row|
+        results << AuthzRealmMembership.new(row[:realm_id], user_id, row[:role_name])
       end
       results
     end