sambal-cle 0.1.3 → 0.1.4

data/lib/sambal-cle/data_objects/blogger.rb

@@ -1,7 +1,7 @@
 class BloggerPostObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
   include Workflows
   
   attr_accessor :title, :abstract, :site, :text, :read_only, :access, :allow_comments
@@ -16,14 +16,8 @@ class BloggerPostObject
     }
     options = defaults.merge(opts)
     
-    @title=options[:title]
-    @abstract=options[:abstract]
-    @site=options[:site]
-    @text=options[:text]
-    @read_only=options[:read_only]
-    @access=options[:access]
-    @allow_comments=options[:allow_comments]
-    raise "You need to specify a site for your blogger post" if @site==nil
+    set(options)
+    requires @site
   end
     
   def create

data/lib/sambal-cle/data_objects/chat_room.rb

@@ -1,7 +1,8 @@
 class ChatRoomObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
+  include StringFactory
   include Workflows
   
   attr_accessor :title, :description, :chat_display, :allow_change, :site
@@ -17,12 +18,8 @@ class ChatRoomObject
     }
     options = defaults.merge(opts)
     
-    @title=options[:title]
-    @description=options[:description]
-    @chat_display=options[:chat_display]
-    @allow_change=options[:allow_change]
-    @site=options[:site]
-    raise "You need to specify a site for your chat room" if @site==nil
+    set_options(options)
+    requires @site
   end
     
   def create

data/lib/sambal-cle/data_objects/event.rb

@@ -1,7 +1,9 @@
 class EventObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
+  include DateFactory
+  include StringFactory
   include Workflows
 
   attr_accessor :title, :month, :day, :year, :start_hour, :start_minute,
@@ -23,21 +25,8 @@ class EventObject
     }
     options = defaults.merge(opts)
 
-    @title=options[:title]
-    @month=options[:month]
-    @day=options[:day]
-    @year=options[:year]
-    @start_hour=options[:start_hour]
-    @start_minute=options[:start_minute]
-    @start_meridian=options[:start_meridian]
-    @duration_hours=options[:duration_hours]
-    @duration_minutes=options[:duration_minutes]
-    @end_hour=options[:end_hour]
-    @end_minute=options[:end_minute]
-    @end_meridian=options[:end_meridian]
-    @message=options[:message]
-    @site=options[:site]
-    raise "You need to specify a site for your wiki" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   def create

data/lib/sambal-cle/data_objects/forum.rb

@@ -1,8 +1,9 @@
 # Note that this class is for icon-sakai-forums. NOT jforums.
 class ForumObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
+  include StringFactory
   include Workflows
   
   attr_accessor :site, :title, :short_description, :description, :direct_link,
@@ -16,11 +17,8 @@ class ForumObject
     }
     options = defaults.merge(opts)
     
-    @site=options[:site]
-    @title=options[:title]
-    @short_description=options[:short_description]
-    @description=options[:description]
-    raise "You need to specify a site for your Forum" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   alias :name :title
@@ -53,9 +51,7 @@ class ForumObject
       end
       edit.save
     end
-    @title=opts[:title] unless opts[:title] == nil
-    @short_description=opts[:short_description] unless opts[:short_description] == nil
-    @description=opts[:description] unless opts[:description] == nil
+    set_options(opts)
   end
     
   def view
@@ -101,7 +97,7 @@ end
 
 class TopicObject
 
-  include PageHelper
+  include Foundry
   include Utilities
   include Workflows
   
@@ -120,11 +116,7 @@ class TopicObject
     }
     options = defaults.merge(opts)
     
-    @title=options[:title]
-    @short_description=options[:short_description]
-    @description=options[:description]
-    @site=options[:site]
-    @forum=options[:forum]
+    set_options(options)
     raise "You must define a site for your Topic" if @site==nil
     raise "You must specify an existing Forum for your Topic" if @forum==nil
   end
@@ -160,9 +152,7 @@ class TopicObject
       end
       edit.save
     end
-    @title=opts[:title] unless opts[:title] == nil
-    @short_description=opts[:short_description] unless opts[:short_description] == nil
-    @description=opts[:description] unless opts[:description] == nil
+    set_options(opts)
   end
     
   def view

data/lib/sambal-cle/data_objects/lesson.rb

