From f726198b8d35e02610e8066ffb492ddbd1f05cf1 Mon Sep 17 00:00:00 2001 From: Mathias Bynens Date: Mon, 25 Jan 2016 00:54:29 +0100 Subject: [PATCH] Update test environments --- .travis.yml | 6 +++--- Gruntfile.js | 4 ++-- README.md | 12 ++++++------ data/index.txt | 9 ++++++--- iso-8859-14.js | 6 +++--- package.json | 10 +++++----- src/iso-8859-14.js | 6 +++--- 7 files changed, 28 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cfdcbd..351e38c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,14 +2,14 @@ language: node_js node_js: - "0.10" - "0.12" - - "iojs" + - "5" before_script: - "npm install -g grunt-cli" # Narwhal uses a hardcoded path to openjdk v6, so use that version - "sudo apt-get update -qq" - "sudo apt-get install -qq openjdk-6-jre" - - "PACKAGE=rhino1_7R5; wget https://github.com/mozilla/rhino/releases/download/Rhino1_7R5_RELEASE/$PACKAGE.zip && sudo unzip $PACKAGE -d /opt/ && rm $PACKAGE.zip" - - "PACKAGE=rhino1_7R5; echo -e '#!/bin/sh\\njava -jar /opt/'$PACKAGE'/js.jar $@' | sudo tee /usr/local/bin/rhino && sudo chmod +x /usr/local/bin/rhino" + - "PACKAGE=rhino1.7.6; wget https://github.com/mozilla/rhino/releases/download/Rhino1_7_6_RELEASE/$PACKAGE.zip && sudo unzip $PACKAGE -d /opt/ && rm $PACKAGE.zip" + - "PACKAGE=rhino1.7.6; echo -e '#!/bin/sh\\njava -jar /opt/'$PACKAGE'/js.jar $@' | sudo tee /usr/local/bin/rhino && sudo chmod +x /usr/local/bin/rhino" - "PACKAGE=ringojs-0.11; wget https://github.com/ringo/ringojs/releases/download/v0.11.0/$PACKAGE.zip && sudo unzip $PACKAGE -d /opt/ && rm $PACKAGE.zip" - "PACKAGE=ringojs-0.11; sudo ln -s /opt/$PACKAGE/bin/ringo /usr/local/bin/ringo && sudo chmod +x /usr/local/bin/ringo" - "PACKAGE=v0.3.2; wget https://github.com/280north/narwhal/archive/$PACKAGE.zip && sudo unzip $PACKAGE -d /opt/ && rm $PACKAGE.zip" diff --git a/Gruntfile.js b/Gruntfile.js index 9b8016b..b09bf6e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -8,7 +8,7 @@ module.exports = function(grunt) { 'failOnError': true }, 'fetch': { - 'command': 'curl http://encoding.spec.whatwg.org/index-iso-8859-14.txt > data/index.txt' + 'command': 'curl https://encoding.spec.whatwg.org/index-iso-8859-14.txt > data/index.txt' }, 'transform-data': { 'command': 'node scripts/transform-data.js' @@ -17,7 +17,7 @@ module.exports = function(grunt) { 'command': 'istanbul cover --report "html" --verbose --dir "coverage" "tests/tests.js"' }, 'cover-coveralls': { - 'command': 'istanbul cover --verbose --dir "coverage" "tests/tests.js" && cat coverage/lcov.info | coveralls; rm -rf coverage/lcov*' + 'command': 'istanbul cover --verbose --dir "coverage" "tests/tests.js" && coveralls < coverage/lcov.info; rm -rf coverage/lcov*' }, 'test-narwhal': { 'command': 'echo "Testing in Narwhal..."; export NARWHAL_OPTIMIZATION=-1; narwhal "tests/tests.js"' diff --git a/README.md b/README.md index f222e7c..5c0d8e3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # iso-8859-14 [![Build status](https://travis-ci.org/mathiasbynens/iso-8859-14.svg?branch=master)](https://travis-ci.org/mathiasbynens/iso-8859-14) [![Code coverage status](https://coveralls.io/repos/mathiasbynens/iso-8859-14/badge.svg)](https://coveralls.io/r/mathiasbynens/iso-8859-14) [![Dependency status](https://gemnasium.com/mathiasbynens/iso-8859-14.svg)](https://gemnasium.com/mathiasbynens/iso-8859-14) -_iso-8859-14_ is a robust JavaScript implementation of [the iso-8859-14 character encoding as defined by the Encoding Standard](http://encoding.spec.whatwg.org/#iso-8859-14). +_iso-8859-14_ is a robust JavaScript implementation of [the iso-8859-14 character encoding as defined by the Encoding Standard](https://encoding.spec.whatwg.org/#iso-8859-14). This encoding is known under the following names: iso-8859-14, iso8859-14, and iso885914. @@ -36,7 +36,7 @@ In [Node.js](https://nodejs.org/), [io.js](https://iojs.org/), [Narwhal](http:// var iso885914 = require('iso-8859-14'); ``` -In [Rhino](http://www.mozilla.org/rhino/): +In [Rhino](https://www.mozilla.org/rhino/): ```js load('iso885914.js'); @@ -66,7 +66,7 @@ A string representing the semantic version number. ### `iso885914.labels` -An array of strings, each representing a [label](http://encoding.spec.whatwg.org/#label) for this encoding. +An array of strings, each representing a [label](https://encoding.spec.whatwg.org/#label) for this encoding. ### `iso885914.encode(input, options)` @@ -76,7 +76,7 @@ This function takes a plain text string (the `input` parameter) and encodes it a var encodedData = iso885914.encode(text); ``` -The optional `options` object and its `mode` property can be used to set the [error mode](http://encoding.spec.whatwg.org/#error-mode). For encoding, the error mode can be `'fatal'` (the default) or `'html'`. +The optional `options` object and its `mode` property can be used to set the [error mode](https://encoding.spec.whatwg.org/#error-mode). For encoding, the error mode can be `'fatal'` (the default) or `'html'`. ```js var encodedData = iso885914.encode(text, { @@ -94,7 +94,7 @@ This function takes a byte string (the `input` parameter) and decodes it accordi var text = iso885914.decode(encodedData); ``` -The optional `options` object and its `mode` property can be used to set the [error mode](http://encoding.spec.whatwg.org/#error-mode). For decoding, the error mode can be `'replacement'` (the default) or `'fatal'`. +The optional `options` object and its `mode` property can be used to set the [error mode](https://encoding.spec.whatwg.org/#error-mode). For decoding, the error mode can be `'replacement'` (the default) or `'fatal'`. ```js var text = iso885914.decode(encodedData, { @@ -106,7 +106,7 @@ var text = iso885914.decode(encodedData, { ## Support -_iso-8859-14_ is designed to work in at least Node.js v0.10.0, io.js v1.0.0, Narwhal 0.3.2, RingoJS 0.8-0.11, PhantomJS 1.9.0, Rhino 1.7RC4, as well as old and modern versions of Chrome, Firefox, Safari, Opera, and Internet Explorer. +_iso-8859-14_ is designed to work in at least Node.js v0.10.0, io.js v1.0.0, Narwhal 0.3.2, RingoJS 0.8-0.11, PhantomJS 1.9.0, Rhino 1.7RC4, as well as old and modern versions of Chrome, Firefox, Safari, Opera, Edge, and Internet Explorer. ## Unit tests & code coverage diff --git a/data/index.txt b/data/index.txt index b6ffad6..57c198d 100644 --- a/data/index.txt +++ b/data/index.txt @@ -1,8 +1,11 @@ # Any copyright is dedicated to the Public Domain. -# http://creativecommons.org/publicdomain/zero/1.0/ +# https://creativecommons.org/publicdomain/zero/1.0/ # -# For details on index-iso-8859-14.txt see the Encoding Standard -# http://encoding.spec.whatwg.org/ +# For details on index index-iso-8859-14.txt see the Encoding Standard +# https://encoding.spec.whatwg.org/ +# +# Identifier: 2c8651cfc08b1f35b17919ee5379f2fa006af3ec809f11b3b7f470785580542b +# Date: 2016-01-20 0 0x0080 € () 1 0x0081  () diff --git a/iso-8859-14.js b/iso-8859-14.js index d267494..6e98c7c 100644 --- a/iso-8859-14.js +++ b/iso-8859-14.js @@ -24,7 +24,7 @@ var INDEX_BY_CODE_POINT = {'128':0,'129':1,'130':2,'131':3,'132':4,'133':5,'134':6,'135':7,'136':8,'137':9,'138':10,'139':11,'140':12,'141':13,'142':14,'143':15,'144':16,'145':17,'146':18,'147':19,'148':20,'149':21,'150':22,'151':23,'152':24,'153':25,'154':26,'155':27,'156':28,'157':29,'158':30,'159':31,'160':32,'163':35,'167':39,'169':41,'173':45,'174':46,'182':54,'192':64,'193':65,'194':66,'195':67,'196':68,'197':69,'198':70,'199':71,'200':72,'201':73,'202':74,'203':75,'204':76,'205':77,'206':78,'207':79,'209':81,'210':82,'211':83,'212':84,'213':85,'214':86,'216':88,'217':89,'218':90,'219':91,'220':92,'221':93,'223':95,'224':96,'225':97,'226':98,'227':99,'228':100,'229':101,'230':102,'231':103,'232':104,'233':105,'234':106,'235':107,'236':108,'237':109,'238':110,'239':111,'241':113,'242':114,'243':115,'244':116,'245':117,'246':118,'248':120,'249':121,'250':122,'251':123,'252':124,'253':125,'255':127,'266':36,'267':37,'288':50,'289':51,'372':80,'373':112,'374':94,'375':126,'376':47,'7682':33,'7683':34,'7690':38,'7691':43,'7710':48,'7711':49,'7744':52,'7745':53,'7766':55,'7767':57,'7776':59,'7777':63,'7786':87,'7787':119,'7808':40,'7809':56,'7810':42,'7811':58,'7812':61,'7813':62,'7922':44,'7923':60}; var INDEX_BY_POINTER = {'0':'\x80','1':'\x81','2':'\x82','3':'\x83','4':'\x84','5':'\x85','6':'\x86','7':'\x87','8':'\x88','9':'\x89','10':'\x8A','11':'\x8B','12':'\x8C','13':'\x8D','14':'\x8E','15':'\x8F','16':'\x90','17':'\x91','18':'\x92','19':'\x93','20':'\x94','21':'\x95','22':'\x96','23':'\x97','24':'\x98','25':'\x99','26':'\x9A','27':'\x9B','28':'\x9C','29':'\x9D','30':'\x9E','31':'\x9F','32':'\xA0','33':'\u1E02','34':'\u1E03','35':'\xA3','36':'\u010A','37':'\u010B','38':'\u1E0A','39':'\xA7','40':'\u1E80','41':'\xA9','42':'\u1E82','43':'\u1E0B','44':'\u1EF2','45':'\xAD','46':'\xAE','47':'\u0178','48':'\u1E1E','49':'\u1E1F','50':'\u0120','51':'\u0121','52':'\u1E40','53':'\u1E41','54':'\xB6','55':'\u1E56','56':'\u1E81','57':'\u1E57','58':'\u1E83','59':'\u1E60','60':'\u1EF3','61':'\u1E84','62':'\u1E85','63':'\u1E61','64':'\xC0','65':'\xC1','66':'\xC2','67':'\xC3','68':'\xC4','69':'\xC5','70':'\xC6','71':'\xC7','72':'\xC8','73':'\xC9','74':'\xCA','75':'\xCB','76':'\xCC','77':'\xCD','78':'\xCE','79':'\xCF','80':'\u0174','81':'\xD1','82':'\xD2','83':'\xD3','84':'\xD4','85':'\xD5','86':'\xD6','87':'\u1E6A','88':'\xD8','89':'\xD9','90':'\xDA','91':'\xDB','92':'\xDC','93':'\xDD','94':'\u0176','95':'\xDF','96':'\xE0','97':'\xE1','98':'\xE2','99':'\xE3','100':'\xE4','101':'\xE5','102':'\xE6','103':'\xE7','104':'\xE8','105':'\xE9','106':'\xEA','107':'\xEB','108':'\xEC','109':'\xED','110':'\xEE','111':'\xEF','112':'\u0175','113':'\xF1','114':'\xF2','115':'\xF3','116':'\xF4','117':'\xF5','118':'\xF6','119':'\u1E6B','120':'\xF8','121':'\xF9','122':'\xFA','123':'\xFB','124':'\xFC','125':'\xFD','126':'\u0177','127':'\xFF'}; - // http://encoding.spec.whatwg.org/#error-mode + // https://encoding.spec.whatwg.org/#error-mode var error = function(codePoint, mode) { if (mode == 'replacement') { return '\uFFFD'; @@ -36,7 +36,7 @@ throw Error(); }; - // http://encoding.spec.whatwg.org/#single-byte-decoder + // https://encoding.spec.whatwg.org/#single-byte-decoder var decode = function(input, options) { var mode; if (options && options.mode) { @@ -74,7 +74,7 @@ return result; }; - // http://encoding.spec.whatwg.org/#single-byte-encoder + // https://encoding.spec.whatwg.org/#single-byte-encoder var encode = function(input, options) { var mode; if (options && options.mode) { diff --git a/package.json b/package.json index 3f4bafd..0649686 100644 --- a/package.json +++ b/package.json @@ -34,15 +34,15 @@ "test": "node tests/tests.js" }, "devDependencies": { - "coveralls": "^2.11.2", + "coveralls": "^2.11.6", "grunt": "^0.4.5", - "grunt-shell": "^1.1.1", + "grunt-shell": "^1.1.2", "grunt-template": "^0.2.3", - "istanbul": "^0.3.5", + "istanbul": "^0.4.2", "jsesc": "^0.5.0", - "qunit-extras": "^1.4.1", + "qunit-extras": "^1.4.5", "qunitjs": "~1.11.0", - "requirejs": "^2.1.15", + "requirejs": "^2.1.22", "string.fromcodepoint": "^0.2.1" } } diff --git a/src/iso-8859-14.js b/src/iso-8859-14.js index 2fbebe8..6fa7167 100644 --- a/src/iso-8859-14.js +++ b/src/iso-8859-14.js @@ -24,7 +24,7 @@ var INDEX_BY_CODE_POINT = <%= indexByCodePoint %>; var INDEX_BY_POINTER = <%= indexByPointer %>; - // http://encoding.spec.whatwg.org/#error-mode + // https://encoding.spec.whatwg.org/#error-mode var error = function(codePoint, mode) { if (mode == 'replacement') { return '\uFFFD'; @@ -36,7 +36,7 @@ throw Error(); }; - // http://encoding.spec.whatwg.org/#single-byte-decoder + // https://encoding.spec.whatwg.org/#single-byte-decoder var decode = function(input, options) { var mode; if (options && options.mode) { @@ -74,7 +74,7 @@ return result; }; - // http://encoding.spec.whatwg.org/#single-byte-encoder + // https://encoding.spec.whatwg.org/#single-byte-encoder var encode = function(input, options) { var mode; if (options && options.mode) {