ole-qa-framework 2.7.3 → 3.0.0

data/lib/olels/objects/control_007_line.rb

@@ -15,15 +15,15 @@
 module OLE_QA::Framework::OLELS
 
   # Represents a Marc control field 006 line in the OLELS Bib Editor.
-  class Control_007_Line < OLE_QA::Framework::OLELS::Line_Object
+  class Control_007_Line < OLE_QA::Framework::Line_Object
 
     # Set Marc data line elements.
     def set_elements
-      element(:field)                       {b.text_field(:id => "Control_Field_007_line#{@line_id}_control")}
-      element(:add_button)                  {b.button(:id => "Control_Field_007_addTagButton_id_line#{@line_id}")}
-      element(:edit_button)                 {b.button(:id => "Control_Field_007_EditTagButton_id_line#{@line_id}")}
-      element(:remove_button)               {b.button(:id => "Control_Field_007_removeTagButton_id_line#{@line_id}")}
-      element(:clear_button)                {b.button(:id => "Control_Field_007_clearTagButton_id_line#{@line_id}")}
+      element(:field)                       {b.text_field(:id => "Control_Field_007_line#{line_id}_control")}
+      element(:add_button)                  {b.button(:id => "Control_Field_007_addTagButton_id_line#{line_id}")}
+      element(:edit_button)                 {b.button(:id => "Control_Field_007_EditTagButton_id_line#{line_id}")}
+      element(:remove_button)               {b.button(:id => "Control_Field_007_removeTagButton_id_line#{line_id}")}
+      element(:clear_button)                {b.button(:id => "Control_Field_007_clearTagButton_id_line#{line_id}")}
     end
   end
 end

data/lib/olels/objects/data_line.rb

@@ -16,16 +16,16 @@ module OLE_QA::Framework::OLELS
 
   # Represents a Marc data line in the OLE Library System Bib Editor.
   #   e.g. '245','','','|aTitle of Work'
-  class Data_Line < OLE_QA::Framework::OLELS::Line_Object
+  class Data_Line < OLE_QA::Framework::Line_Object
 
     # Set Marc data line elements.
     def set_elements
-      element(:tag_field)               {b.text_field(:id => "dataField_tag_id_line#{@line_id}_control")}
-      element(:ind1_field)              {b.text_field(:id => "dataField_ind1_id_line#{@line_id}_control")}
-      element(:ind2_field)              {b.text_field(:id => "dataField_ind2_id_line#{@line_id}_control")}
-      element(:data_field)              {b.text_field(:id => "dataField_value_id_line#{@line_id}_control")}
-      element(:add_button)              {b.button(:id => "dataField_addTagButton_id_line#{@line_id}")}
-      element(:remove_button)           {b.button(:id => "dataField_removeTagButton_id_line#{@line_id}")}
+      element(:tag_field)               {b.text_field(:id => "dataField_tag_id_line#{line_id}_control")}
+      element(:ind1_field)              {b.text_field(:id => "dataField_ind1_id_line#{line_id}_control")}
+      element(:ind2_field)              {b.text_field(:id => "dataField_ind2_id_line#{line_id}_control")}
+      element(:data_field)              {b.text_field(:id => "dataField_value_id_line#{line_id}_control")}
+      element(:add_button)              {b.button(:id => "dataField_addTagButton_id_line#{line_id}")}
+      element(:remove_button)           {b.button(:id => "dataField_removeTagButton_id_line#{line_id}")}
     end
   end
 end

data/lib/olels/objects/editor_note.rb

@@ -39,7 +39,7 @@ module OLE_QA::Framework::OLELS
       super(browser)
 
       @line_number = line_number
-      @line_identifier = line_number - 1
+      line_identifier = line_number - 1
       @subline_number = subline_number
       @subline_identifier = subline_number - 1
       @note_type = note_type
@@ -64,14 +64,14 @@ module OLE_QA::Framework::OLELS
     end
 
     # Replace element identifiers in a series of element hashes.
-    # - Replace LINEID with @line_identifier
+    # - Replace LINEID with line_identifier
     # - Replace LINENUM with @line_number
     # - Replace SUBLINEID with @subline_identifier
     # - Replace SUBLINENUM with @subline_number
     def parse_elements(element_hash)
       replace_identifiers(element_hash, /SUBLINEID/, @subline_identifier.to_s)
       replace_identifiers(element_hash, /SUBLINENUM/, @subline_number.to_s)