@@ -1,7 +1,7 @@
 class ModuleObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
   include Workflows
 
   attr_accessor :title, :description, :keywords, :start_date, :end_date, :site, :href
@@ -14,13 +14,8 @@ class ModuleObject
     }
     options = defaults.merge(opts)
 
-    @title=options[:title]
-    @description=options[:description]
-    @keywords=options[:keywords]
-    @start_date=options[:start_date]
-    @end_date=options[:end_date]
-    @site=options[:site]
-    raise "You must specify a Site name for your lesson" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   alias :name :title
@@ -52,8 +47,8 @@ end
 
 class ContentSectionObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
   include Workflows
 
   attr_accessor :site, :module, :title, :instructions, :modality, :content_type,
@@ -70,21 +65,7 @@ class ContentSectionObject
     }
     options = defaults.merge(opts)
 
-    @site=options[:site]
-    @module=options[:module]
-    @title=options[:title]
-    @instructions=options[:instructions]
-    @modality=options[:modality]
-    @content_type=options[:content_type]
-    @copyright_status=options[:copyright_status]
-    @editor_content=options[:editor_content]
-    @file_name=options[:file_name]
-    @file_path=options[:file_path]
-    @file_description=options[:file_description]
-    @file_folder=options[:file_folder]
-    @url=options[:url]
-    @url_title=options[:url_title]
-    @url_description=options[:url_description]
+    set_options(options)
     raise "Your modality variable must be an Array containing one or more keys\nthat match the checkbox methods, like this:\n[:uncheck_textual, :check_visual, :check_auditory]" unless @modality.class==Array
     raise "You must specify a Site for your Section" if @site==nil
     raise "You must specify a Module for your Section" if @module==nil
@@ -178,8 +159,6 @@ class ContentSectionObject
 
       edit.finish
     end
-    @title=opts[:title] unless opts[:title]==nil
-    @instructions=opts[:instructions] unless opts[:instructions]==nil
-    @modality=opts[:modality] unless opts[:modality]==nil
+    set_options(opts)
   end
 end

data/lib/sambal-cle/data_objects/message.rb

@@ -1,7 +1,8 @@
 class MessageObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
+  include StringFactory
   include Workflows
 
   attr_accessor :site, :subject, :send_cc, :recipients, :message, :label
@@ -15,12 +16,8 @@ class MessageObject
     }
     options = defaults.merge(opts)
 
-    @subject=options[:subject]
-    @recipients=options[:recipients]
-    @site=options[:site]
-    @message=options[:message]
-    @label=options[:label]
-    raise "You need to specify a site for your web content" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   def create
@@ -36,8 +33,8 @@ end
 
 class MessageFolderObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
   include Workflows
 
   attr_accessor :site

data/lib/sambal-cle/data_objects/poll.rb

@@ -1,7 +1,8 @@
 class PollObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
+  include StringFactory
   include Workflows
   
   attr_accessor :question, :instructions, :options, :opening_date, :closing_date,
@@ -16,15 +17,8 @@ class PollObject
     }
     options = defaults.merge(opts)
     
-    @question=options[:question]
-    @options=options[:options]
-    @opening_date=options[:opening_date]
-    @closing_date=options[:closing_date]
-    @site=options[:site]
-    @instructions=options[:instructions]
-    @access=options[:access]
-    @visibility=options[:visibility]
-    raise "You need to specify a site for your blog entry" if @site==nil
+    set_options(options)
+    requires @site
   end
     
   def create
@@ -59,6 +53,7 @@ class PollObject
     
   def edit opts={}
     #TODO: Add stuff here
+    set_options(opts)
   end
     
   def view

data/lib/sambal-cle/data_objects/resource.rb

@@ -1,7 +1,7 @@
 class FileObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
   include Workflows
 
   attr_accessor :name, :site, :source_path, :target_folder, :href
@@ -13,11 +13,9 @@ class FileObject
     }
     options = defaults.merge(opts)
 
-    @name = options[:name]
-    @source_path = options[:source_path]
-    @site = options[:site]
-    options[:target_folder] == nil ? @target_folder=@site : @target_folder=options[:target_folder]
-    raise "You must specify a Site for your Folder" if @site==nil
+    set_options(options)
+    @target_folder=@site if options[:target_folder]==nil
+    requires @site
   end
 
   def create
