sakai-info 0.1.0 → 0.2.0

data/lib/sakai-info/group.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Group 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
 #
@@ -27,16 +27,11 @@ module SakaiInfo
     @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
-        site_id = title = nil
-        DB.connect.exec("select site_id, title from sakai_site_group " +
-                        "where group_id = :id", id) do |row|
-          site_id = row[0]
-          title = row[1]
-          @@cache[id] = Group.new(id, site_id, title)
-        end
-        if site_id.nil? or name.nil?
+        row = DB.connect[:sakai_site_group].filter(:group_id => id).first
+        if row.nil?
           raise ObjectNotFoundException.new(Group, id)
         end
+        @@cache[id] = Group.new(id, row[:site_id], row[:title])
       end
       @@cache[id]
     end
@@ -46,25 +41,17 @@ module SakaiInfo
       if @@cache_by_site_id[site_id].nil?
         @@cache_by_site_id[site_id] = []
         site = Site.find(site_id)
-        DB.connect.exec("select group_id, title " +
-                        "from sakai_site_group " +
-                        "where site_id = :site_id", site_id) do |row|
-          id = row[0]
-          title = row[1]
-          @@cache[id] = Group.new(id, site, title)
-          @@cache_by_site_id[site_id] << @@cache[id]
+
+        DB.connect[:sakai_site_group].filter(:site_id => site_id).all.each do |row|
+          @@cache[row[:group_id]] = Group.new(row[:group_id], site, row[:title])
+          @@cache_by_site_id[site_id] << @@cache[row[:group_id]]
         end
       end
       @@cache_by_site_id[site_id]
     end
 
     def self.count_by_site_id(site_id)
-      count = 0
-      DB.connect.exec("select count(*) from sakai_site_group " +
-                      "where site_id=:site_id", site_id) do |row|
-        count = row[0].to_i
-      end
-      count
+      DB.connect[:sakai_site_group].filter(:site_id => site_id).count
     end
 
     def properties
@@ -100,20 +87,22 @@ module SakaiInfo
   end
 
   class GroupProperty
-    attr_reader :name, :value
-
-    def initialize(name, value)
-      @name = name
-      @value = value
+    def self.get(group_id, property_name)
+      row = DB.connect[:sakai_site_group_property].
+        filter(:group_id => group_id, :name => property_name).first
+      if row.nil?
+        nil
+      else
+        row[:value].read
+      end
     end
 
     def self.find_by_group_id(group_id)
-      properties = []
-      DB.connect.exec("select name, value from sakai_site_group_property " +
-                      "where group_id=:group_id", group_id) do |row|
-        properties << GroupProperty.new(row[0], row[1].read)
+      properties = {}
+      DB.connect[:sakai_site_group_property].where(:group_id => group_id).all.each do |row|
+        properties[row[:name]] = row[:value].read
       end
-      properties
+      return properties
     end
   end
 end

data/lib/sakai-info/message.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Message library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-02-18 daveadams@gmail.com
+# Last updated 2012-02-24 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -36,14 +36,10 @@ module SakaiInfo
         raise UnknownMessageTypeException
       end
 
-      count = 0
-      DB.connect.exec("select count(*) from mfr_message_t " +
-                      "where message_dtype = :t " +
-                      "and to_char(created,'YYYY-MM-DD') = :d",
-                      message_type, date_str) do |row|
-        count = row[0].to_i
-      end
-      count
+      DB.connect.fetch("select count(*) as count from mfr_message_t " +
+                       "where message_dtype = ? and " +
+                       "to_char(created,'YYYY-MM-DD') = ? ",
+                       message_type, date_str).first[:count].to_i
     end
 
    private
@@ -75,28 +71,23 @@ module SakaiInfo
     @@cache = {}
 
     def self.count_by_site_id(site_id)
-      count = 0
-      DB.connect.exec("select count(*) from mfr_open_forum_t " +
-                      "where surrogatekey = (select id from mfr_area_t " +
-                      "where type_uuid = :type_uuid " +
-                      "and context_id = :site_id)",
-                      MessageTypeUUID::FORUM_POST, site_id) do |row|
-        count = row[0].to_i
-      end
-      count
+      DB.connect.fetch("select count(*) as count from mfr_open_forum_t " +
+                       "where surrogatekey = (select id from mfr_area_t " +
+                       "where type_uuid = ? and context_id = ?)",
+                       MessageTypeUUID::FORUM_POST, site_id).first[:count].to_i
     end
 
     @@cache_by_site_id = {}
     def self.find_by_site_id(site_id)
       if @@cache_by_site_id[site_id].nil?
         @@cache_by_site_id[site_id] = []
