Fix TAGS target to not include sqlite files

seat-charts.js:387-388 now allows hyphens in seat's hover-label (but no spaces, since must be limited to characters legal for HTML ID attribute -waah)
seatmap.js now extracts seat number from composite label before proceeding
Scenarios modified to use seat full names ("Reserved-B1") for choosing seats

Author: armandofox

Makefile

@@ -1,4 +1,4 @@
-FILES = $(shell find app public lib features spec config db -type f -a '!' -name '\#*' -a '!' -name '.\#' -a '!' -name '*.min.js' -a '!' -name rails.js)
+FILES = $(shell find app public lib features spec config db -type f -a '!' -name '\#*' -a '!' -name '.\#' -a '!' -name '*.min.js' -a '!' -name rails.js -a '!' -name '*.sqlite3')
 
 all: TAGS
 

app/assets/javascripts/jquery.seat-charts.js

@@ -384,8 +384,8 @@
 			 *
 			 */
 
-			$.each(characters.match(/[a-z_]{1}(\[[0-9a-z_]{0,}(,[0-9a-z_ ]+)?\])?/gi), function (column, characterParams) { 
-				var matches         = characterParams.match(/([a-z_]{1})(\[([0-9a-z_ ,]+)\])?/i),
+			$.each(characters.match(/[a-z_]{1}(\[[0-9a-z_-]{0,}(,[0-9a-z_ ]+)?\])?/gi), function (column, characterParams) { 
+				var matches         = characterParams.match(/([a-z_]{1})(\[([0-9a-z_ ,-]+)\])?/i),
 					//no matter if user specifies [] params, the character should be in the second element
 					character       = matches[1],
 					//check if user has passed some additional params to override id or label

app/assets/javascripts/seatmap.js

@@ -18,7 +18,8 @@ A1.seatmap = {
       ]
     }
     ,click: function(evt) {
-      var seatNum = this.settings.id;
+      var clickedSeat = this.settings.id; // format:  ZoneName-A111 (hyphen is separator)
+      var seatNum = clickedSeat.substr(clickedSeat.lastIndexOf("-") + 1);
       switch(this.status()) {
       case 'available':           // clicking on available seat selects it...
         if (A1.seatmap.selectedSeats.length < A1.seatmap.max) { // ...if still seats to select

features/reserved_seating/add_comps_with_reserved_seating.feature

@@ -21,7 +21,7 @@ Scenario: add comps and reserve specific seats
   And I select "Comp (2010)" from "What type:"
   And I select the "March 2, 2:00pm" performance of "Chicago" from "Reserve for:"
   Then I should see the seatmap  
-  When I choose seats B1,B2
+  When I choose seats Reserved-B1,Reserved-B2
   Then I should see "B1" in the list of selected seats
   When I press "Add Vouchers"
   Then customer "Joe Mallon" should have seat B1 for the March 2, 2010, 2pm performance of "Chicago"

features/reserved_seating/purchase_reserved_seats.feature

@@ -20,7 +20,7 @@ Scenario: purchase tickets with reserved seating
   And I select "1" from "General - $11.00"
   And I select "1" from "Discount - $9.00"
   And I press "Choose Seats..."
-  And I choose seats B1,B2
+  And I choose seats Reserved-B1,Reserved-B2
   And I press "Continue to Billing Information"
   Then the cart should show the following items:
     | description             | seats | price |
@@ -35,7 +35,7 @@ Scenario: when admin purchases tickets, nonticket items shouldn't require seats
   And I fill in "General - $11.00" with "2"
   And I fill in "Wine - $7.00" with "1"
   And I press "Choose Seats..."
-  And I choose seats B1,B2
+  And I choose seats Reserved-B1,Reserved-B2
   When I press "Continue to Billing Information"
   Then the cart should show the following items:
     | description             | seats | price |

features/reserved_seating/walkup_sale_with_reserved_seating.feature

@@ -24,7 +24,7 @@ Scenario: sell tickets with reserved seats
   And I fill in "Discount" with "1"
   And I press "Choose Seats..."
   Then I should see the seatmap
-  When I choose seats B1,B2,A1
+  When I choose seats Reserved-B1,Reserved-B2,Reserved-A1
   Then I should see "A1,B1,B2" in the list of selected seats
   When I complete the walkup sale with credit card
   Then I should see "3 tickets (total $31.00) paid by Credit card. Seats: A1, B1, B2"
@@ -34,7 +34,7 @@ Scenario: sell tickets as well as nonticket items at a reserved seating show
 
   When I fill in "General" with "1"
   And I fill in "Wine" with "2"
-  And I successfully choose seat B1
+  And I successfully choose seat Reserved-B1
   And I complete the walkup sale with credit card
   Then I should see "1 ticket and 2 retail items (total $25.00) paid by Credit card. Seats: B1"