@@ -38,8 +36,8 @@ class FileObject
 end
 
 class FolderObject
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
   include Workflows
 
   attr_accessor :name, :parent_folder, :site
@@ -52,10 +50,8 @@ class FolderObject
     }
     options = defaults.merge(opts)
 
-    @name = options[:name]
-    @parent_folder = options[:parent_folder]
-    @site = options[:site]
-    raise "You must specify a Site for your Folder" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   def create
@@ -73,19 +69,19 @@ class FolderObject
 end
 
 class WebLinkObject
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
   include Workflows
 
-  attr_accessor
+  attr_accessor :site
 
   def initialize(browser, opts={})
     @browser = browser
 
     defaults = {}
     options = defaults.merge(opts)
-    @site = options[:site]
-    raise "You must specify a Site for your Web Link" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   def create
@@ -96,8 +92,8 @@ end
 
 class HTMLPageObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
   include Workflows
 
   attr_accessor :name, :description, :site, :folder, :html, :url
@@ -112,13 +108,8 @@ class HTMLPageObject
     }
     options = defaults.merge(opts)
 
-    @name = options[:name]
-    @description = options[:description]
-    @site = options[:site]
-    @folder = options[:folder]
-    @html = options[:html]
-    @site = options[:site]
-    raise "You must specify a Site for your HTML Page" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   alias :title :name
@@ -163,19 +154,19 @@ class HTMLPageObject
 end
 
 class TextDocumentObject
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
   include Workflows
 
-  attr_accessor
+  attr_accessor :site
 
   def initialize(browser, opts={})
     @browser = browser
 
     defaults = {}
     options = defaults.merge(opts)
-    @site = options[:site]
-    raise "You must specify a Site for your Text Document" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   def create
@@ -186,19 +177,19 @@ class TextDocumentObject
 end
 
 class CitationListObject
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
   include Workflows
 
-  attr_accessor
+  attr_accessor :site
 
   def initialize(browser, opts={})
     @browser = browser
 
     defaults = {}
     options = defaults.merge(opts)
-    @site = options[:site]
-    raise "You must specify a Site for your Citations List" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   def create

data/lib/sambal-cle/data_objects/site.rb

@@ -1,9 +1,9 @@
 class SiteObject
 
-  include PageHelper
-  include Utilities
-  include Randomizers
-  include DateMakers
+  include Foundry
+  include DataFactory
+  include StringFactory
+  include DateFactory
   include Workflows
 
   attr_accessor :name, :id, :subject, :course, :section, :term, :authorizer,
@@ -27,19 +27,7 @@ class SiteObject
       :site_contact_name => random_alphanums(5)+" "+random_alphanums(8)
     }
     options = defaults.merge(opts)
-
-    @subject=options[:subject]
-    @course=options[:course]
-    @section=options[:section]
-    @authorizer=options[:authorizer]
-    @web_content_source=options[:web_content_source]
-    @email=options[:email]
-    @joiner_role=options[:joiner_role]
-    @web_content_title=options[:web_content_title]
-    @description=options[:description]
-    @short_description=options[:short_description]
-    @site_contact_name=options[:site_contact_name]
-    @site_contact_email=options[:site_contact_email]
+    set_options(options)
   end
 
   def create
@@ -268,6 +256,7 @@ class SiteObject
 
   end
 
+  # TODO: Improve this method to better take advantage of the UserObject...
   def add_official_participants opts={}
     participants = opts[:participants].join("\n")
     open_my_site_by_name @name unless @browser.title=~/#{@name}/

data/lib/sambal-cle/data_objects/syllabus.rb

@@ -1,7 +1,8 @@
 class SyllabusObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
+  include StringFactory
   include Workflows
 
   attr_accessor :title, :content, :site
@@ -14,10 +15,8 @@ class SyllabusObject
         :content=>random_multiline(50, 5, :alpha)
     }
     options = defaults.merge(opts)
-    @title=options[:title]
-    @content=options[:content]
-    @site=options[:site]
-    raise "You must specify a Site for the announcement" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   alias :name :title
@@ -50,8 +49,7 @@ class SyllabusObject
       item.title.set opts[:title] unless opts[:title]==nil
       item.enter_source_text(item.editor, opts[:content]) unless opts[:content]==nil
     end
-    @title = opts[:title] unless opts[:title]==nil
-    @content = opts[:content] unless opts[:content]==nil
+    set_options(opts)
   end
 
   def get_properties

