arno/pup
1
0
Fork 0
mirror of https://github.com/ericchiang/pup synced 2024-11-24 08:58:08 +00:00
Code Issues Releases Wiki Activity

class selector fixed

Browse Source
This commit is contained in:
ericchiang 2014-09-14 19:00:31 -04:00
parent 1aa3770b59
commit 3e26ed725f
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.go
View File

@ -11,7 +11,7 @@ import (
"strings"
)
const VERSION string = "0.1.0"
const VERSION string = "0.1.1"
var (
// Flags

20
selector/selector.go
View File

@ -42,7 +42,7 @@ func parseAttrField(command string) (attrKey string, matcher *regexp.Regexp,
attrKeyLen := len(attrKey)
switch attrKey[attrKeyLen-1] {
case '~':
matcherString = fmt.Sprintf(`[^\s]%s[$\s]`, attrVal)
matcherString = fmt.Sprintf(`\b%s\b`, attrVal)
case '$':
matcherString = fmt.Sprintf("%s$", attrVal)
case '^':
@ -67,18 +67,27 @@ func (s *Selector) setFieldValue(f selectorField, v string) error {
if v == "" {
return nil
}
r, err := regexp.Compile(fmt.Sprintf("^%s$", v))
if err != nil {
return err
}
switch f {
case ClassField:
r, err := regexp.Compile(fmt.Sprintf(`\b%s\b`, v))
if err != nil {
return err
}
s.Attrs["class"] = r
case IDField:
r, err := regexp.Compile(fmt.Sprintf("^%s$", v))
if err != nil {
return err
}
s.Attrs["id"] = r
case NameField:
r, err := regexp.Compile(fmt.Sprintf("^%s$", v))
if err != nil {
return err
}
s.Name = r
case AttrField:
// Attribute fields are a little more complicated
keystring, matcher, err := parseAttrField(v)
if err != nil {
return err
@ -94,6 +103,7 @@ func NewSelector(s string) (*Selector, error) {
selector := &Selector{nil, attrs}
nextField := NameField
start := 0
// Parse the selector character by character
for i, c := range s {
switch c {
case '.':