sakai-info 0.4.2 → 0.4.3

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # sakai-info Change History #
 
+### 0.4.3 ###
+
+*Released 2012-05-10*
+
+* Tweaked site summary serialization to display creator EID
+* Added attempted_at field to quiz attempt item serializations
+* Added CLI support for announcement and announcement-channel
+* Added clear_cache class method to all objects using caches
+* Added Cache.clear_all class and method to SakaiInfo module
+
 ### 0.4.2 ###
 
 *Released 2012-05-04*

data/README.md

@@ -1,6 +1,6 @@
 # sakai-info #
 
-last updated: 2012-05-04  
+last updated: 2012-05-10  
 author: David Adams (daveadams@gmail.com)  
 github url: https://github.com/daveadams/sakai-info
 
@@ -24,7 +24,7 @@ Use `rake` to test and build the gem:
     $ rake gem:build
 
 The resulting gem will be saved to the working directory as
-`sakai-info-0.4.2.gem`.
+`sakai-info-0.4.3.gem`.
 
 Cleanup built gems using:
 

data/ROADMAP.md

@@ -1,10 +1,6 @@
 # sakai-info Roadmap #
 
-*Last updated 2012-05-04*
-
-### 0.4.3 ###
-
-* CLI access to announcements
+*Last updated 2012-05-10*
 
 ### 0.4.4 ###
 
@@ -25,11 +21,11 @@
 
 ### 0.7.0 ###
 
-* Basic OSP support
+* OSP support
 
 ------
 
-Other things on the wishlist for future releases:
+Ideas for future releases:
 
 * More complete object relationship support for full drilldown capability
   * Gradebook/assignment/quiz interaction
@@ -37,6 +33,7 @@ Other things on the wishlist for future releases:
   * Assignment submissions per-assignment and per-student
 * Support for more Sakai objects
   * OSP
+  * Evaluations
   * Forum topics and posts
   * Private messages
   * Events
@@ -52,4 +49,6 @@ Other things on the wishlist for future releases:
   * httpd log analysis helper
   * RPC client for Sakai-monitoring servlet
   * schema analysis and generators
+  * web UI
+  * CLI shell
 

data/lib/sakai-info.rb

@@ -2,7 +2,7 @@
 #   Base library file
 #
 # Created 2012-02-15 daveadams@gmail.com
-# Last updated 2012-04-22 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -69,6 +69,17 @@ module SakaiInfo
       end
     end
   end
+
+  # cache control
+  class Cache
+    def self.clear_all
+      SakaiObject.descendants.select { |klass|
+        klass.methods.include? :clear_cache
+      }.each { |klass|
+        klass.clear_cache
+      }
+    end
+  end
 end
 
 ######################################################################

data/lib/sakai-info/announcement.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Announcement library
 #
 # Created 2012-02-16 daveadams@gmail.com
-# Last updated 2012-02-24 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -10,24 +10,29 @@
 #
 
 module SakaiInfo
-  class AnnouncementChannel < SakaiXMLEntity
-    attr_reader :next
+  class AnnouncementChannel < SakaiObject
+    attr_reader :dbrow
 
-    @@cache = {}
-    @@site_cache = {}
+    def self.clear_cache
+      @@cache = {}
+      @@site_cache = {}
+    end
+    clear_cache
+
+    def initialize(dbrow)
+      @dbrow = dbrow
+      @id = dbrow[:channel_id]
+    end
 
     def self.find(id)
       if @@cache[id].nil?
         xml = ""
-        row = DB.connect[:announcement_channel].filter(:channel_id => id).first
+        row = DB.connect[:announcement_channel].where(:channel_id => id).first
         if row.nil?
           raise ObjectNotFoundException.new(AnnouncementChannel, id)
         end
-        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
+        @@cache[id] = AnnouncementChannel.new(row)
+        @@site_cache[@@cache[id].site_id] = @@cache[id]
       end
       @@cache[id]
     end
@@ -41,32 +46,31 @@ module SakaiInfo
         end
     end
 
-    # raw data constructor
-    def initialize(id, nextid, xml)
-      @id = id
-      @next = nextid
-      @xml = xml
-      parse_xml
-    end
-
-    # properties
+    # lazy properties
     def announcements
       @announcements ||= Announcement.find_by_channel_id(@id)
     end
 
     def announcement_count
