robeaux 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 372cf8d1ac133936d4ecb9ccaab33108218c6938
-  data.tar.gz: ce7fe45bcdb904a62d3f88ffeace434b387640a0
+  metadata.gz: fb64bdd58fcc2541db81dc55c3a21750db37af3f
+  data.tar.gz: e873c183975f9dd68f66a1dc975eec90894da0f0
 SHA512:
-  metadata.gz: e9581241e3fc08b54d496c075ce3bcbc565df3d64d9a1c2f41b3a1f1c3c127473c20fca73fac34edb6083348b01b6d3f6ae94ee9ad7b966161317d5c9d5fddf2
-  data.tar.gz: 115f733c314dd79045ab4a6663b6b235e40eb4f379d3b834f7cae6524926c7e09e7a07353aac9671ef4178a27226d30ef52b0eeead7caa02a7650d2b3a89e2c1
+  metadata.gz: 863dc02ee4c0e0905b537d4f0fe676ca5c0d85556437478688565e99b32b3037a0230cfe69d7d407d9fa5158c31540a0ab8284ec9f1c457b33ac753461bafe0b
+  data.tar.gz: 77ae747880626efcbfdeb149ce4c1a18d4f7134a446033d6a3d66640d37ceeb5a042e3b00c24b556c5315baa90e014d91ac00781aca11aa51c1458ac71ae3ab8

data/.gitignore

@@ -0,0 +1 @@
+/node_modules/

data/Makefile

@@ -1,10 +1,9 @@
 VERSION := $(shell node -e "console.log(require('./package.json').version)")
 
-.PHONY: default release
+.PHONY: test release
 
-# to prevent a release attempt every time someone runs 'make'
-default:
-	@echo "Default Make Task"
+test:
+	@./node_modules/karma/bin/karma start ./test/karma.conf.js --no-auto-watch --single-run 
 
 release:
 	@git tag -m "$(VERSION)" v$(VERSION)

data/README.markdown

@@ -60,6 +60,8 @@ Then, just run `make release`. It'll take care of:
 
 ## Releases
 
+- 0.2.0 - Update for CPP-IO API spec
+
 - 0.1.1 - Remove dependency on Google WebFonts
 
 - 0.1.0 - Full rewrite. Supports Server-Sent-Events.

data/js/controllers/device_commands_ctrl.js

