sakai-info 0.2.1 → 0.3.0

data/lib/sakai-info/sakai_object.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::SakaiObject
 #
 # Created 2012-02-15 daveadams@gmail.com
-# Last updated 2012-02-18 daveadams@gmail.com
+# Last updated 2012-02-26 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -26,11 +26,8 @@ module SakaiInfo
       serialization = {}
       q.each do |sub|
         sub_method_name = (sub.to_s + "_serialization").to_sym
-        begin
-          sub_method = self.method(sub_method_name)
-          serialization = serialization.merge(sub_method.call)
-        rescue NameError
-          # ignore any missing serialization patterns
+        if self.respond_to? sub_method_name
+          serialization = serialization.merge(self.method(sub_method_name).call)
         end
       end
 
@@ -43,6 +40,16 @@ module SakaiInfo
       }
     end
 
+    def dbrow_serialization
+      if self.respond_to? :dbrow
+        {
+          "dbrow" => self.dbrow
+        }
+      else
+        {}
+      end
+    end
+
     def default_serialization
       object_type_serialization
     end

data/lib/sakai-info/site.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Site library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-02-24 daveadams@gmail.com
+# Last updated 2012-02-26 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -323,11 +323,11 @@ module SakaiInfo
       end
       if self.pending_quiz_count > 0
         result["quizzes"]["pending"] =
-          self.pending_quizzes.collect { |pq| pq.serialize(:summary) }
+          self.pending_quizzes.collect { |pq| pq.serialize(:site_summary) }
       end
       if self.published_quiz_count > 0
         result["quizzes"]["published"] =
-          self.published_quizzes.collect { |pq| pq.serialize(:summary) }
+          self.published_quizzes.collect { |pq| pq.serialize(:site_summary) }
       end
       result
     end

data/lib/sakai-info/user.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::User library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-02-24 daveadams@gmail.com
+# Last updated 2012-02-26 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -84,11 +84,7 @@ module SakaiInfo
     end
 
     def question_pool_count
-      if @question_pools.nil?
-        QuestionPool.count_by_user_id(@id)
-      else
-        @question_pools.length
-      end
+      @question_pool_count ||= QuestionPool.count_by_user_id(@id)
     end
 
     def assignment_submissions

data/lib/sakai-info/version.rb

@@ -1,3 +1,3 @@
 module SakaiInfo
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sakai-info
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Adams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-25 00:00:00 -06:00
+date: 2012-02-26 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,18 +57,20 @@ extra_rdoc_files: []
 files: 
 - lib/sakai-info.rb
 - lib/sakai-info/group.rb
-- lib/sakai-info/samigo.rb
 - lib/sakai-info/cli/help.rb
 - lib/sakai-info/site.rb
 - lib/sakai-info/assignment.rb
 - lib/sakai-info/authz.rb
 - lib/sakai-info/gradebook.rb
+- lib/sakai-info/mod_props.rb
 - lib/sakai-info/sakai_object.rb
+- lib/sakai-info/quiz.rb
 - lib/sakai-info/user.rb
 - lib/sakai-info/version.rb
 - lib/sakai-info/announcement.rb
 - lib/sakai-info/database.rb
 - lib/sakai-info/cli.rb
+- lib/sakai-info/question_pool.rb
 - lib/sakai-info/message.rb
 - lib/sakai-info/content.rb
 - lib/sakai-info/sakai_xml_entity.rb

data/lib/sakai-info/samigo.rb

@@ -1,196 +0,0 @@
-# sakai-info/samigo.rb
-#   SakaiInfo::Samigo library
-#
-# Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-02-25 daveadams@gmail.com
-#
-# https://github.com/daveadams/sakai-info
-#
-# This software is public domain.
-#
-
-module SakaiInfo
-  class PendingQuiz < SakaiObject
-    attr_reader :title, :site
-
-    def initialize(id, title, site)
-      @id = id
-      @title = title
-      @site = site
-    end
-
-    @@cache = {}
-    def self.find(id)
-      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
-
-    def self.find_by_site_id(site_id)
-      results = []
-      site = Site.find(site_id)
-      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)
-      DB.connect.fetch("select count(*) as count from sam_assessmentbase_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
-      {
-        "id" => self.id,
-        "title" => self.title,
-        "site_id" => self.site.id
-      }
-    end
-
-    def summary_serialization
-      {
-        "id" => self.id,
-        "title" => self.title
-      }
-    end
-  end
-
-  class PublishedQuiz < SakaiObject
-    attr_reader :title, :site
-
-    def initialize(id, title, site)
-      @id = id
-      @title = title
-      @site = site
-    end
-
-    @@cache = {}
-    def self.find(id)
-      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
-
-    def self.find_by_site_id(site_id)
-      results = []
-      site = Site.find(site_id)
-      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)
-      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
-      {
-        "id" => self.id,
-        "title" => self.title,
-        "site_id" => self.site.id
-      }
-    end
-
-    def summary_serialization
-      {
-        "id" => self.id,
-        "title" => self.title
-      }
-    end
-  end
-
-  class QuestionPool < SakaiObject
-    attr_reader :title, :owner
-
-    def initialize(id, title, owner)
-      @id = id
-      @title = title
-      @owner = owner
-    end
-
-    @@cache = {}
-    def self.find(id)
-      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
-
-    def self.find_by_user_id(user_id)
-      results = []
-      user = User.find(user_id)
-      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)
-      DB.connect[:sam_questionpool_t].filter(:ownerid => user_id).count
-    end
-
-    def item_count
-      @item_count ||=
-        DB.connect[:sam_questionpoolitem_t].filter(:questionpoolid => @id).count
-    end
-
-    # serialization
-    def default_serialization
-      {
-        "id" => self.id,
-        "title" => self.title,
-        "owner" => self.owner.serialize(:summary),
-        "item_count" => self.item_count
-      }
-    end
-
-    def summary_serialization
-      {
-        "id" => self.id,
-        "title" => self.title,
-        "owner_eid" => self.owner.eid,
-        "item_count" => self.item_count
-      }
-    end
-
-    def user_summary_serialization
-      {
-        "id" => self.id,
-        "title" => self.title,
-        "item_count" => self.item_count
-      }
-    end
-  end
-end