-        DB.connect.exec("select id, title from mfr_open_forum_t " +
-                        "where surrogatekey = (select id from mfr_area_t " +
-                        "where type_uuid = :type_uuid " +
-                        "and context_id = :site_id) order by sort_index",
-                        MessageTypeUUID::FORUM_POST, site_id) do |row|
-          id = row[0].to_i.to_s
-          title = row[1]
+        DB.connect.fetch("select id, title from mfr_open_forum_t " +
+                         "where surrogatekey = (select id from mfr_area_t " +
+                         "where type_uuid = ? " +
+                         "and context_id = ?) order by sort_index",
+                         MessageTypeUUID::FORUM_POST, site_id) do |row|
+          id = row[:id].to_i.to_s
+          title = row[:title]
           @@cache[id] = Forum.new(id, title)
           @@cache_by_site_id[site_id] << @@cache[id]
         end

data/lib/sakai-info/sakai_object.rb

@@ -47,12 +47,19 @@ module SakaiInfo
       object_type_serialization
     end
 
-    def to_yaml
-      serialize.to_yaml
+    def to_yaml(*q)
+      serialize(q).to_yaml
     end
 
-    def to_json
-      serialize.to_json
+    def to_json(*q)
+      serialize(q).to_json
+    end
+
+    # support for CLI -- returns an array of symbols that can be
+    # passed back to #serialize, #to_yaml, or #to_json
+    # should be reimplemented in all object classes
+    def self.all_serializations
+      [:default]
     end
   end
 end

data/lib/sakai-info/samigo.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Samigo library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-02-18 daveadams@gmail.com
+# Last updated 2012-02-24 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -22,13 +22,11 @@ module SakaiInfo
     @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
-        DB.connect.exec("select title, agent_id from sam_assessmentbase_t " +
-                        "where id=:quizid", id) do |row|
-          @@cache[id] = PendingQuiz.new(id, row[0], Site.find(row[1]))
-        end
-        if @@cache[id].nil?
+        row = DB.connect[:sam_assessmentbase_t].filter(:id => id).first
+        if row.nil?
           raise ObjectNotFoundException.new(PendingQuiz, id)
         end
+        @@cache[id] = PendingQuiz.new(id, row[0], Site.find(row[1]))
       end
       @@cache[id]
     end
@@ -36,25 +34,21 @@ module SakaiInfo
     def self.find_by_site_id(site_id)
       results = []
       site = Site.find(site_id)
-      DB.connect.exec("select id, title from sam_assessmentbase_t " +
-                      "where id in (select qualifierid from sam_authzdata_t " +
-                      "where agentid=:site_id and " +
-                      "functionid='EDIT_ASSESSMENT')", site_id) do |row|
-        @@cache[row[0]] = PendingQuiz.new(row[0].to_i, row[1], site)
-        results << @@cache[row[0]]
+      DB.connect.fetch("select id, title from sam_assessmentbase_t " +
+                       "where id in (select qualifierid from sam_authzdata_t " +
+                       "where agentid=? and functionid='EDIT_ASSESSMENT')",
+                       site_id) do |row|
+        @@cache[row[:id]] = PendingQuiz.new(row[:id].to_i, row[:title], site)
+        results << @@cache[row[:id]]
       end
       results
     end
 
     def self.count_by_site_id(site_id)
-      count = 0
-      DB.connect.exec("select count(*) from sam_publishedassessment_t " +
-                      "where id in (select qualifierid from sam_authzdata_t " +
-                      "where agentid=:site_id and " +
-                      "functionid='EDIT_ASSESSMENT')", site_id) do |row|
-        count = row[0].to_i
-      end
-      count
+      DB.connect.fetch("select count(*) as count from sam_publishedassessment_t " +
+                       "where id in (select qualifierid from sam_authzdata_t " +
+                       "where agentid=? and functionid='EDIT_ASSESSMENT')",
+                       site_id).first[:count].to_i
     end
 
     def default_serialization