@@ -22,7 +22,7 @@ var DeviceCommandsCtrl = function DeviceCommandsCtrl($scope, $http) {
         command = $scope.command,
         params = parseParams($scope.device.params);
 
-    var url ='/robots/' + robot + "/devices/" + device + "/commands/" + command;
+    var url ='/api/robots/' + robot + "/devices/" + device + "/commands/" + command;
 
     $http.post(url, params).success(function(data) {
       if (data.result) {

data/js/controllers/device_events_ctrl.js

@@ -9,7 +9,7 @@ var DeviceEventsCtrl = function DeviceEventsCtrl($scope, $filter) {
         device = $scope.device.name,
         event = $scope.eventName;
 
-    var uri = "/robots/" + robot + "/devices/" + device + "/events/" + event;
+    var uri = "/api/robots/" + robot + "/devices/" + device + "/events/" + event;
     var $device = $scope.device;
     var source = new EventSource(uri);
 

data/js/controllers/index_ctrl.js

@@ -1,6 +1,6 @@
 var IndexCtrl = function IndexCtrl($scope, $http, $location) {
-  $http.get("/robots").success(function(data) {
-    $scope.robots = data;
+  $http.get("/api/robots").success(function(data) {
+    $scope.robots = data.robots;
   });
 
   $scope.details = function (robot) {

data/js/controllers/robot_commands_ctrl.js

@@ -7,7 +7,6 @@ var RobotCommandsCtrl = function RobotCommandsCtrl($scope, $http) {
   };
 
   $scope.addParam = function(last) {
-    console.log("HEY");
     if (!last) { return; }
     $scope.robot.params.push({ name: '', value: '', type: 'string' });
   };
@@ -22,7 +21,7 @@ var RobotCommandsCtrl = function RobotCommandsCtrl($scope, $http) {
         command = $scope.command,
         params = parseParams($scope.robot.params);
 
-    var url ='/robots/' + robot + "/commands/" + command;
+    var url ='/api/robots/' + robot + "/commands/" + command;
 
     $http.post(url, params).success(function(data) {
       if (data.result) {

data/js/controllers/robot_ctrl.js

@@ -1,6 +1,6 @@
 var RobotCtrl = function RobotCtrl($scope, $http, $routeParams) {
-  $http.get("/robots/" + $routeParams.robot).success(function(data) {
-    $scope.robot = data;
+  $http.get("/api/robots/" + $routeParams.robot).success(function(data) {
+    $scope.robot = data.robot;
 
     $scope.robot.params = [ { name: '', value: '', type: 'string' } ];
     $scope.robot.results = [];

data/package.json

@@ -1,16 +1,18 @@
 {
   "name": "robeaux",
-  "version": "0.1.1",
-  "description": "An AngularJS interface for the Cylon.js API",
+  "version": "0.2.0",
+  "description": "An AngularJS interface for the CPPP-IO API spec",
   "homepage": "http://cylonjs.com",
-  "bugs": "https://github.com/hybridgroup/cylon/issues",
-
+  "bugs": "https://github.com/hybridgroup/robeaux/issues",
   "author": "The Hybrid Group <cylonjs@hybridgroup.com>",
-
   "repository": {
     "type": "git",
     "url": "https://github.com/hybridgroup/robeaux"
   },
-
-  "license": "Apache 2.0"
+  "license": "Apache 2.0",
+  "devDependencies": {
+    "karma": "~0.12.16",
+    "karma-phantomjs-launcher": "~0.1",
+    "karma-jasmine": "~0.1.5"
+  }
 }

data/partials/robot.html

@@ -55,7 +55,7 @@
         <span class="name">{{device.name}}</span>
 
         <div class="details">
-          <span>{{device.connection.name}}</span>
+          <span>{{device.connection}}</span>
         </div>
       </div>
     </div>

data/robeaux.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name        = "robeaux"
-  s.version     = "0.1.1"
+  s.version     = "0.2.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ron Evans", "Adrian Zankich", "Ari Lerner", "Mario Ricalde", "Daniel Fischer", "Andrew Stewart"]
   s.email       = ["artoo@hybridgroup.com"]
   s.homepage    = "https://github.com/hybridgroup/robeaux"
-  s.summary     = %q{Angular-based front end for universal robot API}
-  s.description = %q{Angular-based front end for universal robot API}
+  s.summary     = %q{Angular-based front end for the CPPP-IO API spec}
+  s.description = %q{Angular-based front end for the CPPP-IO API spec}
   s.license     = 'Apache 2.0'
 
   s.rubyforge_project = "robeaux"

data/test/karma.conf.js

@@ -0,0 +1,80 @@
+// Karma configuration
+// Generated on Tue Jul 01 2014 13:33:46 GMT-0700 (PDT)
+
+module.exports = function(config) {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '../',
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['jasmine'],
+
+    // list of files / patterns to load in the browser
+    files: [
+      'js/vendor/angular.min.js',
+      'js/vendor/angular-route.min.js',
+      'test/vendor/angular-mocks.js',
+      'test/vendor/jquery.js',
+      'test/vendor/jasmine-jquery.js',
+      'js/app.js',
+      'js/router.js',
+      'js/*.js',
+      'js/**/*.js',
+      'test/main.js',
+
+      {pattern: 'test/support/robots.json', watched: true, served: true, included: false},
+      {pattern: 'test/support/myRobot.json', watched: true, served: true, included: false},
+      {pattern: 'test/support/myDevice.json', watched: true, served: true, included: false}
+    ],
+
+
+
+    // list of files to exclude
+    exclude: [
+      
+    ],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+    
+    },
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9000,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['PhantomJS'],
+
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: true
+ 
+  });
+};

data/test/main.js

@@ -0,0 +1,248 @@
+describe('IndexCtrl', function() {
+    var $scope, $rootScope, $httpBackend, $timeout, testController;
+    beforeEach(inject(function($injector) {
+        $timeout = $injector.get('$timeout');
+        $httpBackend = $injector.get('$httpBackend');
+        $rootScope = $injector.get('$rootScope');
+        $scope = $rootScope.$new();
+
+        var $controller = $injector.get('$controller');
+
+        testController = function() {
+            return $controller('IndexCtrl', {
+                '$scope': $scope
+            });
+        };
+    }));
+
+    afterEach(function() {
+        $httpBackend.verifyNoOutstandingExpectation();
+        $httpBackend.verifyNoOutstandingRequest();
+    });
+
+    it('IndexCtrl should get array of robots', function() {
+        var controller = testController();
+        jasmine.getJSONFixtures().fixturesPath='base/test/support';
+        var data = loadJSONFixtures('robots.json')['robots.json'];
+        $httpBackend.expect('GET', '/api/robots').respond(data);
+        $httpBackend.flush();
+        expect($scope.robots).toEqual(data.robots);
+    });
+});
+
+describe('RobotCtrl', function() {
+    beforeEach(module('robeaux'));
+    var $scope, $rootScope, $httpBackend, $timeout, $routeParams, testController;
+    beforeEach(inject(function($injector) {
+        $timeout = $injector.get('$timeout');
+        $httpBackend = $injector.get('$httpBackend');
+        $rootScope = $injector.get('$rootScope');
+        $routeParams = $injector.get('$routeParams');
+        $scope = $rootScope.$new();
+
+        var $controller = $injector.get('$controller');
+
+        testController = function() {
+            return $controller('RobotCtrl', {
+                '$scope': $scope
+
+            });
+        };
+        var controller = testController();
+
+        jasmine.getJSONFixtures().fixturesPath='base/test/support';
+        $httpBackend.expect('GET', '/api/robots/' + $routeParams.robot).respond(loadJSONFixtures('myRobot.json')['myRobot.json']);
+        $httpBackend.flush();
+
+    }));
+
+    afterEach(function() {
+        $httpBackend.verifyNoOutstandingExpectation();
+        $httpBackend.verifyNoOutstandingRequest();
+    });
+
+    it('RobotCtrl should get robot data', function() {
+        var data = loadJSONFixtures('myRobot.json')['myRobot.json'];
+        data.robot.params = [ { name: '', value: '', type: 'string' } ];
+        data.robot.results = [];
+        expect($scope.robot).toEqual(data.robot);
+    });
+
+    it('RobotCtrl should select device', function (){
+        var robotArray= [{"name": "robo1"},{"name":"robo2"}];
+        $scope.robot = robotArray;
+        $scope.select($scope.robot[1]);
+        expect($scope.robot[1]).toEqual($scope.device);
+        expect($scope.robot[0]).toNotEqual($scope.device);
+    });
+
+
+    it('RobotCtrl should keep device selected', function (){
+        var robotArray= [{"name": "robo1"},{"name":"robo2"}];
+        $scope.robot = robotArray;
+        $scope.select($scope.robot);
+        expect($scope.selected($scope.robot)).toBeTruthy();
+    });
+});
+
+
+
+describe('parseParams', function(){
+
+    beforeEach(module('robeaux'));
+
+        
+    it('should set param name to value', function(){
+        var form = [
+            { 'name': 'bool', 'value': 'TRUE', 'type': 'boolean' },
+            { 'name': 'boole', 'value': 'sadg', 'type': 'boolean' },
+            { 'name': 'str', 'value': 'isOn', 'type': 'string' },
+            { 'name': 'num', 'value': 100, 'type': 'number' }
+        ];
+        var params = parseParams(form);
+        expect(params['num']).toEqual(100);
+        expect(params['bool']).toEqual(true);
+        expect(params['boole']).toEqual(false);
+        expect(params['str']).toEqual('isOn');
+    });
+
+    it('should set empty params to true', function(){
+        var form = [
+            { 'name': '', 'value': '', 'type': 'boolean' },
+            { 'name': '21', 'value': '12','type': 'boolean' },
+        ];
+         
+        expect(paramsAreEmpty([form[1]])).toEqual(false);
+        expect(paramsAreEmpty([form[0]])).toEqual(true);
+    });
+
+});
+
+describe('RobotCommandsCtrl', function() {
+    beforeEach(module('robeaux'));
+    var $scope, $rootScope, $httpBackend, $timeout, testController;
+    var $injector = angular.injector(['robeaux', 'ng']);
+    beforeEach(inject(function($injector) {
+        $timeout = $injector.get('$timeout');
+        $httpBackend = $injector.get('$httpBackend');
+        $rootScope = $injector.get('$rootScope');
+        $scope = $rootScope.$new();
+
+        var $controller = $injector.get('$controller');
+
+        testController = function() {
+            return $controller('RobotCommandsCtrl', {
+                '$scope': $scope
+            });
+        };
+        var controller = testController();
+
+        jasmine.getJSONFixtures().fixturesPath='base/test/support';
+        var data = loadJSONFixtures('myRobot.json')['myRobot.json'];
+        $scope.robot = data.robot;
+    }));
+
+    afterEach(function() {
+        $httpBackend.verifyNoOutstandingExpectation();
+        $httpBackend.verifyNoOutstandingRequest();
+    });
+
+    it('RobotCommandsCtrl command should be an empty string', function (){
+        $scope.command = "";
+        expect($scope.isDisabled()).toBe(true);
+    });
+
+    it('RobotCommandsCtrl should add params if last', function (){
+        expect($scope.robot.params.length).toBe(1)
+        $scope.addParam($scope.robot);
+        expect($scope.robot.params.length).toBe(2)
+    });
+
+    it('RobotCommandsCtrl command should be an empty string', function (){
+        expect($scope.robot.params.length).toBe(2)
+        $scope.removeParam($scope.robot);
+        expect($scope.robot.params.length).toBe(1)
+    });
+
+    it('RobotCommandsCtrl should get robot command results', function (){
+        $scope.robot.name = "myRobot";
+        $scope.command = "relax";
+        $scope.robot.params= [{'name': 'relax', 'value':'true', 'type':'string'}];
+        var params  = {'relax': 'true'};
+        var data= {'result': "myRobot says relax"};
+
+        $scope.submit();
+        $httpBackend.expectPOST('/api/robots/myRobot/commands/relax', params).respond(data);
+        $httpBackend.flush();
+        expect($scope.robot.results).toEqual([{'result': "myRobot says relax"}])
+    });
+});
+
+describe('DeviceCommandsCtrl', function() {
+    beforeEach(module('robeaux'));
+    var $scope, $rootScope, $httpBackend, $timeout, testController;
+    beforeEach(inject(function($injector) {
+        $timeout = $injector.get('$timeout');
+        $httpBackend = $injector.get('$httpBackend');
+        $rootScope = $injector.get('$rootScope');
+        $scope = $rootScope.$new();
+
+        var $controller = $injector.get('$controller');
+
+        testController = function() {
+            return $controller('DeviceCommandsCtrl', {
+                '$scope': $scope
+            });
+        };
+        var controller = testController();
+
+        jasmine.getJSONFixtures().fixturesPath='base/test/support';
+
+        var data = loadJSONFixtures('myDevice.json')['myDevice.json'];
+
+        $scope.device = data[0];
+        $scope.device.results = [];
+        $scope.device.params = [{ name: '', value: '', type: 'string' }];
+    }));
+
+    afterEach(function() {
+        $httpBackend.verifyNoOutstandingExpectation();
+        $httpBackend.verifyNoOutstandingRequest();
+    });
+
+    it('DeviceCommandsCtrl command should be an empty string', function (){
+        $scope.command = "";
+        expect($scope.isDisabled()).toBe(true);
+    });
+
+    it('DeviceCommandsCtrl should add params if last', function (){
+        expect($scope.device.params.length).toBe(1)
+        $scope.addParam($scope.device);
+        expect($scope.device.params.length).toBe(2)
+    });
+
+    it('DeviceCommandsCtrl command should be an empty string', function (){
+        $scope.device.params = [
+          { name: '', value: '', type: 'string' },
+          { name: '', value: '', type: 'string' }
+        ];
+        $scope.removeParam($scope.device);
+        expect($scope.device.params.length).toBe(1)
+    });
+
+    it('DeviceCommandsCtrl command should be an empty string', function (){
+        $scope.robot = {'name':"myRobot"};
+        $scope.device.name = "led";
+        $scope.command = "brightness";
+        $scope.device.params = [{'name': 'brightness', 'value': 255, 'type':'string'}];
+        var params = {'brightness': 255};
+        var data= {'result': "brightness is 255"};
+
+        $scope.submit();
+        $httpBackend.expectPOST('/api/robots/myRobot/devices/led/commands/brightness', params).respond(data);
+        $httpBackend.flush();
+        expect($scope.device.results[0]).toEqual({'result': "brightness is 255"})
+    });
+
+});
+

data/test/support/myDevice.json

@@ -0,0 +1,15 @@
+[
+  {
+    "commands": [ "isOn", "turnOn", "turnOff", "toggle", "brightness" ],
+    "connection": "arduino",
+    "driver": "Led",
+    "name": "led",
+    "pin": 3
+  }, {
+    "commands": [ "isPressed" ],
+    "connection": "arduino",
+    "driver": "Button",
+    "name": "button",
+    "pin": 2
+  }
+]

data/test/support/myRobot.json

@@ -0,0 +1,31 @@
+{
+  "robot": {
+    "name": "myRobot",
+
+    "connections": [
+      {
+        "adaptor": "Adaptor",
+        "name": "arduino",
+        "port": "/dev/ttyACM0"
+      }
+    ],
+
+    "devices": [
+      {
+        "commands": [ "isOn", "turnOn", "turnOff", "toggle", "brightness" ],
+        "connection": "arduino",
+        "driver": "Led",
+        "name": "led",
+        "pin": 13
+      }, {
+        "commands": [ "isPressed" ],
+        "connection": "arduino",
+        "driver": "Button",
+        "name": "button",
+        "pin": 2
+      }
+    ],
+
+    "commands": []
+  }
+}

data/test/support/robots.json

@@ -0,0 +1,33 @@
+{
+  "robots": [
+    {
+      "name": "myRobot",
+
+      "connections": [
+        {
+          "adaptor": "Adaptor",
+          "name": "arduino",
+          "port": "/dev/ttyACM0"
+        }
+      ],
+
+      "devices": [
+        {
+          "commands": [ "isOn", "turnOn", "turnOff", "toggle", "brightness" ],
+          "connection": "arduino",
+          "driver": "Led",
+          "name": "led",
+          "pin": 13
+        }, {
+          "commands": [ "isPressed" ],
+          "connection": "arduino",
+          "driver": "Button",
+          "name": "button",
+          "pin": 2
+        }
+      ],
+
+      "commands": []
+    }
+  ]
+}