-      @announcement_count ||= self.announcements.length
+      @announcement_count ||= Announcement.count_by_channel_id(@id)
     end
 
     def site_id
       @site_id ||= @id.split("/")[3]
     end
 
+    def xml
+      if @xml.nil?
+        @xml = ""
+        REXML::Document.new(@dbrow[:xml].read).write(@xml, 2)
+      end
+      @xml
+    end
+
     # serialization
     def default_serialization
       {
         "id" => self.id,
-        "next" => self.next,
         "site_id" => self.site_id,
         "announcement_count" => self.announcement_count
       }
@@ -75,72 +79,86 @@ module SakaiInfo
     def summary_serialization
       {
         "id" => self.id,
-        "site_id" => self.site_id,
         "announcement_count" => self.announcement_count
       }
     end
+
+    def xml_serialization
+      {
+        "xml" => self.xml
+      }
+    end
+
+    def announcements_serialization
+      {
+        "announcements" => self.announcements.collect { |ann| ann.serialize(:summary) }
+      }
+    end
+
+    def self.all_serializations
+      [
+       :default,
+       :xml,
+       :announcements,
+      ]
+    end
   end
 
-  class Announcement < SakaiXMLEntity
-    attr_reader :channel, :owner, :date
-    attr_reader :draft, :pubview
+  class Announcement < SakaiObject
+    attr_reader :channel_id, :owner, :date, :draft, :pubview, :dbrow
+
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
+    def initialize(dbrow)
+      @dbrow = dbrow
+
+      @id = @dbrow[:message_id]
+      @channel_id = @dbrow[:channel_id]
+      @draft = @dbrow[:draft]
+      @pubview = @dbrow[:pubview]
+      @owner = User.find(@dbrow[:owner])
+      @date = @dbrow[:message_date]
+    end
 
-    @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
-        xml = ""
-        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
+        row = DB.connect[: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)
+        @@cache[id] = Announcement.new(row)
       end
       @@cache[id]
     end
 
-    # raw data constructor
-    def initialize(id, channel, draft, pubview, owner, date, xml)
-      @id = id
-      @channel = channel
-      @draft = draft
-      @pubview = pubview
-      @owner = owner
-      @date = date
-      @xml = xml
-      parse_xml
+    def self.query_by_channel_id(channel_id)
+      DB.connect[:announcement_message].where(:channel_id => channel_id)
+    end
+
+    def self.count_by_channel_id(channel_id)
+      Announcement.query_by_channel_id(channel_id).count
     end
 
-    # helpers
     def self.find_by_channel_id(channel_id)
-      announcements = []
-      channel = AnnouncementChannel.find(channel_id)
+      Announcement.query_by_channel_id(channel_id).all.collect do |row|
+        @@cache[row[:message_id]] = Announcement.new(row)
+      end
+    end
 
-      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[: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]
+    # lazy properties
+    def channel
+      @channel ||= AnnouncementChannel.find(self.channel_id)
+    end
+
+    def xml
+      if @xml.nil?
+        @xml = ""
+        REXML::Document.new(@dbrow[:xml].read).write(@xml, 2)
       end
-      announcements
+      @xml
     end
 
     # serialization
@@ -151,7 +169,7 @@ module SakaiInfo
         "owner" => self.owner.serialize(:summary),
         "draft" => self.draft,
         "pubview" => self.pubview,
-        "channel" => self.channel.serialize(:summary)
+        "channel" => self.channel_id,
       }
     end
 
@@ -161,6 +179,19 @@ module SakaiInfo
         "date" => self.date
       }
     end
+
+    def xml_serialization
+      {
+        "xml" => self.xml
+      }
+    end
+
+    def self.all_serializations
+      [
+       :default,
+       :xml,
+      ]
+    end
   end
 end
 

data/lib/sakai-info/assignment.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Assignment library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-05-02 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -13,7 +13,11 @@ module SakaiInfo
   class Assignment < SakaiXMLEntity
     attr_reader :dbrow, :site_id
 
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       if @@cache[id].nil?
         xml = ""
@@ -95,6 +99,11 @@ module SakaiInfo
   class AssignmentSubmission < SakaiXMLEntity
     attr_reader :dbrow, :assignment_id, :submitter_id
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(dbrow)
       @dbrow = dbrow
 