-      replace_identifiers(element_hash, /LINEID/, @line_identifier.to_s)
+      replace_identifiers(element_hash, /LINEID/, line_identifier.to_s)
       replace_identifiers(element_hash, /LINENUM/, @line_number.to_s)
     end
 

data/lib/olels/objects/holdings_note.rb

@@ -14,13 +14,13 @@
 
 module OLE_QA::Framework::OLELS
   # A Holdings Note on the OLE Library System Instance Editor
-  class Holdings_Note < OLE_QA::Framework::OLELS::Line_Object
+  class Holdings_Note < OLE_QA::Framework::Line_Object
     # Set holdings note screen elements.
     def set_elements
-      element(:note_type_selector)                {b.select_list(:id => "OleHoldingNoteTypeField_line#{@line_id}_control")}
-      element(:note_field)                        {b.text_field(:id => "OleHoldingNoteDescField_line#{@line_id}_control")}
-      element(:add_button)                        {b.button(:id => "OleHoldingNotes_addTagButton_line#{@line_id}")}
-      element(:remove_button)                     {b.button(:id => "OleHoldingNotes_removeTagButton_line#{@line_id}")}
+      element(:note_type_selector)                {b.select_list(:id => "OleHoldingNoteTypeField_line#{line_id}_control")}
+      element(:note_field)                        {b.text_field(:id => "OleHoldingNoteDescField_line#{line_id}_control")}
+      element(:add_button)                        {b.button(:id => "OleHoldingNotes_addTagButton_line#{line_id}")}
+      element(:remove_button)                     {b.button(:id => "OleHoldingNotes_removeTagButton_line#{line_id}")}
     end
   end
 end

data/lib/olels/objects/item_note.rb

@@ -14,13 +14,13 @@
 
 module OLE_QA::Framework::OLELS
   # An Item Note in the OLE Library System Item Editor
-  class Item_Note < OLE_QA::Framework::OLELS::Line_Object
+  class Item_Note < OLE_QA::Framework::Line_Object
     # Set screen elements for an OLELS Item Note.
     def set_elements
-      element(:note_type_selector)                    {b.select_list(:id => "OleItemNoteTypeField_line#{@line_id}_control")}
-      element(:note_field)                            {b.text_field(:id => "OleItemNoteDescField_line#{@line_id}_control")}
-      element(:add_button)                            {b.button(:id => "OleItemNote_addTagButton_line#{@line_id}")}
-      element(:remove_button)                         {b.button(:id => "OleItemNote_removeTagButton_line#{@line_id}")}
+      element(:note_type_selector)                    {b.select_list(:id => "OleItemNoteTypeField_line#{line_id}_control")}
+      element(:note_field)                            {b.text_field(:id => "OleItemNoteDescField_line#{line_id}_control")}
+      element(:add_button)                            {b.button(:id => "OleItemNote_addTagButton_line#{line_id}")}
+      element(:remove_button)                         {b.button(:id => "OleItemNote_removeTagButton_line#{line_id}")}
     end
   end
 end

data/lib/olels/objects/ownership_extent_line.rb

@@ -14,27 +14,17 @@
 
 module OLE_QA::Framework::OLELS
   # An Extent of Ownership Line on the OLE Library System Instance Editor.
-  class Ownership_Extent_Line < OLE_QA::Framework::OLELS::Line_Object
+  class Ownership_Extent_Line < OLE_QA::Framework::Line_Object
 
     def set_elements
-      element(:type_selector)                     {b.select_list(:id => "extentTextualHoldingsType_line#{@line_id}_control")}
-      element(:statement_field)                   {b.text_field(:id => "extentTextualHoldings_line#{@line_id}_control")}
-      element(:add_button)                        {b.button(:id => "extentOfOwnership_addTagButton_line#{@line_id}")}
-      element(:remove_button)                     {b.button(:id => "extentOfOwnership_removeTagButton_line#{@line_id}")}
+      element(:type_selector)                     {b.select_list(:id => "extentTextualHoldingsType_line#{line_id}_control")}
+      element(:statement_field)                   {b.text_field(:id => "extentTextualHoldings_line#{line_id}_control")}
+      element(:add_button)                        {b.button(:id => "extentOfOwnership_addTagButton_line#{line_id}")}
+      element(:remove_button)                     {b.button(:id => "extentOfOwnership_removeTagButton_line#{line_id}")}
     end
 
     def set_sublines
