Merge 65fc171 into 47dec59

amida-tech · Nov 12, 2014 · 2814d58 · 2814d58
2 parents 47dec59 + 65fc171
commit 2814d58
Show file tree

Hide file tree

Showing 21 changed files with 3,607 additions and 158 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,9 @@ node_modules/
 npm-debug.log
 coverage
 
+# Bower
+bower_components
+
 # Mac OSX
 .DS_Store
 realsample.txt
@@ -22,4 +25,8 @@ ccda-explorer/sample_ccdas/
 test/fixtures/files/generated/
 test/fixtures/files/parse_gen_parse
 
-test/proprietary
+test/proprietary
+
+angulartest/app/lib
+
+dist
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,10 @@ before_script:
     - npm install --quiet
     - npm install -g mocha
     - npm install -g istanbul
+    - npm install -g bower
+    - bower install
+    - export DISPLAY=:99.0
+    - sh -e /etc/init.d/xvfb start
 
 script:
     - grunt

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -8,6 +8,9 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-istanbul-coverage');
     grunt.loadNpmTasks('grunt-coveralls');
     grunt.loadNpmTasks('grunt-jsbeautifier');
+    grunt.loadNpmTasks('grunt-contrib-copy');
+    grunt.loadNpmTasks('grunt-browserify');
+    grunt.loadNpmTasks('grunt-karma');
 
     // Project configuration.
     grunt.initConfig({
@@ -95,11 +98,44 @@ module.exports = function (grunt) {
                 dir: 'coverage/',
                 root: '.'
             }
-        }
+        },
+        browserify: {
+            options: {
+                debug: true,
+                alias: ["./index.js:bbparser"],
+                ignore: ["blue-button-generate", 'blue-button-cms']
+            },
+            dev: {
+                src: 'index.js',
+                dest: 'dist/bbparser.js',
+            }
+        },
+        copy: {
+            main: {
+                files: [{
+                    cwd: 'bower_components/',
+                    expand: true,
+                    src: '**',
+                    dest: 'angulartest/app/lib/'
+                }, {
+                    src: 'dist/*',
+                    dest: 'angulartest/app/lib/'
+                }]
+            }
+        },
+        karma: {
+            unit: {
+                configFile: 'karma.conf.js',
+                singleRun: true,
+                browsers: ['Firefox']
+            }
+        },
     });
 
+    grunt.registerTask('browsertest', ['browserify', 'copy', 'karma']);
+
     // Default task.
-    grunt.registerTask('default', ['beautify', 'jshint', 'mochaTest']);
+    grunt.registerTask('default', ['beautify', 'jshint', 'mochaTest', 'browsertest']);
     //Express omitted for travis build.
     grunt.registerTask('commit', ['jshint', 'mochaTest']);
     grunt.registerTask('mocha', ['mochaTest']);

diff --git a/angulartest/app/index.html b/angulartest/app/index.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html ng-app="bbTesting">
+<head>
+    <meta charset="utf-8">
+    <title>Blue Button Testing</title>
+</head>
+<body>
+    <div ng-view></div>
+
+    <!-- Scripts -->
+    <script src="lib/dist/bbparser.js"></script>
+    <script src="lib/angular/angular.js"></script>
+    <script src="lib/angular-route/angular-route.js"></script>
+
+    <script src="scripts/app.js"></script>
+    <script src="scripts/controllers/controller.js"></script>
+    <script src="scripts/services/fileSupply.js"></script>
+    <script src="scripts/services/parser.js"></script>
+</body>
+</html>
diff --git a/angulartest/app/scripts/app.js b/angulartest/app/scripts/app.js
@@ -0,0 +1,10 @@
+"use strict";
+
+var bbTesting = angular.module('bbTesting', ['ngRoute']);
+
+bbTesting.config(function ($routeProvider) {
+    $routeProvider.when('/run', {
+        templateUrl: 'templates/detail.html',
+        controller: 'ParserCtrl'
+    });
+});
diff --git a/angulartest/app/scripts/controllers/controller.js b/angulartest/app/scripts/controllers/controller.js
@@ -0,0 +1,5 @@
+"use strict";
+
+bbTesting.controller('ParserCtrl', function ($scope, ParserService, FileSupplyService) {
+    $scope.title = "blue-button tester";
+});