Merge pull request #14 from arniu/test

Add test

Author: arniu

.travis.yml

@@ -0,0 +1,14 @@
+language: node_js
+
+os:
+  - linux
+
+node_js:
+  - 'node'
+  - '12'
+  - '10'
+
+notifications:
+  email:
+    on_success: never
+    on_failure: always

babel.config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env',
+      {
+        targets: {
+          node: 'current'
+        }
+      }
+    ]
+  ]
+}

generate-icon.js renamed to generate.js

@@ -3,8 +3,6 @@
 const fs = require('fs')
 const path = require('path')
 
-const debug = console.log
-
 /**
  * @param {any} value
  * @return {string}
@@ -31,25 +29,36 @@ function resolvePath (file) {
   return `${__dirname}/node_modules/ionicons/dist/${file}`
 }
 
-;(function () {
-  const recipes = [
+const FILES = (exports.FILES = {
+  GLYPH_MAP: 'glyph/map.json',
+  FONT_FILE: 'fonts/Ionicons.ttf'
+})
+
+function generate () {
+  const workflows = [
     {
-      file: 'glyph/map.json',
-      source: 'scss/ionicons-icons.scss',
+      file: FILES.GLYPH_MAP,
+      from: 'scss/ionicons-icons.scss',
       steps: [String, parseGlyphs, stringify]
     },
     {
-      file: 'fonts/Ionicons.ttf',
-      source: 'fonts/ionicons.ttf',
+      file: FILES.FONT_FILE,
+      from: 'fonts/ionicons.ttf',
       steps: []
     }
-  ].map(({ file, source, steps }) =>
+  ].map(({ file, from, steps }) =>
     [resolvePath, fs.readFileSync, ...steps]
-      .reduce((prev, next) => prev.then(next), Promise.resolve(source))
-      .then(data => fs.writeFileSync(path.resolve(__dirname, file), data))
+      .reduce((prev, next) => prev.then(next), Promise.resolve(from))
+      .then(it => fs.writeFileSync(path.resolve(__dirname, file), it))
+      .then(() => console.log(`  Generated ${file} ...`))
   )
 
-  Promise.all(recipes)
-    .then(() => debug('done!'))
-    .catch(e => debug(e.message))
-})()
+  Promise.all(workflows)
+    .then(() => console.log('All is done'))
+    .catch(e => console.log(e.message))
+}
+
+// only run as script
+if (require.main === module) {
+  generate()
+}

glyph/index.js

@@ -1,16 +1,22 @@
 import glyphs from './map.json'
 
+export const UNKNOWN_ICON = ''
+
 /**
- * Get glyph
+ * Try glyph
  *
  * @param {Array.<?string>} iconNames
- * @param {string} prefix
+ * @param {function(string): string} mapper
  * @return {string}
  */
-export default function (iconNames, prefix) {
+export function tryGlyph (iconNames, mapper) {
   const code = iconNames.reduce((prev, name) => {
-    return prev || glyphs[name in glyphs ? name : `${prefix}-${name}`]
+    return prev || glyphs[name in glyphs ? name : mapper(name)]
   }, undefined)
 
-  return code ? String.fromCharCode(code) : ''
+  return code ? String.fromCharCode(code) : UNKNOWN_ICON
 }
+
+/**
+ * @typedef
+ */

glyph/map.json

@@ -695,4 +695,4 @@
   "md-wifi": 62376,
   "md-wine": 62377,
   "md-woman": 62378
-}
+}

index.js