@@ -85,13 +79,12 @@ module SakaiInfo
     @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
-        DB.connect.exec("select title, agent_id from sam_publishedassessment_t " +
-                        "where id=:quizid", id) do |row|
-          @@cache[id] = PublishedQuiz.new(id, row[0], Site.find(row[1]))
-        end
-        if @@cache[id].nil?
+        row = DB.connect[:sam_publishedassessment_t].filter(:id => id).first
+        if row.nil?
           raise ObjectNotFoundException.new(PublishedQuiz, id)
         end
+
+        @@cache[id] = PublishedQuiz.new(id, row[:title], Site.find(row[:agent_id]))
       end
       @@cache[id]
     end
@@ -99,25 +92,21 @@ module SakaiInfo
     def self.find_by_site_id(site_id)
       results = []
       site = Site.find(site_id)
-      DB.connect.exec("select id, title from sam_publishedassessment_t " +
-                      "where id in (select qualifierid from sam_authzdata_t " +
-                      "where agentid=:site_id and " +
-                      "functionid='OWN_PUBLISHED_ASSESSMENT')", site_id) do |row|
-        @@cache[row[0]] = PublishedQuiz.new(row[0].to_i, row[1], site)
-        results << @@cache[row[0]]
+      DB.connect.fetch("select id, title from sam_publishedassessment_t " +
+                       "where id in (select qualifierid from sam_authzdata_t " +
+                       "where agentid=? and functionid='OWN_PUBLISHED_ASSESSMENT')",
+                       site_id) do |row|
+        @@cache[row[:id]] = PublishedQuiz.new(row[:id].to_i, row[:title], site)
+        results << @@cache[row[:id]]
       end
       results
     end
 
     def self.count_by_site_id(site_id)
-      count = 0
-      DB.connect.exec("select count(*) from sam_publishedassessment_t " +
-                      "where id in (select qualifierid from sam_authzdata_t " +
-                      "where agentid=:site_id " +
-                      "and functionid='OWN_PUBLISHED_ASSESSMENT')", site_id) do |row|
-        count = row[0].to_i
-      end
-      count
+      DB.connect.fetch("select count(*) as count from sam_publishedassessment_t " +
+                       "where id in (select qualifierid from sam_authzdata_t " +
+                       "where agentid=? and functionid='OWN_PUBLISHED_ASSESSMENT')",
+                       site_id).first[:count].to_i
     end
 
     def default_serialization
@@ -148,13 +137,11 @@ module SakaiInfo
     @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
-        DB.connect.exec("select title, ownerid from sam_questionpool_t " +
-                        "where questionpoolid=:id", id) do |row|
-          @@cache[id] = QuestionPool.new(id, row[0], User.find(row[1]))
-        end
-        if @@cache[id].nil?
+        row = DB.connect[:sam_questionpool_t].filter(:id => id).first
+        if row.nil?
           raise ObjectNotFoundException.new(QuestionPool, id)
         end
+        @@cache[id] = QuestionPool.new(id, row[:title], User.find(row[:owner_id]))
       end
       @@cache[id]
     end
@@ -162,31 +149,21 @@ module SakaiInfo
     def self.find_by_user_id(user_id)
       results = []
       user = User.find(user_id)
-      DB.connect.exec("select questionpoolid, title from sam_questionpool_t " +
-                      "where ownerid=:userid", user_id) do |row|
-        @@cache[row[0]] = QuestionPool.new(row[0].to_i, row[1], user)
-        results << @@cache[row[0]]
+      DB.connect[:sam_questionpool_t].filter(:ownerid => user_id).all.each do |row|
+        @@cache[row[:questionpoolid]] =
+          QuestionPool.new(row[:questionpoolid].to_i, row[:title], user)
+        results << @@cache[row[:questionpoolid]]
       end
       results
     end
 
     def self.count_by_user_id(user_id)
-      count = 0
-      DB.connect.exec("select count(*) from sam_questionpool_t " +
-                      "where ownerid=:userid", user_id) do |row|
-        count = row[0].to_i
-      end
-      count
+      DB.connect[:sam_questionpool_t].filter(:ownerid => user_id).count
     end
 
     def item_count