data/lib/sambal-cle/data_objects/user.rb

@@ -0,0 +1,88 @@
+class UserObject
+
+  include Foundry
+  include DataFactory
+  include StringFactory
+  include DateFactory
+  include Workflows
+  
+  attr_accessor :id, :first_name, :last_name, :password, :email, :type,
+                :created_by, :creation_date, :modified_by, :modified_date, :internal_id,
+                :full_name, :long_name, :ln_fn_id
+  
+  def initialize(browser, opts={})
+    @browser = browser
+    defaults = {
+        :id=>random_alphanums,
+        :first_name=>random_alphanums,
+        :last_name=>random_alphanums,
+        :email=>random_email,
+        :type=>"Student",
+        :password=>random_alphanums,
+    }
+    options = defaults.merge(opts)
+
+    set_options(options)
+    @full_name="#{@first_name} #{last_name}"
+    @long_name="#{@first_name} #{last_name} (#{@id})"
+    @ln_fn_id="#{@last_name}, #{@first_name} (#{@id})"
+  end
+    
+  def create
+    # TODO
+  end
+    
+  def edit opts={}
+    # TODO
+  end
+    
+  def view
+    # TODO
+  end
+    
+  def delete
+    # TODO
+  end
+
+  def exist?
+    # TODO
+  end
+
+  def log_in
+    if logged_in?
+      # do nothing
+    else # see if we're on the login screen
+      if @browser.frame(:id, "ifrm").text_field(:id, "eid").present?
+        userlogin
+      else # Log the current user out, then log in
+        log_out
+        userlogin
+      end
+    end
+  end
+  alias login log_in
+
+  def logged_in?
+    welcome=@browser.span(:class=>"welcome")
+    if welcome.present?
+      welcome.text=~/#{@first_name}/ ? true : false
+    else
+      return false
+    end
+  end
+
+  def log_out
+    @browser.link(:text=>"Logout").click
+  end
+
+  private
+
+  def userlogin
+    on Login do |page|
+      page.login_with @id, @password
+    end
+  end
+
+end
+    
+      

data/lib/sambal-cle/data_objects/web_content_tool.rb

@@ -1,7 +1,8 @@
 class WebContentObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
+  include StringFactory
   include Workflows
 
   attr_accessor :title, :source, :site
@@ -15,10 +16,8 @@ class WebContentObject
     }
     options = defaults.merge(opts)
 
-    @title=options[:title]
-    @source=options[:source]
-    @site=options[:site]
-    raise "You need to specify a site for your web content" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   def create

data/lib/sambal-cle/data_objects/wiki.rb

@@ -1,7 +1,8 @@
 class WikiObject
 
-  include PageHelper
-  include Utilities
+  include Foundry
+  include DataFactory
+  include StringFactory
   include Workflows
 
   attr_accessor :title, :content, :site, :href
@@ -15,10 +16,8 @@ class WikiObject
     }
     options = defaults.merge(opts)
 
-    @title=options[:title]
-    @content=options[:content]
-    @site=options[:site]
-    raise "You need to specify a site for your wiki" if @site==nil
+    set_options(options)
+    requires @site
   end
 
   alias :name :title
@@ -48,6 +47,7 @@ class WikiObject
       edit.edit
       # TODO more here
     end
+    set_options(opts)
   end
 
   def get_content

data/lib/sambal-cle/page_objects/account.rb

@@ -53,7 +53,6 @@ class UserAccount < BasePage
   # Clicks the Modify Details button. Instantiates the EditAccount class.
   def modify_details
     @browser.frame(:index=>0).button(:name=>"eventSubmit_doModify").click
-    EditAccount.new(@browser)
   end
 
   # Gets the text of the User ID field.
@@ -105,7 +104,6 @@ class UserAccount < BasePage
   # instantiates the Home Class.
   def home
     @browser.link(:text, "Home").click
-    Home.new(@browser)
   end
 
 end

data/lib/sambal-cle/page_objects/announcements.rb

@@ -51,7 +51,6 @@ class Announcements < BasePage
   # @param subject [String] the text of the announcement listing link.
   def preview_announcement(subject)
     frm.link(:text=>subject).click
-    PreviewAnnouncements.new(@browser)
   end
 
   # Selects the specified list item from the View selection list.