fix: correctly apply list of selector types when generating unique se…

…lector

refs #8

src/css-selector-generator.coffee

@@ -41,25 +41,6 @@ class CssSelectorGenerator
 
     return characters.join ''
 
-    console.log 'item', characters
-
-
-    ###
-				// `\r` is already tokenized away at this point by the HTML parser.
-				// `:` can be escaped as `\:`, but that fails in IE < 8.
-				if (/[\t\n\v\f:]/.test(character)) {
-					value = '\\' + charCode.toString(16).toUpperCase() + ' ';
-				} else if (/[ !"#$%&'()*+,./;<=>?@\[\\\]^`{|}~]/.test(character)) {
-					value = '\\' + character;
-				} else {
-					value = character;
-				}
-    ###
-
-    escape item
-      .replace /\%/g, '\\'
-      # special characters *+-./
-      .replace /\*\+\-\.\//g, '\\$&'
 
   validateId: (id) ->
     # ID must exist
@@ -157,16 +138,17 @@ class CssSelectorGenerator
     return selectors.i if selectors.i?
 
     # tag selector (should return unique for BODY)
-    return selectors.t if @testUniqueness element, selectors.t
+    if selectors.t?
+      return selectors.t if @testUniqueness element, selectors.t
 
     # attribute selector
-    if selectors.a isnt null and selectors.a.length isnt 0
+    if selectors.a? and selectors.a.length isnt 0
       for item in selectors.a
         return item if @testUniqueness element, item
 
     # TODO check each class separately
     # class selector
-    if selectors.c.length isnt 0
+    if selectors.c? and selectors.c.length isnt 0
       all_classes = selectors.c.join ''
 
       # class selector without tag

test/src/css-selector-generator.spec.coffee

@@ -92,6 +92,11 @@ describe 'CSS Selector Generator', ->
       x.setOptions selectors: ['attribute']
       expect(x.options.selectors).toEqual ['attribute']
 
+    it 'should not use selectors that are not allowed', ->
+      root.innerHTML = '<a></a><a></a>'
+      x.setOptions selectors: ['tag']
+      expect(x.getSelector root.firstChild).toEqual null
+
 
   describe 'selectors', ->
 
@@ -170,6 +175,12 @@ describe 'CSS Selector Generator', ->
         expect(result.length).toBe 3
         expect(x.getClassSelectors root).toEqual []
 
+      it 'should use attribute selector when enabled', ->
+        x.setOptions selectors: ['tag', 'id', 'class', 'nthchild', 'attribute']
+        root.innerHTML = '<a rel="aaa"></a><a rel="bbb"></a>'
+        result = x.getSelector root.firstChild
+        expect(result).toEqual '[rel=aaa]'
+
     describe 'n-th child', ->
 
       it 'should get n-th child selector for an element', ->