@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { StyleSheet, Text, Platform } from 'react-native'
-import tryGlyph from './glyph'
+import { tryGlyph } from './glyph'
 
 /**
  * @typedef {(string|undefined)} IconName
@@ -14,8 +14,8 @@ import tryGlyph from './glyph'
  * @return {string}
  */
 const getGlyph = Platform.select({
-  ios: (_android, ios, name) => tryGlyph([ios, name], 'ios'),
-  default: (android, _ios, name) => tryGlyph([android, name], 'md')
+  ios: (_android, ios, name) => tryGlyph([ios, name], x => `ios-${x}`),
+  default: (android, _ios, name) => tryGlyph([android, name], x => `md-${x}`)
 })
 
 class Icon extends React.PureComponent {
@@ -53,7 +53,7 @@ class Icon extends React.PureComponent {
     return (
       <Text
         {...textProps}
-        style={[styles.default, fontStyle, style]}
+        style={[fontStyle, style, styles.icon]}
         ref={this._setRef}
       >
         {getGlyph(android, ios, name)}
@@ -71,7 +71,7 @@ Icon.defaultProps = {
 export default Icon
 
 const styles = StyleSheet.create({
-  default: {
+  icon: {
     fontFamily: 'Ionicons',
     fontWeight: 'normal',
     fontStyle: 'normal'

package.json

@@ -5,21 +5,24 @@
   "main": "index.js",
   "typings": "index.d.ts",
   "scripts": {
-    "prepublishOnly": "node generate-icon",
-    "lint": "prettier --write '**/*.{js,ts,md}'; standard --fix"
+    "prepublishOnly": "test",
+    "generate": "node generate",
+    "standard": "standard --fix",
+    "prettier": "prettier --write '**/*.{js,json,ts,md}'",
+    "pretest": "npm run generate; npm run prettier; npm run standard",
+    "test": "jest"
   },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
     }
   },
   "lint-staged": {
-    "*.{ts,md}": [
+    "*.{js,json,ts,md}": [
       "prettier --write",
       "git add"
     ],
     "*.js": [
-      "prettier --write",
       "standard --fix",
       "git add"
     ]
@@ -29,9 +32,9 @@
     "singleQuote": true
   },
   "standard": {
-    "ignore": [
-      "*.flow.js"
-    ]
+    "env": {
+      "jest": true
+    }
   },
   "repository": {
     "type": "git",
@@ -54,8 +57,12 @@
     "react-native": "*"
   },
   "devDependencies": {
+    "@babel/core": "^7.7.7",
+    "@babel/preset-env": "^7.7.7",
+    "babel-jest": "^24.9.0",
     "husky": "^3.0.9",
     "ionicons": "^4.6.3",
+    "jest": "^24.9.0",
     "lint-staged": "^9.4.2",
     "prettier": "^1.18.2",
     "standard": "^14.3.1"

react-native-ionicons.podspec

@@ -4,12 +4,12 @@ package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
 
-  s.name           = package[:name]
-  s.version        = package[:version]
-  s.summary        = package[:description]
-  s.author         = package[:author]
-  s.license        = package[:license]
-  s.homepage       = package[:homepage]
+  s.name           = package["name"]
+  s.version        = package["version"]
+  s.summary        = package["description"]
+  s.author         = package["author"]
+  s.license        = package["license"]
+  s.homepage       = package["homepage"]
   s.platforms      = { :ios => "9.0", :tvos => "9.0" }
   s.source         = { :git => "https://github.com/arniu/react-native-ionicons.git", :tag => "v#{s.version}" }
   s.resources      = "fonts/*.ttf"

test/generate.spec.js

@@ -0,0 +1,13 @@
+import fs from 'fs'
+import { resolve } from 'path'
+import { FILES } from '../generate'
+
+it(`should exist: ${FILES.FONT_FILE}`, () => {
+  const path = resolve(__dirname, '..', FILES.FONT_FILE)
+  expect(fs.existsSync(path)).toBeTruthy()
+})
+
+it(`should exist: ${FILES.GLYPH_MAP}`, () => {
+  const path = resolve(__dirname, '..', FILES.GLYPH_MAP)
+  expect(fs.existsSync(path)).toBeTruthy()
+})

test/glyph.spec.js

@@ -0,0 +1,19 @@
+import { UNKNOWN_ICON, tryGlyph } from '../glyph'
+
+describe('should work on ios devices', () => {
+  const mapper = x => `ios-${x}`
+
+  it('should have `add` icon', () => {
+    const icon = tryGlyph(['add', null], mapper)
+    expect(icon).not.toBe(UNKNOWN_ICON)
+  })
+})
+
+describe('should work on android devices', () => {
+  const mapper = x => `md-${x}`
+
+  it('should have `add` icon', () => {
+    const icon = tryGlyph(['add', null], mapper)
+    expect(icon).not.toBe(UNKNOWN_ICON)
+  })
+})