@@ -107,7 +116,6 @@ module SakaiInfo
       parse_xml
     end
 
-    @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
         row = DB.connect[:assignment_submission].where(:submission_id => id).first
@@ -204,6 +212,11 @@ module SakaiInfo
   class AssignmentContent < SakaiXMLEntity
     attr_reader :owner
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(id, owner, xml)
       @id = id
       @owner = owner
@@ -211,7 +224,6 @@ module SakaiInfo
       parse_xml
     end
 
-    @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
         row = DB.connect[:assignment_content].where(:content_id => id).first

data/lib/sakai-info/authz.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Authz library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-02-17 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -13,6 +13,11 @@ module SakaiInfo
   class AuthzRole < SakaiObject
     attr_reader :name
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(id, name)
       @id = id
       @name = name
@@ -22,7 +27,6 @@ module SakaiInfo
       name
     end
 
-    @@cache = {}
     def self.find_by_id(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -87,6 +91,11 @@ module SakaiInfo
   class AuthzFunction < SakaiObject
     attr_reader :name
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(id, name)
       @id = id
       @name = name
@@ -96,7 +105,6 @@ module SakaiInfo
       name
     end
 
-    @@cache = {}
     def self.find_by_id(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -164,6 +172,11 @@ module SakaiInfo
   class AuthzRealm < SakaiObject
     attr_reader :name, :providers, :maintain_role
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(id, name, providers, maintain_role)
       @id = id
       @name = name
@@ -191,7 +204,6 @@ module SakaiInfo
       @membership ||= AuthzRealmMembership.find_by_realm_id(@id)
     end
 
-    @@cache = {}
     def self.find_by_id(id)
       id = id.to_s
       if @@cache[id].nil?

data/lib/sakai-info/cli.rb

@@ -2,7 +2,7 @@
 #  - sakai-info command line tool support
 #
 # Created 2012-02-19 daveadams@gmail.com
-# Last updated 2012-04-02 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -36,6 +36,8 @@ module SakaiInfo
       "forum-thread" => ForumThread,
       "forum-post" => ForumPost,
       "content" => Content,
+      "announcement" => Announcement,
+      "announcement-channel" => AnnouncementChannel,
     }
   end
 end

data/lib/sakai-info/cli/help.rb

@@ -2,7 +2,7 @@
 #  - sin command line help
 #
 # Created 2012-02-19 daveadams@gmail.com
-# Last updated 2012-04-02 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -20,7 +20,8 @@ sin #{VERSION}
   Object commands:
     user, group, site, page, tool, quiz, quiz-section, quiz-item, quiz-attempt,
     quiz-attempt-item, quiz-attempt-item-attachment, question-pool, assignment,
-    assignment-submission, forum, forum-thread, forum-post, content
+    assignment-submission, forum, forum-thread, forum-post, content,
+    announcement, announcement-channel
 
   Misc commands:
     test             Tests configured database connections
@@ -327,6 +328,29 @@ sin content
     --children   Recursively print collection children
     --mod        Print creation/modification info
     --all        Print all possible details
+EOF
+        "announcement" => <<EOF,
+sin announcement
+
+  Usage: sin announcement <id> [<options>]
+
+  Prints information about the announcement specified. Additional options may
+  be passed to include additional information:
+
+    --xml        Print raw XML content
+    --all        Print all possible details
+EOF
+        "announcement-channel" => <<EOF,
+sin content
+
+  Usage: sin announcement-channel <id> [<options>]
+
+  Prints information about the announcement channel specified. Additional
+  options may be passed to include additional information:
+
+    --announcements  Print a summary of all announcements in this channel
+    --xml            Print raw XML content
+    --all            Print all possible details
 EOF
       }
 

data/lib/sakai-info/content.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Content library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-04-21 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -145,6 +145,11 @@ module SakaiInfo
   class ContentResource < Content
     attr_reader :file_path, :uuid, :context, :resource_type_id, :dbrow
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(dbrow)
       @dbrow = dbrow
 
@@ -160,7 +165,6 @@ module SakaiInfo
       @id_column = "resource_id"
     end
 
-    @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
         row = DB.connect[:content_resource].where(:resource_id => id).first
@@ -219,6 +223,11 @@ module SakaiInfo
   class ContentCollection < Content
     attr_reader :dbrow
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(dbrow)
       @dbrow = dbrow
 
