sakai-info 0.5.0 → 0.5.1

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # sakai-info Change History #
 
+### 0.5.1 ###
+
+*Released 2012-10-07*
+
+* Added new private-message lookup type
+* Adjusted to new use of the 'author' field in PrivateMessage/ForumPost table
+* Now including post body with forum-post
+* Added new pending-quiz-access-control and published-quiz-access-control types
+* Integrated access control objects with quiz object output
+* New deleted-content-resource type
+* New rake task to load test fixtures into database
+* Added to_csv method with field selection to SakaiObject
+* Added more use cases to POC query mode
+* Added field selection to lookup via --fields=x,y,z
+
 ### 0.5.0 ###
 
 *Released 2012-06-21*

data/README.md

@@ -1,6 +1,6 @@
 # sakai-info #
 
-last updated: 2012-06-21  
+last updated: 2012-10-07  
 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.5.0.gem`.
+`sakai-info-0.5.1.gem`.
 
 Cleanup built gems using:
 

data/ROADMAP.md

@@ -1,27 +1,23 @@
 # sakai-info Roadmap #
 
-*Last updated 2012-06-21*
-
-### 0.5.1 ###
-
-* Test fixture generation for sites
-* Text fixture loading into sqlite for sites and users
-* Field restrictions for lookups
-* Simple queries by name/title for user/site
-* More details for quizzes including access control data
+*Last updated 2012-10-07*
 
 ### 0.5.2 ###
 
-* Test fixture generation for quizzes
-* Better date formatting all around
+* JSON output support
+* Ability to specify alternate config file at the command line
+* Better date formatting and proper time zone understanding
 * More query functionality
 * Proof-of-concept sin shell
 * Chat channel/message support
+* Alias support
+* Add simple tests against user/site fixture data
 
 ### 0.5.3 ###
 
 * RDS schema creation and data loading for MySQL and Oracle testing
 * More query and shell functionality
+* Test fixture generation for quizzes
 
 ### 0.5.4 ###
 

data/lib/sakai-info.rb

@@ -45,4 +45,5 @@ require 'sakai-info/quiz'
 require 'sakai-info/question_pool'
 require 'sakai-info/generic_message'
 require 'sakai-info/forum'
+require 'sakai-info/private_message'
 

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-06-21 daveadams@gmail.com
+# Last updated 2012-10-03 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -24,11 +24,12 @@ Sakai INfo: sin #{VERSION}
     Supported object types:
       user, group, site, page, tool, pending-quiz, published-quiz,
       pending-quiz-section, published-quiz-section, pending-quiz-item,
-      published-quiz-item, quiz-attempt, quiz-attempt-item,
+      published-quiz-item, pending-quiz-access-control,
+      published-quiz-access-control, quiz-attempt, quiz-attempt-item,
       quiz-attempt-item-attachment, question-pool, assignment,
       assignment-submission, forum, forum-thread, forum-post, content,
       announcement, announcement-channel, gradebook, gradebook-item,
-      role, function, realm
+      role, function, realm, private-message
 
   QUERY MODE
     Query particular fields from certain objects given certain conditions.
@@ -78,6 +79,9 @@ Sakai Info: sin #{VERSION}
 
     --all
         Print all possible information (other than dbrow)
+
+    --fields=f1[,f2[,...]]
+        Include in output only those first-level hash keys given
 EOF
 
         "help" => <<EOF,
@@ -242,6 +246,24 @@ sin published-quiz-item
     --mod        Print creation/modification info
 EOF
 
+        "pending-quiz-access-control" => <<EOF,
+sin pending-quiz-access-control
+
+  Usage: sin pending-quiz-access-control <id> [<options>]
+
+  Prints information about the access control object attached to the
+  pending quiz ID specified.
+EOF
+
+        "published-quiz-access-control" => <<EOF,
+sin published-quiz-access-control
+
+  Usage: sin published-quiz-access-control <id> [<options>]
+
+  Prints information about the access control object attached to the
+  published quiz ID specified.
+EOF
+
         "question-pool" => <<EOF,
 sin question-pool
 
@@ -364,6 +386,17 @@ sin content
     --children      Recursively print collection children
     --full-children Print children with full IDs and file paths
     --mod           Print creation/modification info
+EOF
+        "deleted-content-resource" => <<EOF,
+sin content
+
+  Usage: sin deleted-content-resource <id> [<options>]
+
+  Prints information about the deleted content resource ID specified.
+  Additional options may be passed to include additional information:
+
+    --properties    Print all properties
+    --mod           Print creation/modification info
 EOF
         "announcement" => <<EOF,
 sin announcement
@@ -427,6 +460,16 @@ sin realm
 
     --roles      List roles associated with this realm
     --users      List users in this realm
+    --mod        Print creation/modification info
+EOF
+        "private-message" => <<EOF,
+sin private-message
+
+  Usage: sin private-message <id> [<options>]
+
+  Prints information about the private message ID specified. Additional options
+  may be passed to include additional information:
+
     --mod        Print creation/modification info
 EOF
         "query" => <<EOF,

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

@@ -15,21 +15,42 @@ module SakaiInfo
       def self.process(args, flags)
         object_type = args.shift
         id = args.shift
+        fields = nil
+
+        flags.each do |flag|
+          if flag =~ /^--fields=(.+)$/
+            fields = $1.downcase.split(',')
+            flags.delete(flag)
+          end
+        end
 
         if flags.include? "--all"
           serials = CLI::LookupModes[object_type].all_serializations
-        elsif
-          flags.include? "--dbrow-only"
+        elsif flags.include? "--dbrow-only"
           serials = [:dbrow_only]
         else
           serials = [:default] + flags.collect{|flag|flag.gsub(/^--/,'').gsub("-","_").to_sym}
         end
+
+        object = nil
         begin
-          puts CLI::LookupModes[object_type].find(id).to_yaml(serials)
-        rescue ObjectNotFoundException
-          STDERR.puts "ERROR: Could not find #{object_type} with an ID of '#{id}'"
+          object = CLI::LookupModes[object_type].find(id)
+        rescue ObjectNotFoundException => e
+          STDERR.puts "ERROR: Could not find #{object_type} with an ID of '#{id}':"
+          STDERR.puts "       #{e}"
           exit 1
         end
+
+        if fields.nil? or fields.empty?
+          puts object.to_yaml(serials)
+        else
+          object_hash = object.serialize(serials).delete_if{|k,v| not fields.include? k.to_s}
+          if object_hash.empty?
+            STDERR.puts "ERROR: no requested fields were found"
+            exit 1
+          end
+          puts object_hash.to_yaml
+        end
       end
     end
 
@@ -57,6 +78,10 @@ module SakaiInfo
       "nqi" => PendingQuizItem,
       "penqi" => PendingQuizItem,
       "pending-quiz-item" => PendingQuizItem,
+      "pqac" => PublishedQuizAccessControl,
+      "published-quiz-access-control" => PublishedQuizAccessControl,
+      "nqac" => PendingQuizAccessControl,
+      "pending-quiz-access-control" => PendingQuizAccessControl,
       "qa" => QuizAttempt,
       "quiz-attempt" => QuizAttempt,
       "qai" => QuizAttemptItem,
@@ -77,6 +102,9 @@ module SakaiInfo
       "fp" => ForumPost,
       "forum-post" => ForumPost,
       "content" => Content,
+      "deleted-content-resource" => DeletedContentResource,
+      "deleted-content" => DeletedContentResource,
+      "delcon" => DeletedContentResource,
       "ann" => Announcement,
       "announcement" => Announcement,
       "annchan" => AnnouncementChannel,
@@ -90,6 +118,8 @@ module SakaiInfo
       "func" => AuthzFunction,
       "function" => AuthzFunction,
       "realm" => AuthzRealm,
+      "private-message" => PrivateMessage,
+      "pm" => PrivateMessage,
     }
   end
 end

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

@@ -2,7 +2,7 @@
 #   class for handling "query" command line mode
 #
 # Created 2012-05-23 daveadams@gmail.com
-# Last updated 2012-06-21 daveadams@gmail.com
+# Last updated 2012-10-06 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -48,6 +48,45 @@ module SakaiInfo
             exit 1
           end
 
+        elsif object_type == "deleted-content"
+          userid = nil
+          while flags.length > 0
+            flag = flags.shift
+            if flag =~ /^--by=/
+              userid = flag.split('=')[1]
+            end
+          end
+
+          if userid.nil?
+            STDERR.puts "ERROR: you must specify --by=<userid>"
+            exit 1
+          end
+
+          begin
+            user = User.find(userid)
+            deleted_resources = DeletedContentResource.find_by_delete_userid(user.id)
+            deleted_resources.each do |dr|
+              puts dr.id
+            end
+          rescue ObjectNotFoundException => e
+            STDERR.puts "ERROR: #{e}"
+            exit 1
+          end
+
+        elsif object_type == "site"
+          title = args.shift
+
+          Site.find_by_title(title).each do |site|
+            puts site.to_csv(:id, :title)
+          end
+
+        elsif object_type == "user"
+          name = args.shift
+
+          User.find_by_name(name).each do |user|
+            puts user.to_csv(:eid, :name)
+          end
+
         else
           STDERR.puts "ERROR: Unrecognized object type"
           exit 1

data/lib/sakai-info/content.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Content library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-05-20 daveadams@gmail.com
+# Last updated 2012-10-04 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -219,6 +219,9 @@ module SakaiInfo
       if result["uuid"].nil?
         result.delete("uuid")
       end
+      if result["context"].nil?
+        result.delete("context")
+      end
       result
     end
 
@@ -238,6 +241,69 @@ module SakaiInfo
     end
   end
 
+  class DeletedContentResource < ContentResource
+    attr_reader :file_path, :uuid, :context, :resource_type_id, :deleted_at, :dbrow
+
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
+    def initialize(dbrow)
+      super(dbrow)
+      @table_name = "content_resource_delete"
+      @deleted_at = @dbrow[:delete_date].strftime("%Y-%m-%d %H:%M:%S")
+    end
+
+    def self.find(id)
+      if @@cache[id].nil?
+        row = DB.connect[:content_resource_delete].where(:resource_id => id).first
+        if row.nil?
+          raise ObjectNotFoundException.new(DeletedContentResource, id)
+        end
+        @@cache[id] = DeletedContentResource.new(row)
+      end
+      @@cache[id]
+    end
+
+    def deleted_by
+      @deleted_by ||= User.find(@dbrow[:delete_userid])
+    end
+
+    def self.find_by_delete_userid(user_id)
+      resources = []
+      DB.connect[:content_resource_delete].where(:delete_userid => user_id).all.each do |row|
+        @@cache[row[:resource_id]] = DeletedContentResource.new(row)
+        resources << @@cache[row[:resource_id]]
+      end
+      resources
+    end
+
+    def self.query_by_parent(parent_id)
+      DB.connect[:content_resource_delete].where(:in_collection => parent_id)
+    end
+
+    def self.find_by_parent(parent_id)
+      resources = []
+      DeletedContentResource.query_by_parent(parent_id).all.each do |row|
+        @@cache[row[:resource_id]] = DeletedContentResource.new(row)
+        resources << @@cache[row[:resource_id]]
+      end
+      resources
+    end
+
+    def self.count_by_parent(parent_id)
+      DeletedContentResource.query_by_parent(parent_id).count
+    end
+
+    def default_serialization
+      result = super
+      result["deleted_at"] = self.deleted_at
+      result["deleted_by"] = self.deleted_by.serialize(:summary)
+      result
+    end
+  end
+
   class ContentCollection < Content
     attr_reader :dbrow
 

data/lib/sakai-info/forum.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Forum library
 #
 # Created 2012-04-01 daveadams@gmail.com
-# Last updated 2012-05-10 daveadams@gmail.com
+# Last updated 2012-09-25 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -231,18 +231,24 @@ module SakaiInfo
     def initialize(dbrow)
       @dbrow = dbrow
 
+      @dbrow[:body] = dbrow[:body].read
+
       @id = dbrow[:id].to_i
       @title = dbrow[:title]
     end
 
     def author
-      @author ||= User.find(@dbrow[:author])
+      @author ||= User.find(@dbrow[:created_by])
     end
 
     def thread
       @thread ||= ForumThread.find(@dbrow[:surrogatekey])
     end
 
+    def body
+      @dbrow[:body]
+    end
+
     def self.query_by_thread_id(thread_id)
       DB.connect[:mfr_message_t].where(:surrogatekey => thread_id)
     end
@@ -265,6 +271,7 @@ module SakaiInfo
         "title" => self.title,
         "author" => self.author.serialize(:summary),
         "thread" => self.thread.serialize(:summary),
+        "body" => self.body,
       }
     end
 

data/lib/sakai-info/generic_message.rb

@@ -62,12 +62,6 @@ module SakaiInfo
       GenericThread.types.keys.include?(mt)
     end
   end
-
-  class PrivateMessage < GenericMessage
-    def self.count_by_date(d)
-      count_by_date_and_message_type(d, "PM")
-    end
-  end
 end
 
 

data/lib/sakai-info/hacks.rb

@@ -2,7 +2,7 @@
 #   Hacks necessary to work around problems in external libraries
 #
 # Created 2012-05-20 daveadams@gmail.com
-# Last updated 2012-05-20 daveadams@gmail.com
+# Last updated 2012-10-05 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -47,3 +47,10 @@ module Sequel
     end
   end
 end
+
+# hack to get clobs in sqlite to work correctly
+class String
+  def read
+    self
+  end
+end

data/lib/sakai-info/private_message.rb

@@ -0,0 +1,78 @@
+# sakai-info/private_message.rb
+#   SakaiInfo::PrivateMessage library
+#
+# Created 2012-09-25 daveadams@gmail.com
+# Last updated 2012-09-25 daveadams@gmail.com
+#
+# https://github.com/daveadams/sakai-info
+#
+# This software is public domain.
+#
+
+module SakaiInfo
+  class PrivateMessage < GenericMessage
+    attr_reader :id, :title, :dbrow
+
+    include ModProps
+    created_by_key :created_by
+    created_at_key :created
+    modified_by_key :modified_by
+    modified_at_key :modified
+
+    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 => "PM").first
+        if row.nil?
+          raise ObjectNotFoundException.new(PrivateMessage, id)
+        end
+        @@cache[id.to_s] = PrivateMessage.new(row)
+      end
+      @@cache[id.to_s]
+    end
+
+    def initialize(dbrow)
+      @dbrow = dbrow
+
+      @dbrow[:body] = dbrow[:body].read
+      @dbrow[:recipients_as_text] = dbrow[:recipients_as_text].read
+
+      @id = dbrow[:id].to_i
+      @title = dbrow[:title]
+    end
+
+    def author
+      # apparently the 'author' field is just a display string?!?
+      # as of 2.8, perhaps?
+      @author ||= User.find(@dbrow[:created_by])
+    end
+
+    def body
+      @dbrow[:body]
+    end
+
+    def self.count_by_date(d)
+      count_by_date_and_message_type(d, "PM")
+    end
+
+    def default_serialization
+      {
+        "id" => self.id,
+        "title" => self.title,
+        "author" => self.author.serialize(:summary),
+        "body" => self.body,
+      }
+    end
+
+    def summary_serialization
+      {
+        "id" => self.id,
+        "title" => self.title,
+      }
+    end
+  end
+end

data/lib/sakai-info/quiz.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Quiz library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-06-21 daveadams@gmail.com
+# Last updated 2012-09-29 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -128,6 +128,10 @@ module SakaiInfo
       @items ||= self.item_class.find_by_quiz_id(self.id)
     end
 
+    def access_control
+      @access_control ||= self.access_control_class.find(self.id)
+    end
+
     def default_serialization
       result = {
         "id" => self.id,
@@ -137,7 +141,8 @@ module SakaiInfo
         "type" => self.quiz_type,
         "section_count" => self.section_count,
         "item_count" => self.item_count,
-        "attempt_count" => nil
+        "attempt_count" => nil,
+        "access_control" => self.access_control.serialize(:quiz_summary)
       }
       if not self.site.nil?
         result["site"] = self.site.serialize(:summary)
@@ -172,6 +177,12 @@ module SakaiInfo
       }
     end
 
+    def access_control_summary_serialization
+      result = self.summary_serialization
+      result.delete("id")
+      result
+    end
+
     def sections_serialization
       {
         "sections" => self.sections.collect{|s|s.serialize(:quiz_summary)}
@@ -245,6 +256,10 @@ module SakaiInfo
     def item_class
       PendingQuizItem
     end
+
+    def access_control_class
+      PendingQuizAccessControl
+    end
   end
 
   class PublishedQuiz < Quiz
@@ -301,6 +316,10 @@ module SakaiInfo
       PublishedQuizItem
     end
 
+    def access_control_class
+      PublishedQuizAccessControl
+    end
+
     def attempt_count
       @attempt_count ||= QuizAttempt.count_by_quiz_id(self.id)
     end
@@ -1010,4 +1029,244 @@ module SakaiInfo
       }
     end
   end
+
+  class QuizAccessControl < SakaiObject
+    attr_reader :id, :dbrow
+
+    def initialize(dbrow)
+      @dbrow = dbrow
+      @id = dbrow[:assessmentid]
+    end
+
+    def unlimited_submissions?
+      @dbrow[:unlimitedsubmissions] == 1
+    end
+
+    def submissions_allowed
+      @dbrow[:submissionsallowed]
+    end
+
+    def submissions_saved
+      @dbrow[:submissionssaved] == 1
+    end
+
+    def question_layout
+      case @dbrow[:assessmentformat]
+      when 1
+        "One question per page"
+      when 2
+        "One part per page"
+      when 3
+        "Single page quiz"
+      else
+        @dbrow[:assessmentformat]
+      end
+    end
+
+    def late_handling
+      case @dbrow[:latehandling]
+      when 1
+        "Late submissions accepted"
+      when 2
+        "Late submissions NOT accepted"
+      else
+        @dbrow[:latehandling]
+      end
+    end
+
+    def item_navigation
+      case @dbrow[:itemnavigation]
+      when 1
+        "Linear"
+      when 2
+        "Random"
+      else
+        @dbrow[:itemnavigation]
+      end
+    end
+
+    def item_numbering
+      case @dbrow[:itemnumbering]
+      when 1
+        "Continuous through parts"
+      when 2
+        "Restart numbering at each part"
+      else
+        @dbrow[:itemnumbering]
+      end
+    end
+
+    def submission_message
+      @dbrow[:submissionmessage]
+    end
+
+    def release_to
+      @dbrow[:releaseto]
+    end
+
+    def username
+      @dbrow[:username]
+    end
+
+    def password
+      @dbrow[:password]
+    end
+
+    def final_page_url
+      @dbrow[:finalpageurl]
+    end
+
+    def mark_for_review_allowed?
+      @dbrow[:markforreview] == 1
+    end
+
+    def authenticated?
+      not (self.username.nil? and self.password.nil?)
+    end
+
+    def time_limit
+      @dbrow[:timelimit]
+    end
+
+    def timed?
+      @dbrow[:timelimit] > 0
+    end
+
+    def automatic_submission?
+      @dbrow[:autosubmit] == 1
+    end
+
+    def start_date
+      if @dbrow[:startdate].nil?
+        nil
+      else
+        @dbrow[:startdate].strftime("%Y-%m-%d %H:%M:%S")
+      end
+    end
+
+    def due_date
+      if @dbrow[:duedate].nil?
+        nil
+      else
+        @dbrow[:duedate].strftime("%Y-%m-%d %H:%M:%S")
+      end
+    end
+
+    def retract_date
+      if @dbrow[:retractdate].nil?
+        nil
+      else
+        @dbrow[:retractdate].strftime("%Y-%m-%d %H:%M:%S")
+      end
+    end
+
+    def feedback_date
+      if @dbrow[:feedbackdate].nil?
+        nil
+      else
+        @dbrow[:feedbackdate].strftime("%Y-%m-%d %H:%M:%S")
+      end
+    end
+
+    def score_date
+      if @dbrow[:scoredate].nil?
+        nil
+      else
+        @dbrow[:scoredate].strftime("%Y-%m-%d %H:%M:%S")
+      end
+    end
+
+    def default_serialization
+      result = {
+        "id" => self.id,
+        "quiz" => self.quiz.serialize(:access_control_summary),
+        "unlimited_submissions" => self.unlimited_submissions?,
+        "submissions_allowed" => self.submissions_allowed,
+        "timed" => self.timed?,
+        "time_limit" => self.time_limit,
+        "question_layout" => self.question_layout,
+        "late_handling" => self.late_handling,
+        "item_navigation" => self.item_navigation,
+        "item_numbering" => self.item_numbering,
+        "release_to" => self.release_to,
+        "authenticated" => self.authenticated?,
+        "automatic_submission" => self.automatic_submission?,
+        "mark_for_review_allowed" => self.mark_for_review_allowed?,
+      }
+      if not self.timed?
+        result.delete("time_limit")
+      end
+      if self.unlimited_submissions?
+        result.delete("submissions_allowed")
+      end
+      %w(username start_date due_date score_date retract_date feedback_date submission_message final_page_url).each do |field_name|
+        value = self.method(field_name.to_sym).call
+        if not value.nil?
+          result[field_name] = value
+        end
+      end
+      result
+    end
+
+    def quiz_summary_serialization
+      result = default_serialization
+      result.delete("quiz")
+      result.delete("id")
+      result
+    end
+
+    def summary_serialization
+      {
+        "id" => self.id,
+      }
+    end
+  end
+
+  class PendingQuizAccessControl < QuizAccessControl
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
+    def self.find(id)
+      id = id.to_s
+      if @@cache[id].nil?
+        row = DB.connect[:sam_assessaccesscontrol_t].where(:assessmentid => id.to_i).first
+        if row.nil?
+          raise ObjectNotFoundException.new(PendingQuizAccessControl, id)
+        end
+
+        @@cache[id] = PendingQuizAccessControl.new(row)
+      end
+      @@cache[id]
+    end
+
+    def quiz
+      @quiz ||= PendingQuiz.find(self.id)
+    end
+  end
+
+  class PublishedQuizAccessControl < QuizAccessControl
+    def self.clear_cache
+      @@cache = {}
+    end
+    clear_cache
+
+    def self.find(id)
+      id = id.to_s
+      if @@cache[id].nil?
+        row = DB.connect[:sam_publishedaccesscontrol_t].where(:assessmentid => id.to_i).first
+        if row.nil?
+          raise ObjectNotFoundException.new(PublishedQuizAccessControl, id)
+        end
+
+        @@cache[id] = PublishedQuizAccessControl.new(row)
+      end
+      @@cache[id]
+    end
+
+    def quiz
+      @quiz ||= PublishedQuiz.find(self.id)
+    end
+  end
 end

data/lib/sakai-info/sakai_object.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::SakaiObject
 #
 # Created 2012-02-15 daveadams@gmail.com
-# Last updated 2012-05-10 daveadams@gmail.com
+# Last updated 2012-10-06 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -70,6 +70,16 @@ module SakaiInfo
       serialize(q).to_json
     end
 
+    def to_csv(*fields)
+      values = []
+      fields.each do |field|
+        m = self.method(field.to_sym)
+        next if m.nil?
+        values << m.call.to_s
+      end
+      values.collect{|v|"\"#{v}\""}.join(",")
+    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

data/lib/sakai-info/site.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::Site library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-05-14 daveadams@gmail.com
+# Last updated 2012-10-06 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -237,6 +237,19 @@ module SakaiInfo
         where(:type => type).all.collect{|r| r[:site_id]}
     end
 
+    # by_title: uses like
+    def self.query_by_title(title)
+      DB.connect[:sakai_site].where("upper(title) like ?", "%#{title.upcase}%")
+    end
+
+    def self.find_by_title(title)
+      Site.query_by_title(title).all.collect{|row| @@cache[row[:site_id]] = Site.new(row)}
+    end
+
+    def self.find_ids_by_title(title)
+      Site.query_by_title(title).select(:site_id).all.collect{|row|row[:site_id]}
+    end
+
     # by_type queries
     def self.query_by_type(type)
       DB.connect[:sakai_site].where(:type => type)

data/lib/sakai-info/user.rb

@@ -2,7 +2,7 @@
 #   SakaiInfo::User library
 #
 # Created 2012-02-17 daveadams@gmail.com
-# Last updated 2012-05-10 daveadams@gmail.com
+# Last updated 2012-10-06 daveadams@gmail.com
 #
 # https://github.com/daveadams/sakai-info
 #
@@ -174,6 +174,19 @@ module SakaiInfo
       nil
     end
 
+    # by_name: uses like
+    def self.query_by_name(name)
+      DB.connect[:sakai_user].where("upper(first_name) like ? or upper(last_name) like ? or upper(first_name)||\' \'||upper(last_name) like ?", "%#{name.upcase}%", "%#{name.upcase}%", "%#{name.upcase}%")
+    end
+
+    def self.find_by_name(name)
+      User.query_by_name(name).all.collect{|row| @@cache[row[:user_id]] = User.new(row)}
+    end
+
+    def self.find_ids_by_name(name)
+      User.query_by_name(name).select(:user_id).all.collect{|row|row[:user_id]}
+    end
+
     # yaml/json serialization
     def default_serialization
       result = {
@@ -218,7 +231,12 @@ module SakaiInfo
     end
 
     def self.all_serializations
-      [:default, :sites, :pools]
+      [
+       :default,
+       :sites,
+       :pools,
+       :mod,
+      ]
     end
   end
 

data/lib/sakai-info/version.rb

@@ -1,3 +1,3 @@
 module SakaiInfo
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sakai-info
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -54,6 +54,7 @@ files:
 - lib/sakai-info.rb
 - lib/sakai-info/util.rb
 - lib/sakai-info/group.rb
+- lib/sakai-info/private_message.rb
 - lib/sakai-info/tool.rb
 - lib/sakai-info/cli/help.rb
 - lib/sakai-info/cli/query.rb