-      create_ownership_note(1)
+      set_subline(:ownership_note, OLE_QA::Framework::OLELS::Ownership_Note)
     end
-
-    def create_ownership_note(which = 1)
-      create_subline("ownership_note_#{which}","Ownership_Note", which)
-    end
-    alias_method(:add_ownership_note,:create_ownership_note)
-
-    def remove_ownership_note(which = 1)
-      remove_subline("ownership_note_#{which}")
-    end
-    alias_method(:delete_ownership_note,:remove_ownership_note)
   end
 end

data/lib/olels/objects/patron_address_line.rb

@@ -14,75 +14,75 @@
 
 module OLE_QA::Framework::OLELS
   # An address line on an individual patron record.
-  class Patron_Address_Line < Line_Object
+  class Patron_Address_Line < OLE_QA::Framework::Line_Object
     # Define screen elements for patron record address line.
     def set_elements
-      # Format id string based on @line_id .
+      # Format id string based on line_id .
       # @note Address line 0 has no numerical identifier.
-      element(:details_link)                      {(@line_id == 0) ?
+      element(:details_link)                      {(line_id == 0) ?
                                                     id_str = 'OlePatronDocument-Address_detLink_add' :
-                                                    id_str = "OlePatronDocument-Address_detLink_line#{@line_id - 1}"
+                                                    id_str = "OlePatronDocument-Address_detLink_line#{line_id - 1}"
                                                     b.a(:id => id_str)}
-      element(:address_type_selector)             {(@line_id == 0) ?
+      element(:address_type_selector)             {(line_id == 0) ?
                                                     id_str = 'addressTypeCode_add_control' :
-                                                    id_str = "addressTypeCode_line#{@line_id - 1}_control"
+                                                    id_str = "addressTypeCode_line#{line_id - 1}_control"
                                                     b.select_list(:id => id_str)}
-      element(:address_source_selector)           {(@line_id == 0) ?
+      element(:address_source_selector)           {(line_id == 0) ?
                                                     id_str = 'addressSource_add_control' :
-                                                    id_str = "addressSource_line#{@line_id - 1}_control"
+                                                    id_str = "addressSource_line#{line_id - 1}_control"
                                                     b.select_list(:id => id_str)}
-      element(:valid_from_date_field)             {(@line_id == 0) ?
+      element(:valid_from_date_field)             {(line_id == 0) ?
                                                     id_str = 'addressValidFrom_add_control' :
-                                                    id_str = "addressValidFrom_line#{@line_id - 1}_control"
+                                                    id_str = "addressValidFrom_line#{line_id - 1}_control"
                                                     b.text_field(:id => id_str)}
-      element(:valid_to_date_field)               {(@line_id == 0) ?
+      element(:valid_to_date_field)               {(line_id == 0) ?
                                                     id_str = 'addressValidTo_add_control' :
-                                                    id_str = "addressValidTo_line#{@line_id - 1}_control"
+                                                    id_str = "addressValidTo_line#{line_id - 1}_control"
                                                     b.text_field(:id => id_str)}
-      element(:verified_checkbox)                 {(@line_id == 0) ?
+      element(:verified_checkbox)                 {(line_id == 0) ?
                                                     id_str = 'addressVerified_add_control' :
-                                                    id_str = "addressVerified_line#{@line_id - 1}_control"
+                                                    id_str = "addressVerified_line#{line_id - 1}_control"
                                                     b.checkbox(:id => id_str)}
-      element(:preferred_checkbox)                {(@line_id == 0) ?
+      element(:preferred_checkbox)                {(line_id == 0) ?
                                                     id_str = 'defaultValue_add_control' :
-                                                    id_str = "defaultValue_line#{@line_id - 1}_control"
+                                                    id_str = "defaultValue_line#{line_id - 1}_control"
                                                     b.checkbox(:id => id_str)}
-      element(:active_checkbox)                   {(@line_id == 0) ?
+      element(:active_checkbox)                   {(line_id == 0) ?
                                                     id_str = 'active_add_control' :
-                                                    id_str = "active_line#{@line_id - 1}_control"
+                                                    id_str = "active_line#{line_id - 1}_control"
                                                     b.checkbox(:id => id_str)}
       # Details Area
-      element(:line_1_field)                      {(@line_id == 0) ?
+      element(:line_1_field)                      {(line_id == 0) ?
                                                     id_str = 'line1_add_control' :
-                                                    id_str = "line1_line#{@line_id - 1}_control"
+                                                    id_str = "line1_line#{line_id - 1}_control"
                                                     b.text_field(:id => id_str)}
-      element(:line_2_field)                      {(@line_id == 0) ?
+      element(:line_2_field)                      {(line_id == 0) ?
                                                     id_str = 'line2_add_control' :
-                                                    id_str = "line2_line#{@line_id - 1}_control"
+                                                    id_str = "line2_line#{line_id - 1}_control"
                                                     b.text_field(:id => id_str)}
-      element(:line_3_field)                      {(@line_id == 0) ?
+      element(:line_3_field)                      {(line_id == 0) ?
                                                     id_str = 'line3_add_control' :
-                                                    id_str = "line3_line#{@line_id - 1}_control"
+                                                    id_str = "line3_line#{line_id - 1}_control"
                                                     b.text_field(:id => id_str)}
-      element(:city_field)                        {(@line_id == 0) ?
+      element(:city_field)                        {(line_id == 0) ?
                                                     id_str = 'city_add_control' :
-                                                    id_str = "city_line#{@line_id - 1}_control"
+                                                    id_str = "city_line#{line_id - 1}_control"
                                                     b.text_field(:id => id_str)}
-      element(:state_selector)                    {(@line_id == 0) ?
+      element(:state_selector)                    {(line_id == 0) ?
                                                     id_str = 'state_add_control' :
-                                                    id_str = "state_line#{@line_id - 1}_control"
+                                                    id_str = "state_line#{line_id - 1}_control"
                                                     b.select_list(:id => id_str)}
-      element(:postal_code_field)                 {(@line_id == 0) ?
+      element(:postal_code_field)                 {(line_id == 0) ?
                                                     id_str = 'postalCode_add_control' :
-                                                    id_str = "postalCode_line#{@line_id - 1}_control"
+                                                    id_str = "postalCode_line#{line_id - 1}_control"
                                                     b.text_field(:id => id_str)}
-      element(:country_selector)                  {(@line_id == 0) ?
+      element(:country_selector)                  {(line_id == 0) ?
                                                     id_str = 'country_add_control' :
-                                                    id_str = "country_line#{@line_id - 1}_control"
+                                                    id_str = "country_line#{line_id - 1}_control"
                                                     b.select_list(:id => id_str)}
       # Add/Delete
       element(:add_button)                        {b.button(:id => 'OlePatronDocument-Address_add')}
-      element(:delete_button)                     {b.button(:id => "OlePatronDocument-Address_del_line#{@line_id - 1}")}
+      element(:delete_button)                     {b.button(:id => "OlePatronDocument-Address_del_line#{line_id - 1}")}
     end
   end
 end

data/lib/olels/objects/patron_email_line.rb

@@ -14,27 +14,27 @@
 
 module OLE_QA::Framework::OLELS
   # A line of email address information on a patron record.
-  class Patron_Email_Line < Line_Object
+  class Patron_Email_Line < OLE_QA::Framework::Line_Object
     # Set screen elements on patron record email info line.
     def set_elements
-      element(:email_type_selector)                       {(@line_id == 0) ?
+      element(:email_type_selector)                       {(line_id == 0) ?
                                                             id_str = 'emailTypeCode_add_control' :
-                                                            id_str = "emailTypeCode_line#{@line_id - 1}_control"
+                                                            id_str = "emailTypeCode_line#{line_id - 1}_control"
                                                             b.select_list(:id => id_str)}
-      element(:email_address_field)                       {(@line_id == 0) ?
+      element(:email_address_field)                       {(line_id == 0) ?
                                                             id_str = 'emailAddress_add_control' :
-                                                            id_str = "emailAddress_line#{@line_id - 1}_control"
+                                                            id_str = "emailAddress_line#{line_id - 1}_control"
                                                             b.text_field(:id => id_str)}
-      element(:preferred_checkbox)                        {(@line_id == 0) ?
+      element(:preferred_checkbox)                        {(line_id == 0) ?
                                                             id_str = 'email_defaultValue_add_control' :
-                                                            id_str = "email_defaultValue_line#{@line_id - 1}_control"
+                                                            id_str = "email_defaultValue_line#{line_id - 1}_control"
                                                             b.checkbox(:id => id_str)}
-      element(:active_checkbox)                           {(@line_id == 0) ?
+      element(:active_checkbox)                           {(line_id == 0) ?
                                                             id_str = 'email_active_add_control' :
-                                                            id_str = "email_active_line#{@line_id - 1}_control"
+                                                            id_str = "email_active_line#{line_id - 1}_control"
                                                             b.checkbox(:id => id_str)}
       element(:add_button)                                {b.button(:id => 'OlePatronDocument-Email_add')}
-      element(:delete_button)                             {b.button(:id => "OlePatronDocument-Email_del_line#{@line_id - 1}")}
+      element(:delete_button)                             {b.button(:id => "OlePatronDocument-Email_del_line#{line_id - 1}")}
     end
   end
 end

data/lib/olels/objects/patron_phone_line.rb

@@ -14,35 +14,35 @@
 
 module OLE_QA::Framework::OLELS
   # A phone number info line on a single patron record.
-  class Patron_Phone_Line < Line_Object
+  class Patron_Phone_Line < OLE_QA::Framework::Line_Object
     # Set screen elements for patron phone number info line.
     def set_elements
-      element(:phone_type_selector)               {(@line_id == 0) ?
+      element(:phone_type_selector)               {(line_id == 0) ?
                                                     id_str = 'phoneTypeCode_add_control' :
-                                                    id_str = "phoneTypeCode_line#{@line_id - 1}_control"
+                                                    id_str = "phoneTypeCode_line#{line_id - 1}_control"
                                                     b.select_list(:id => id_str)}
-      element(:phone_number_field)                {(@line_id == 0) ?
+      element(:phone_number_field)                {(line_id == 0) ?
                                                     id_str = 'phoneNumber_add_control' :
-                                                    id_str = "phoneNumber_line#{@line_id - 1}_control"
+                                                    id_str = "phoneNumber_line#{line_id - 1}_control"
                                                     b.text_field(:id => id_str)}
-      element(:extension_field)                   {(@line_id == 0) ?
+      element(:extension_field)                   {(line_id == 0) ?
                                                     id_str = 'extensionNumber_add_control' :
-                                                    id_str = "extensionNumber_line#{@line_id - 1}_control"
+                                                    id_str = "extensionNumber_line#{line_id - 1}_control"
                                                     b.text_field(:id => id_str)}
-      element(:country_selector)                  {(@line_id == 0) ?
+      element(:country_selector)                  {(line_id == 0) ?
                                                     id_str = 'countryCode_add_control' :
-                                                    id_str = "countryCode_line#{@line_id - 1}_control"
+                                                    id_str = "countryCode_line#{line_id - 1}_control"
                                                     b.select_list(:id => id_str)}
-      element(:preferred_checkbox)                {(@line_id == 0) ?
+      element(:preferred_checkbox)                {(line_id == 0) ?
                                                     id_str = 'phoneNumber_defaultValue_add_control' :
-                                                    id_str = "phoneNumber_defaultValue_line#{@line_id - 1}_control"
+                                                    id_str = "phoneNumber_defaultValue_line#{line_id - 1}_control"
                                                     b.checkbox(:id => id_str)}
-      element(:active_checkbox)                   {(@line_id == 0) ?
+      element(:active_checkbox)                   {(line_id == 0) ?
                                                     id_str = 'phoneNumber_active_add_control' :
-                                                    id_str = "phoneNumber_active_line#{@line_id - 1}_control"
+                                                    id_str = "phoneNumber_active_line#{line_id - 1}_control"
                                                     b.checkbox(:id => id_str)}
       element(:add_button)                        {b.button(:id => 'OlePatronDocument-Phone_add')}
-      element(:delete_button)                     {b.button(:id => "OlePatronDocument-Phone_del_line#{@line_id - 1}")}
+      element(:delete_button)                     {b.button(:id => "OlePatronDocument-Phone_del_line#{line_id - 1}")}
     end
   end
 end

data/lib/olels/pages/bib_editor.rb

@@ -67,51 +67,10 @@ module OLE_QA::Framework::OLELS
       function(:readonly_data_field)                {|which = 1| which -= 1 ; b.span(:id => "dataField_value_id_readOnly_line#{which}_control")}
     end
 
-    # Add the first Marc Data Line to a new Bib Editor record.
-    # @note There will always be at least one Marc Data Line on a newly-opened record,
-    #   whether newly-created or previously extant.
     def set_lines
-      create_006_line(1)
-      create_007_line(1)
-      create_data_line(1)
+      set_line(:control_006_line, OLE_QA::Framework::OLELS::Control_006_Line)
+      set_line(:control_007_line, OLE_QA::Framework::OLELS::Control_007_Line)
+      set_line(:data_line, OLE_QA::Framework::OLELS::Data_Line)
     end
-    
-    # Add a control field 006 line to the editor page model.
-    def create_006_line(which = 1)
-      create_line("control_006_line_#{which}", "Control_006_Line", which)
-    end                         
-    alias_method(:add_006_line, :create_006_line)
-
-    # Add a control field 007 line to the editor page model.
-    def create_007_line(which = 1)
-      create_line("control_007_line_#{which}", "Control_007_Line", which)
-    end
-    alias_method(:add_007_line, :create_007_line)
-    
-    # Add a Marc data line to the editor page model.
-    def create_data_line(which = 1)
-      create_line("data_line_#{which}","Data_Line", which)
-    end
-    alias_method(:add_data_line, :create_data_line)
-
-    # Remove a Marc data line from the editor page model.
-    def remove_data_line(which = 1)
-      remove_line("data_line_#{which}")
-    end
-    alias_method(:delete_data_line,:remove_data_line)
-
-    # Remove a control 006 line from the editor page model.
-    def remove_006_line(which = 1)
-      remove_line("control_006_line_#{which}")
-    end
-    alias_method(:delete_006_line,:remove_006_line)
-
-    # Remove a control 007 line from the editor page model.
-    def remove_007_line(which = 1)
-      remove_line("control_007_line_#{which}")
-    end
-    alias_method(:delete_007_line,:remove_007_line)
-
-
   end
 end

data/lib/olels/pages/instance_editor.rb

@@ -48,39 +48,9 @@ module OLE_QA::Framework::OLELS
     end
 
     def set_lines
-      create_ownership_extent_line(1)
-      create_access_info_line(1)
-      create_holdings_note(1)
+      set_line(:ownership_extent_line, OLE_QA::Framework::OLELS::Ownership_Extent_Line)
+      set_line(:access_info_line, OLE_QA::Framework::OLELS::Access_Info_Line)
+      set_line(:holdings_note_line, OLE_QA::Framework::OLELS::Holdings_Note)
     end
-
-    def create_ownership_extent_line(which = 1)
-      create_line("ownership_extent_line_#{which}","Ownership_Extent_Line",which)
-    end
-    alias_method(:add_ownership_extent_line,:create_ownership_extent_line)
-
-    def create_access_info_line(which = 1)
-      create_line("access_info_line_#{which}","Access_Info_Line",which)
-    end
-    alias_method(:add_access_info_line,:create_access_info_line)
-
-    def create_holdings_note(which = 1)
-      create_line("holdings_note_#{which}","Holdings_Note",which)
-    end
-    alias_method(:add_holdings_note,:create_holdings_note)
-
-    def remove_ownership_extent_line(which = 1)
-      remove_line("ownership_extent_line_#{which}")
-    end
-    alias_method(:delete_ownership_extent_line,:remove_ownership_extent_line)
-
-    def remove_access_info_line(which = 1)
-      remove_line("access_info_line_#{which}")
-    end
-    alias_method(:delete_access_info_line,:remove_access_info_line)
-
-    def remove_holdings_note(which = 1)
-      remove_line("holdings_note_#{which}")
-    end
-    alias_method(:delete_holdings_note,:remove_holdings_note)
   end
 end