@@ -229,7 +238,6 @@ module SakaiInfo
       @id_column = "collection_id"
     end
 
-    @@cache = {}
     def self.find(id)
       if id !~ /\/$/
         id += "/"
@@ -348,7 +356,11 @@ module SakaiInfo
   end
 
   class MissingContentCollection < ContentCollection
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       @@cache[id] ||= MissingContentCollection.new(id, nil)
     end

data/lib/sakai-info/forum.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Forum library
 #
 # Created 2012-04-01 daveadams@gmail.com
-# Last updated 2012-04-01 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -11,7 +11,7 @@
 
 module SakaiInfo
   class Forum < SakaiObject
-    attr_reader :id, :title, :dbrow
+    attr_reader :title, :dbrow
 
     include ModProps
     created_by_key :created_by
@@ -19,7 +19,11 @@ module SakaiInfo
     modified_by_key :modified_by
     modified_at_key :modified
 
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       if @@cache[id.to_s].nil?
         row = DB.connect[:mfr_open_forum_t].where(:id => id).first
@@ -118,7 +122,7 @@ module SakaiInfo
   end
 
   class ForumThread < GenericThread
-    attr_reader :id, :title, :dbrow
+    attr_reader :title, :dbrow
 
     include ModProps
     created_by_key :created_by
@@ -126,7 +130,11 @@ module SakaiInfo
     modified_by_key :modified_by
     modified_at_key :modified
 
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       if @@cache[id.to_s].nil?
         row = DB.connect[:mfr_topic_t].where(:id => id, :topic_dtype => "DT").first
@@ -204,7 +212,11 @@ module SakaiInfo
     modified_by_key :modified_by
     modified_at_key :modified
 
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       if @@cache[id.to_s].nil?
         row = DB.connect[:mfr_message_t].where(:id => id, :message_dtype => "ME").first

data/lib/sakai-info/gradebook.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Gradebook library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-02-24 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -13,6 +13,12 @@ module SakaiInfo
   class Gradebook < SakaiObject
     attr_reader :version, :site, :name
 
+    def self.clear_cache
+      @@cache = {}
+      @@cache_by_site_id = {}
+    end
+    clear_cache
+
     def initialize(id, version, site, name)
       @id = id
       @version = version
@@ -20,8 +26,6 @@ module SakaiInfo
       @name = name
     end
 
