Skip to content

Support for search in file urls #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robertohuertasm wants to merge 3 commits into
base: master
Choose a base branch
from
+12 −9
Open

Support for search in file urls #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96f44a6
support for search
robertohuertasm Mar 14, 2017
4b882d0
standard compliant
robertohuertasm Mar 14, 2017
25014ac
windows compliant
robertohuertasm Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions lib/__tests__/args.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
var assert = require('assert')
var os = require('os')
var args = require('../args')

/* global describe it */

describe('args', function () {
describe('encode()', function () {
it('should hash encode object', function () {
var obj = {name: 'jp'}
var obj = { name: 'jp' }
var str = args.encode(obj)
assert.strictEqual(str, '%7B%22name%22%3A%22jp%22%7D')

Expand All @@ -18,7 +19,7 @@ describe('args', function () {
describe('urlWithArgs()', function () {
describe('> when url', function () {
it('should create a url with encoded args in hash', function () {
var url = args.urlWithArgs('http://google.com', {doThat: 'ok'})
var url = args.urlWithArgs('http://google.com', { doThat: 'ok' })
assert.strictEqual(url, 'http://google.com/#%7B%22doThat%22%3A%22ok%22%7D')

url = args.urlWithArgs('http://google.com')
Expand All @@ -28,18 +29,19 @@ describe('args', function () {

describe('> when file', function () {
it('should create a url with encoded args in hash', function () {
var url = args.urlWithArgs('/tmp/index.html', {doThat: 'ok'})
assert.strictEqual(url, 'file:///tmp/index.html#%7B%22doThat%22%3A%22ok%22%7D')
var url = args.urlWithArgs('/tmp/index.html', { doThat: 'ok' })
var isWin = os.type().indexOf('Windows') > -1
assert.strictEqual(url, isWin ? 'file:///C:\\tmp\\index.html#%7B%22doThat%22%3A%22ok%22%7D' : 'file:///tmp/index.html#%7B%22doThat%22%3A%22ok%22%7D')

url = args.urlWithArgs('/tmp/index.html')
assert.strictEqual(url, 'file:///tmp/index.html')
assert.strictEqual(url, isWin ? 'file:///C:\\tmp\\index.html' : 'file:///tmp/index.html')
})
})

describe('> when data uri', function () {
it('should create a url with encoded args in hash', function () {
var uri = 'data:text/plain;charset=utf-8;base64,dGhpcyBpcyBhIHRlc3QK'
var url = args.urlWithArgs(uri, {doThat: 'ok'})
var url = args.urlWithArgs(uri, { doThat: 'ok' })
assert.strictEqual(url, uri + '#%7B%22doThat%22%3A%22ok%22%7D')

url = args.urlWithArgs(uri)
Expand Down
7 changes: 4 additions & 3 deletions lib/args.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function encode (args) {

function urlWithArgs (urlOrFile, args) {
args = encode(args)

var urlParts = urlOrFile.split('?')
var u
if (urlOrFile.indexOf('http') === 0 || urlOrFile.indexOf('data') === 0) {
var urlData = url.parse(urlOrFile)
Expand All @@ -21,9 +21,10 @@ function urlWithArgs (urlOrFile, args) {
} else { // presumably a file url
u = url.format({
protocol: 'file',
pathname: path.resolve(urlOrFile),
pathname: path.resolve(urlParts[0]),
slashes: true,
hash: args || undefined
hash: args || undefined,
search: urlParts[1] || undefined
})
}

Expand Down