Merge pull request plotly#2 from plotly/fix-manifest-metadata-path

Fix manifest metadata path
HammadTheOne · Jul 7, 2016 · 3ea31b9 · 3ea31b9
1 parent 2c2aca4
commit 3ea31b9
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 14 deletions.
diff --git a/packages/dash-html-components/MANIFEST.in b/packages/dash-html-components/MANIFEST.in
diff --git a/packages/dash-html-components/dash_html_components/__init__.py b/packages/dash-html-components/dash_html_components/__init__.py
@@ -1,8 +1,11 @@
+import os
 import dash as _dash
 import sys as _sys
 
+current_path = os.path.dirname(os.path.abspath(__file__))
+
 _dash.development.component_loader.load_components(
-    '../lib/metadata.json',
+    os.path.join(current_path, '../lib/metadata.json'),
     ['content', 'id', 'key', 'className', 'style', 'dependencies'],
     globals(),
     _sys._getframe(1).f_globals.get('__name__', '__main__')

diff --git a/packages/dash-html-components/package.json b/packages/dash-html-components/package.json
@@ -14,7 +14,7 @@
   "homepage": "https://github.com/plotly/dash-html-components",
   "scripts": {
     "generate-components": "cd scripts && sh generate-all.sh && cd -",
-    "prepublish": "npm test && builder run transpile-dev",
+    "prepublish": "npm run generate-components && npm test && builder run transpile-dev",
     "publish-pypi": "npm run prepublish && python setup.py sdist upload",
     "start": "builder run transpile-dev-watch",
     "test": "builder run check"
@@ -27,6 +27,7 @@
   "devDependencies": {
     "cheerio": "^0.20.0",
     "dash-components-archetype-dev": "^0.1.3",
-    "request": "^2.72.0"
+    "request": "^2.72.0",
+    "string": "^3.3.1"
   }
 }
diff --git a/packages/dash-html-components/scripts/data/attributes.json b/packages/dash-html-components/scripts/data/attributes.json
diff --git a/packages/dash-html-components/scripts/extract-attributes.js b/packages/dash-html-components/scripts/extract-attributes.js
@@ -3,6 +3,7 @@
 const fs = require('fs');
 const cheerio = require('cheerio');
 const request = require('request');
+const S = require('string');
 
 const htmlURL = 'https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes';
 const dataPath = './data/attributes.json';
@@ -32,12 +33,17 @@ function extractAttributes($) {
             return true;
         }
 
-        let attributeName = attribute;
-
-        // Rename `class` to `className`
-        if (attributeName === 'class') {
-            attributeName = 'className';
-        }
+        // Trim attribute, and convert e.g. `accept-charset` to `acceptCharset`.
+        let attributeName = S(attribute)
+            .trim()
+            .camelize()
+            .toString();
+
+        attributeName = attributeName
+            // Rename `class` to `className`
+            .replace(/^class$/, 'className')
+            // Rename `for` to `htmlFor`
+            .replace(/^for$/, 'htmlFor');
 
         attributes[attributeName] = {
             elements,

diff --git a/packages/dash-html-components/setup.py b/packages/dash-html-components/setup.py
@@ -5,6 +5,7 @@
     version='0.1.1',
     author='plotly',
     packages=['dash_html_components'],
+    package_data={'dash_html_components': ['../lib/metadata.json']},
     license='MIT',
     description='Dash UI component suite',
     install_requires=['flask', 'plotly', 'flask-cors', 'dash.ly']

diff --git a/packages/dash-html-components/src/components/Form.react.js b/packages/dash-html-components/src/components/Form.react.js
@@ -18,7 +18,7 @@ Form.propTypes = {
     /**
      * List of supported charsets.
      */
-    'accept-charset': PropTypes.string,
+    'acceptCharset': PropTypes.string,
 
 
     /**

diff --git a/packages/dash-html-components/src/components/Label.react.js b/packages/dash-html-components/src/components/Label.react.js
@@ -12,7 +12,7 @@ Label.propTypes = {
     /**
      * Describes elements which belongs to this one.
      */
-    'for': PropTypes.string,
+    'htmlFor': PropTypes.string,
 
 
     /**

diff --git a/packages/dash-html-components/src/components/Output.react.js b/packages/dash-html-components/src/components/Output.react.js
@@ -12,7 +12,7 @@ Output.propTypes = {
     /**
      * Describes elements which belongs to this one.
      */
-    'for': PropTypes.string,
+    'htmlFor': PropTypes.string,
 
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ Form.propTypes = { @@
         /**
          * List of supported charsets.
          */
-        'accept-charset': PropTypes.string,
+        'acceptCharset': PropTypes.string,
         /**
@@ Expand Down @@