-    @@cache = {}
-    @@cache_by_site_id = {}
     def self.find(id)
       if @@cache[id].nil?
         row = DB.connect.fetch("select version, gradebook_uid, name " +
@@ -72,6 +76,12 @@ module SakaiInfo
     attr_reader :id, :gradebook, :object_type, :version, :name
     attr_reader :points_possible, :due_date, :weight
 
+    def self.clear_cache
+      @@cache = {}
+      @@cache_by_gradebook_id = {}
+    end
+    clear_cache
+
     def initialize(id, gradebook, object_type, version, name,
                    points_possible, due_date, weight)
       @id = id
@@ -84,7 +94,6 @@ module SakaiInfo
       @weight = weight
     end
 
-    @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
         row = DB.connect.fetch("select gradebook_id, object_type_id, version, " +
@@ -112,7 +121,6 @@ module SakaiInfo
       @@cache[id]
     end
 
-    @@cache_by_gradebook_id = {}
     def self.find_by_gradebook_id(gradebook_id)
       if @@cache_by_gradebook_id[gradebook_id].nil?
         objects = []

data/lib/sakai-info/group.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Group library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-04-22 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -13,6 +13,11 @@ module SakaiInfo
   class Group < SakaiObject
     attr_reader :site_id, :title, :dbrow
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(dbrow)
       @dbrow = dbrow
 
@@ -25,7 +30,6 @@ module SakaiInfo
       @site ||= Site.find(@site_id)
     end
 
-    @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
         row = DB.connect[:sakai_site_group].filter(:group_id => id).first

data/lib/sakai-info/message.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Message library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-02-24 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -63,13 +63,17 @@ module SakaiInfo
   class Forum < SakaiObject
     attr_reader :id, :title
 
+    def self.clear_cache
+      @@cache = {}
+      @@cache_by_site_id = {}
+    end
+    clear_cache
+
     def initialize(id, title)
       @id = id.to_i
       @title = title
     end
 
-    @@cache = {}
-
     def self.count_by_site_id(site_id)
       DB.connect.fetch("select count(*) as count from mfr_open_forum_t " +
                        "where surrogatekey = (select id from mfr_area_t " +
@@ -77,7 +81,6 @@ module SakaiInfo
                        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] = []

data/lib/sakai-info/page.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Page library
 #
 # Created 2012-03-08 daveadams@gmail.com
-# Last updated 2012-04-22 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -13,7 +13,11 @@ module SakaiInfo
   class Page < SakaiObject
     attr_reader :title, :order, :layout, :site_id, :dbrow
 
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       if @@cache[id].nil?
         row = DB.connect[:sakai_site_page].where(:page_id => id).first

data/lib/sakai-info/question_pool.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::QuestionPool library
 #
 # Created 2012-02-26 daveadams@gmail.com
-# Last updated 2012-02-26 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -19,6 +19,11 @@ module SakaiInfo
     modified_at_key :lastmodifieddate
     modified_by_key :lastmodifiedby
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(dbrow)
       @dbrow = dbrow
 
@@ -30,7 +35,6 @@ module SakaiInfo
       @parent_pool_id = nil if @parent_pool_id == 0
     end
 
-    @@cache = {}
     def self.find(id)
       if @@cache[id].nil?
         row = DB.connect[:sam_questionpool_t].filter(:questionpoolid => id).first

data/lib/sakai-info/quiz.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Quiz library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-05-03 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -19,6 +19,11 @@ module SakaiInfo
     modified_by_key :lastmodifiedby
     modified_at_key :lastmodifieddate
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     # a note about quizzes:
     # they do not link directly back to sites
     # instead, they link back only via the sam_authzdata_t table
@@ -56,7 +61,6 @@ module SakaiInfo
       end
     end
 
-    @@cache = {}
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -171,7 +175,11 @@ module SakaiInfo
   end
 
   class PendingQuiz < Quiz
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -212,7 +220,11 @@ module SakaiInfo
   end
 
   class PublishedQuiz < Quiz
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -280,6 +292,11 @@ module SakaiInfo
     modified_by_key :lastmodifiedby
     modified_at_key :lastmodifieddate
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(dbrow)
       @dbrow = dbrow
 
@@ -292,7 +309,6 @@ module SakaiInfo
       @status = dbrow[:status]
     end
 
-    @@cache = {}
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -387,7 +403,11 @@ module SakaiInfo
   end
 
   class PendingQuizSection < QuizSection
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -407,7 +427,11 @@ module SakaiInfo
   end
 
   class PublishedQuizSection < QuizSection
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -435,6 +459,11 @@ module SakaiInfo
     modified_by_key :lastmodifiedby
     modified_at_key :lastmodifieddate
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(dbrow)
       @dbrow = dbrow
 
@@ -445,7 +474,6 @@ module SakaiInfo
       @typeid = dbrow[:typeid]
     end
 
-    @@cache = {}
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -540,7 +568,11 @@ module SakaiInfo
   end
 
   class PendingQuizItem < QuizItem
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -560,7 +592,11 @@ module SakaiInfo
   end
 
   class PublishedQuizItem < QuizItem
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -592,6 +628,11 @@ module SakaiInfo
     attr_reader :dbrow, :submitted_at, :total_auto_score, :status, :attempted_at
     attr_reader :time_elapsed, :comments, :user_id, :quiz_id
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(dbrow)
       @dbrow = dbrow
 
@@ -608,7 +649,6 @@ module SakaiInfo
       @comments = dbrow[:comments]
     end
 
-    @@cache = {}
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -704,6 +744,11 @@ module SakaiInfo
   class QuizAttemptItem < SakaiObject
     attr_reader :dbrow, :submitted_at, :answer, :user_id, :item_id, :attempt_id
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(dbrow)
       @dbrow = dbrow
 
@@ -727,7 +772,6 @@ module SakaiInfo
       @item ||= PublishedQuizItem.find(@item_id)
     end
 
-    @@cache = {}
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?
@@ -766,7 +810,8 @@ module SakaiInfo
         "attempt" => self.attempt.serialize(:summary),
         "item" => self.item.serialize(:summary),
         "answer" => self.answer,
-        "attachment_count" => self.attachments.length
+        "attachment_count" => self.attachments.length,
+        "submitted_at" => self.submitted_at,
       }
     end
 
@@ -775,14 +820,16 @@ module SakaiInfo
         "id" => self.id,
         "eid" => User.get_eid(self.user_id),
         "attempt_id" => self.attempt_id,
-        "item_id" => self.item_id
+        "item_id" => self.item_id,
+        "submitted_at" => self.submitted_at,
       }
     end
 
     def attempt_summary_serialization
       {
         "id" => self.id,
-        "item_id" => self.item_id
+        "item_id" => self.item_id,
+        "submitted_at" => self.submitted_at,
       }
     end
 