-      if @item_count.nil?
-        DB.connect.exec("select count(*) from sam_questionpoolitem_t " +
-                        "where questionpoolid=:id", @id) do |row|
-          @item_count = row[0].to_i
-        end
-      end
-      @item_count
+      @item_count ||=
+        DB.connect[:sam_questionpoolitem_t].filter(:questionpoolid => @id).count
     end
 
     # serialization

data/lib/sakai-info/site.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Site 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
 #
@@ -17,24 +17,25 @@ module SakaiInfo
     @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
-        site_id = title = type = created_at = created_by_user_id =
-          modified_at = modified_by_user_id = joinable = join_role = nil
-        DB.connect.exec("select site_id, title, type, " +
-                        "createdby, to_char(createdon,'YYYY-MM-DD HH24:MI:SS'), " +
-                        "modifiedby, to_char(modifiedon,'YYYY-MM-DD HH24:MI:SS'), " +
-                        "joinable, join_role " +
-                        "from sakai_site where site_id = :site_id", id) do |row|
-          site_id, title, type, created_by_user_id, created_at, modified_by_user_id, modified_at, joinable_n, join_role = *row
-          if joinable_n.to_i == 1
-            joinable = true
-          else
-            joinable = false
-          end
-        end
-        if site_id.nil?
+        db = DB.connect
+        row = db.fetch("select site_id, title, type, " +
+                       "createdby,  modifiedby, " +
+                       "to_char(createdon,'YYYY-MM-DD HH24:MI:SS') as created_at, " +
+                       "to_char(modifiedon,'YYYY-MM-DD HH24:MI:SS') as modified_at, " +
+                       "joinable, join_role " +
+                       "from sakai_site where site_id=?", id).first
+        if row.nil?
           raise ObjectNotFoundException.new(Site, id)
         end
-        @@cache[id] = Site.new(id, title, type, created_by_user_id, created_at, modified_by_user_id, modified_at, joinable, join_role)
+
+        joinable = false
+        if row[:joinable].to_i == 1
+          joinable = true
+        end
+
+        @@cache[id] = Site.new(id, row[:title], row[:type], row[:createdby],
+                               row[:created_at], row[:modifiedby], row[:modified_at],
+                               joinable, row[:join_role])
       end
       @@cache[id]
     end
@@ -84,23 +85,13 @@ module SakaiInfo
     end
 
     def user_count
-      if @user_count.nil?
-        DB.connect.exec("select count(*) from sakai_site_user " +
-                        "where site_id=:siteid", @id) do |row|
-          @user_count = row[0].to_i
-        end
-      end
-      @user_count
+      @user_count ||=
+        DB.connect[:sakai_site_user].filter(:site_id => @id).count
     end
 
     def page_count
-      if @page_count.nil?
-        DB.connect.exec("select count(*) from sakai_site_page " +
-                        "where site_id=:siteid", @id) do |row|
-          @page_count = row[0].to_i
-        end
-      end
-      @page_count
+      @page_count ||=
+        DB.connect[:sakai_site_page].filter(:site_id => @id).count
     end
 
     def assignment_count
@@ -202,105 +193,68 @@ module SakaiInfo
     end
 
     # finders/counters
-    @@total_site_count = nil
     def self.count
-      if @@total_site_count.nil?
-        @@total_site_count = 0
-        DB.connect.exec("select count(*) from sakai_site") do |row|
-          @@total_site_count = row[0].to_i
-        end
-      end
-      @@total_site_count
+      DB.connect[:sakai_site].count
     end
 
     def self.count_by_user_id(user_id)
-      user_count = 0
-      DB.connect.exec("select count(*) from sakai_site_user " +
-                      "where user_id=:user_id", user_id) do |row|
-        user_count = row[0].to_i
-      end
-      user_count
+      DB.connect[:sakai_site_user].where(:user_id => user_id).count
     end
 
     def self.count_by_type(type)
-      type_count = 0
-      DB.connect.exec("select count(*) from sakai_site " +
-                      "where type=:type", type) do |row|
-        type_count = row[0].to_i
-      end
-      type_count
+      DB.connect[:sakai_site].where(:type => type).count
     end
 
-    def self.count_by_semester(term_eid)
-      prop_name = "term_eid"
-      sem_count = 0
-      DB.connect.exec("select count(*) from sakai_site_property " +
-                      "where name=:name and to_char(value)=:term_eid",
-                      prop_name, term_eid) do |row|
-        sem_count = row[0].to_i
-      end
-      sem_count
+    def self.count_by_property(name, value)
+      DB.connect[:sakai_site_property].
+        where(:name => name, :to_char.sql_function(:value) => value).count
+    end
+
+    def self.find_ids_by_property(property_name, property_value)
+      SiteProperty.find_site_ids_by_property(property_name, property_value)
+    end
+
+    def self.find_ids_by_semester(term_eid)
+      Site.find_ids_by_property("term_eid", term_eid)
     end
 
     def self.find_all_ids
-      ids = []
-      DB.connect.exec("select site_id from sakai_site") do |row|
-        ids << row[0]
-      end
-      ids
+      DB.connect[:sakai_site].select(:site_id).all.collect{|r| r[:site_id]}
     end
 
     def self.find_all_workspace_ids
-      ids = []
-      DB.connect.exec("select site_id from sakai_site where site_id like '~%'") do |row|
-        ids << row[0]
-      end
-      ids
+      DB.connect[:sakai_site].select(:site_id).
+        where(:site_id.like("~%")).all.collect{|r| r[:site_id]}
     end
 
     def self.find_all_non_workspace_ids
-      ids = []
-      DB.connect.exec("select site_id from sakai_site where site_id not like '~%'") do |row|
-        ids << row[0]
-      end
-      ids
+      DB.connect[:sakai_site].select(:site_id).
+        where(~:site_id.like("~%")).all.collect{|r| r[:site_id]}
     end
 
     def self.find_ids_by_type(type)
-      ids = []
-      DB.connect.exec("select site_id from sakai_site where type=:type", type) do |row|
-        ids << row[0]
-      end
-      ids
+      DB.connect[:sakai_site].select(:site_id).
+        where(:type => type).all.collect{|r| r[:site_id]}
     end
 
     def self.find_by_type(type)
       sites = []
-      DB.connect.exec("select site_id, title, type, " +
-                      "createdby, to_char(createdon,'YYYY-MM-DD HH24:MI:SS'), " +
-                      "modifiedby, to_char(modifiedon,'YYYY-MM-DD HH24:MI:SS'), " +
-                      "joinable, join_role " +
-                      "from sakai_site where type = :type", type) do |row|
+      DB.connect.fetch("select site_id, title, type, " +
+                       "createdby, modifiedby, " +
+                       "to_char(createdon,'YYYY-MM-DD HH24:MI:SS') as created_at, " +
+                       "to_char(modifiedon,'YYYY-MM-DD HH24:MI:SS') as modified_at, " +
+                       "joinable, join_role " +
+                       "from sakai_site where type = ?", type) do |row|
         joinable = false
-        site_id, title, type, created_by_user_id, created_at,
-        modified_by_user_id, modified_at, joinable_n, join_role = *row
         if joinable_n.to_i == 1
           joinable = true
         end
-        @@cache[site_id] = Site.new(site_id, title, type, created_by_user_id, created_at, modified_by_user_id, modified_at, joinable, join_role)
-        sites << @@cache[site_id]
+        @@cache[row[:site_id]] = Site.new(row[:site_id], row[:title], row[:type], row[:createdby], row[:created_at], row[:modifiedby], row[:modified_at], joinable, row[:join_role])
+        sites << @@cache[row[:site_id]]
       end
       sites
     end
 
-    def self.find_ids_by_property(property_name, property_value)
-      SiteProperty.find_site_ids_by_property(property_name, property_value)
-    end
-
-    def self.find_ids_by_semester(term_eid)
-      find_ids_by_property("term_eid", term_eid)
-    end
-
     # serialization methods
     def default_serialization
       result = {
@@ -378,7 +332,7 @@ module SakaiInfo
       result
     end
 
-    def disk_serialization
+    def disk_unformatted_serialization
       {
         "disk_usage" => {
           "resources" => self.resource_storage.size_on_disk,
@@ -393,10 +347,10 @@ module SakaiInfo
       }
     end
 
-    def disk_formatted_serialization
-      result = disk_serialization["disk_usage"]
+    def disk_serialization
+      result = disk_unformatted_serialization["disk_usage"]
       result.keys.each do |key|
-        result[key] = format_filesize(result[key])
+        result[key] = Util.format_filesize(result[key])
       end
       {
         "disk_usage" => result
@@ -433,7 +387,7 @@ module SakaiInfo
       end
     end
 
-    def realm_roles_serialization
+    def realm_serialization
       {
         "realm_roles" => self.realm.realm_roles.collect { |rr| rr.serialize(:summary) }
       }
@@ -448,39 +402,38 @@ module SakaiInfo
         {}
       end
     end
+
+    def self.all_serializations
+      [
+       :default, :users, :pages, :groups, :quizzes, :disk, :assignments,
+       :announcements, :gradebook, :realm, :forums
+      ]
+    end
   end
 
   class SiteProperty
     def self.get(site_id, property_name)
-      value = nil
-      DB.connect.exec("select value from sakai_site_property " +
-                      "where site_id=:site_id and name=:name",
-                      site_id, property_name) do |row|
-        value = row[0].read
+      row = DB.connect[:sakai_site_property].
+        where(:site_id => site_id, :name => property_name).first
+      if row.nil?
+        nil
+      else
+        row[:value].read
       end
-      return value
     end
 
     def self.find_by_site_id(site_id)
       properties = {}
-      DB.connect.exec("select name, value from sakai_site_property " +
-                      "where site_id=:site_id", site_id) do |row|
-        name = row[0]
-        value = row[1].read
-        properties[name] = value
+      DB.connect[:sakai_site_property].where(:site_id => site_id).all.each do |row|
+        properties[row[:name]] = row[:value].read
       end
       return properties
     end
 
     def self.find_site_ids_by_property(name, value)
-      ids = []
-      DB.connect.exec("select distinct(site_id) from sakai_site_property " +
-                      "where name=:name " +
-                      "and to_char(value)=:value",
-                      name, value) do |row|
-        ids << row[0]
-      end
-      ids
+      DB.connect[:sakai_site_property].
+        where(:name => name, :to_char.sql_function(:value) => value).
+        all.collect{|r| r[:site_id]}
     end
   end
 
@@ -490,18 +443,13 @@ module SakaiInfo
     @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
-        title = order = layout = site = nil
-        DB.connect.exec("select title, site_order, layout, site_id " +
-                        "from sakai_site_page where page_id = :page_id", id) do |row|
-          title = row[0]
-          order = row[1].to_i
-          layout = row[2]
-          site = Site.find(row[3])
-        end
-        if title.nil?
+        row = DB.connect[:sakai_site_page].where(:page_id => id).first
+        if row.nil?
           raise ObjectNotFoundException(Page, id)
         end
-        @@cache[id] = Page.new(id, title, order, layout, site)
+
+        site = Site.find(row[:site_id])
+        @@cache[id] = Page.new(id, row[:title], row[:order].to_i, row[:layout], site)
       end
       @@cache[id]
     end
@@ -509,11 +457,12 @@ module SakaiInfo
     def self.find_by_site_id(site_id)
       results = []
       site = Site.find(site_id)
-      DB.connect.exec("select page_id, title, site_order, layout " +
-                      "from sakai_site_page where site_id = :site_id " +
-                      "order by site_order", site_id) do |row|
-        @@cache[row[0]] = Page.new(row[0], row[1], row[2].to_i, row[3], site)
-        results << @@cache[row[0]]
+      DB.connect[:sakai_site_page].
+        where(:site_id => site_id).order(:site_order).all.each do |row|
+        @@cache[row[:page_id]] =
+          Page.new(row[:page_id], row[:title], row[:site_order].to_i,
+                   row[:layout], site)
+        results << @@cache[row[:page_id]]
       end
       results
     end
@@ -557,21 +506,19 @@ module SakaiInfo
 
   class PageProperty
     def self.get(page_id, property_name)
-      value = nil
-      DB.connect.exec("select value from sakai_site_page_property " +
-                      "where page_id=:page_id and name=:name", page_id, property_name) do |row|
-        value = row[0].read
+      row = DB.connect[:sakai_site_page_property].
+        filter(:page_id => page_id, :name => property_name).first
+      if row.nil?
+        nil
+      else
+        row[:value].read
       end
-      return value
     end
 
     def self.find_by_page_id(page_id)
       properties = {}
-      DB.connect.exec("select name, value from sakai_site_page_property " +
-                      "where page_id=:page_id", page_id) do |row|
-        name = row[0]
-        value = row[1].read
-        properties[name] = value
+      DB.connect[:sakai_site_page_property].where(:page_id => page_id).all.each do |row|
+        properties[row[:name]] = row[:value].read
       end
       return properties
     end
@@ -583,18 +530,15 @@ module SakaiInfo
     @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
-        tool_id = title = registration = page_order = layout_hints = page = nil
-        DB.connect.exec("select tool_id, title, registration, page_order, " +
-                        "layout_hints, page_id " +
-                        "from sakai_site_tool where tool_id = :tool_id", id) do |row|
-          tool_id, title, registration, page_order_s, layout_hints, page_id = *row
-          page_order = page_order_s.to_i
-          page = Page.find(page_id)
-        end
-        if tool_id.nil?
+        row = DB.connect[:sakai_site_tool].where(:tool_id => id).first
+        if row.nil?
           raise ObjectNotFoundException.new(Tool, id)
         end
-        @@cache[id] = Tool.new(tool_id, title, registration, page_order, layout_hints, page)
+
+        page = Page.find(row[:page_id])
+        @@cache[id] =
+          Tool.new(id, row[:title], row[:registration], row[:page_order].to_i,
+                   row[:layout_hints], page)
       end
       @@cache[id]
     end
@@ -602,11 +546,12 @@ module SakaiInfo
     def self.find_by_page_id(page_id)
       results = []
       page = Page.find(page_id)
-      DB.connect.exec("select tool_id, title, registration, page_order, layout_hints " +
-                      "from sakai_site_tool where page_id = :page_id " +
-                      "order by page_order", page_id) do |row|
-        @@cache[row[0]] = Tool.new(row[0], row[1], row[2], row[3].to_i, row[4], page)
-        results << @@cache[row[0]]
+      DB.connect[:sakai_site_tool].
+        where(:page_id => page_id).order(:page_order).all.each do |row|
+        @@cache[row[:tool_id]] =
+          Tool.new(row[:tool_id], row[:title], row[:registration], row[:page_order].to_i,
+                   row[:layout_hints], page)
+        results << @@cache[row[:tool_id]]
       end
       results
     end
@@ -657,22 +602,19 @@ module SakaiInfo
 
   class ToolProperty
     def self.get(tool_id, property_name)
-      value = nil
-      DB.connect.exec("select value from sakai_site_tool_property " +
-                      "where tool_id=:tool_id and name=:name",
-                      tool_id, property_name) do |row|
-        value = row[0].read
+      row = DB.connect[:sakai_site_tool_property].
+        filter(:tool_id => tool_id, :name => property_name).first
+      if row.nil?
+        nil
+      else
+        row[:value].read
       end
-      return value
     end
 
     def self.find_by_tool_id(tool_id)
       properties = {}
-      DB.connect.exec("select name, value from sakai_site_tool_property " +
-                      "where tool_id=:tool_id", tool_id) do |row|
-        name = row[0]
-        value = row[1].read
-        properties[name] = value
+      DB.connect[:sakai_site_tool_property].where(:tool_id => tool_id).all.each do |row|
+        properties[row[:name]] = row[:value].read
       end
       return properties
     end
@@ -689,26 +631,26 @@ module SakaiInfo
 
     def self.find_by_site_id(site_id)
       results = []
-      DB.connect.exec("select srrg.user_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 sr.realm_id = '/site/'||:site_id", site_id) do |row|
-        results << SiteMembership.new(site_id, row[0], row[1])
+      DB.connect.fetch("select srrg.user_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 sr.realm_id = '/site/' || ? ", site_id) do |row|
+        results << SiteMembership.new(site_id, row[:user_id], row[:role_name])
       end
       results
     end
 
     def self.find_by_user_id(user_id)
       results = []
-      DB.connect.exec("select substr(sr.realm_id,7), 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 = :1 " +
-                      "and sr.realm_id like '/site/%' " +
-                      "and sr.realm_id not like '%/group/%'", user_id) do |row|
-        results << SiteMembership.new(row[0], user_id, row[1])
+      DB.connect.fetch("select substr(sr.realm_id,7) as site_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 = ? " +
+                       "and sr.realm_id like '/site/%' " +
+                       "and sr.realm_id not like '%/group/%'", user_id) do |row|
+        results << SiteMembership.new(row[:site_id], user_id, row[:role_name])
       end
       results
     end