@@ -807,6 +854,11 @@ module SakaiInfo
     modified_by_key :lastmodifiedby
     modified_at_key :lastmodifieddate
 
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def initialize(dbrow)
       @dbrow = dbrow
 
@@ -829,7 +881,6 @@ module SakaiInfo
         all.collect { |row| QuizAttemptItemAttachment.new(row) }
     end
 
-    @@cache = {}
     def self.find(id)
       id = id.to_s
       if @@cache[id].nil?

data/lib/sakai-info/sakai_object.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::SakaiObject
 #
 # Created 2012-02-15 daveadams@gmail.com
-# Last updated 2012-02-29 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -76,5 +76,10 @@ module SakaiInfo
     def self.all_serializations
       [:default]
     end
+
+    # keep track of descendants
+    def self.descendants
+      ObjectSpace.each_object(Class).select { |klass| klass < self }
+    end
   end
 end

data/lib/sakai-info/site.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Site library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-04-22 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -19,7 +19,11 @@ module SakaiInfo
     modified_by_key :modifiedby
     modified_at_key :modifiedon
 
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       if @@cache[id].nil?
         row = DB.connect[:sakai_site].where(:site_id => id).first
@@ -275,7 +279,7 @@ module SakaiInfo
         "id" => self.id,
         "title" => self.title,
         "type" => self.type,
-        "created_by" => self.created_by_id
+        "created_by" => self.created_by.eid
       }
     end
 

data/lib/sakai-info/tool.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Tool library
 #
 # Created 2012-03-08 daveadams@gmail.com
-# Last updated 2012-04-22 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -13,7 +13,11 @@ module SakaiInfo
   class Tool < SakaiObject
     attr_reader :title, :registration, :order, :layout, :page_id, :site_id, :dbrow
 
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       if @@cache[id].nil?
         row = DB.connect[:sakai_site_tool].where(:tool_id => id).first

data/lib/sakai-info/user.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::User library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-04-22 daveadams@gmail.com
+# Last updated 2012-05-10 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -19,7 +19,12 @@ module SakaiInfo
     modified_by_key :modifiedby
     modified_at_key :modifiedon
 
-    @@cache = {}
+    def self.clear_cache
+      @@cache = {}
+      @@id_cache = {}
+    end
+    clear_cache
+
     def self.find(id)
       if @@cache[id].nil?
         eid = User.get_eid(id)
@@ -30,8 +35,8 @@ module SakaiInfo
 
         row = DB.connect[:sakai_user].where(:user_id => user_id).first
         if row.nil?
-          #Has sakai_user_id_map record, but not sakai_user record. Provided account!
-          #raise ObjectNotFoundException.new(User, id)
+          # Has sakai_user_id_map record, but not sakai_user record. Provided account!
+          # TODO: replace with a ProvidedUser subclass
           @@cache[eid] = @@cache[user_id] = User.new(user_id,'Provided')
         else
           @@cache[eid] = @@cache[user_id] = User.new(row)
@@ -40,7 +45,6 @@ module SakaiInfo
       @@cache[id]
     end
 
-    @@id_cache = {}
     def self.get_ids(id)
       @@id_cache[id] ||=
         DB.connect[:sakai_user_id_map].where({:user_id => id, :eid => id}.sql_or).first
@@ -66,7 +70,7 @@ module SakaiInfo
       case args.size
       when 1
         dbrow = args[0]
-        @dbrow = dbrow 
+        @dbrow = dbrow
         @id = dbrow[:user_id]
         @eid = User.get_eid(@id)
         @email = dbrow[:email]

data/lib/sakai-info/version.rb

@@ -1,3 +1,3 @@
 module SakaiInfo
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakai-info
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel