Release 0.1.1

Merge branch 'spotify-app'

.travis.yml

@@ -2,4 +2,6 @@ language: node_js
 node_js:
   - "0.10"
 before_script:
-  - npm install -g grunt-cli
+  - npm install -g grunt-cli
+  - npm install -g bower
+  - bower install

Gruntfile.js

@@ -4,13 +4,19 @@ module.exports = function(grunt) {
       dist: 'rama-spotify'
     },
     jshint: {
-      all: ['Gruntfile.js', 'js/**/*.js', 'js/specs/*.js']
+      all: ['Gruntfile.js', 'js/**/*.js', 'test/*.js']
     },
     jasmine: {
       src: ['js/*.js'],
       options: {
-        helpers: ['js/specs/spechelper.js'],
-        specs: ['js/specs/*.spec.js']
+        vendor: [
+          'bower_components/jquery/dist/jquery.js',
+          'bower_components/vis/dist/vis.js',
+          'bower_components/jasmine-jquery/lib/jasmine-jquery.js',
+          'bower_components/underscore/underscore.js'
+        ],
+        helpers: ['test/spechelper.js'],
+        specs: ['test/*.spec.js']
       }
     },
     compass: {
@@ -22,7 +28,7 @@ module.exports = function(grunt) {
       }
     },
     watch: {
-      files: ['Gruntfile.js', 'js/*.js', 'sass/*.scss'],
+      files: ['Gruntfile.js', 'js/*.js', 'sass/*.scss', 'test/*.js'],
       tasks: ['jshint', 'compass', 'jasmine']
     },
     useminPrepare: {
@@ -87,6 +93,11 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-usemin');
 
+  grunt.registerTask('test', [
+    'jshint',
+    'jasmine'
+  ]);
+
   grunt.registerTask('build', [
     'clean:dist',
     'useminPrepare',

README.md

@@ -38,9 +38,16 @@ With no official Spotify Desktop Client release, there's nothing I can do about
 [Releases]
 ----
 
-[v0.1.0] - first release
+[v0.1.1] - Graph creation updated
+  - graph depth and branchin factor now dynamic
+  - nodes are now black
+  - root node is highlighted from the others
+  - loading throbber added while graph is being created.
 
-It is still in alfa, so please bear with the lack of functionalities.
+[v0.1.0] - First Release
+  - graph depth 1 displayed on app load.
+
+It is still in alfa, so please bear with the lack of functionalities (none for now really...).
 
 
 #### Author
@@ -53,6 +60,7 @@ José Bateira
 [rama.inescporto.pt]:http://rama.inescporto.pt
 [carsy.github.io]:http://carsy.github.io
 [@\_carsy\_]:http://twitter.com/_carsy_
-[here]:https://github.com/carsy/rama-spotify/releases/tag/v0.1.0
-[Releases]:https://github.com/carsy/rama-spotify/releases
+[here]:https://github.com/carsy/rama-spotify/releases/latest
+[Releases]:https://github.com/carsy/rama-spotify/releases/latest
+[v0.1.1]:https://github.com/carsy/rama-spotify/releases/tag/v0.1.1
 [v0.1.0]:https://github.com/carsy/rama-spotify/releases/tag/v0.1.0

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "rama",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "homepage": "https://github.com/carsy/master-thesis",
   "authors": [
     "Zé Bateira <jlageb+git@gmail.com>"
@@ -21,10 +21,12 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "~2.1.0"
+    "jquery": "~2.1.0",
+    "vis": "~0.7.0",
+    "normalize-css": "~3.0.0",
+    "underscore": "~1.6.0"
   },
   "devDependencies": {
-    "normalize-css": "~3.0.0",
-    "vis": "~0.6.1"
+    "jasmine-jquery": "~2.0.3"
   }
-}
+}

css/main.css

@@ -263,7 +263,7 @@ html, body {
 
 /* line 27, ../sass/main.scss */
 #view_container {
-  height: calc(100% - 100px - 34px);
+  height: calc(100% - 60px - 34px);
 }
 /* line 31, ../sass/main.scss */
 #view_container .view {
@@ -275,27 +275,27 @@ html, body {
 /* line 4, ../sass/_header.scss */
 .sp-header {
   background-color: #333;
-  max-height: 100px;
+  max-height: 60px;
   position: relative;
-  min-height: 100px;
+  min-height: 60px;
 }
 /* line 12, ../sass/_header.scss */
 .sp-header .header-text a {
   color: #bbb;
 }
 /* line 18, ../sass/_header.scss */
-.sp-header .header {
+.sp-header .header-title {
   text-align: center;
   font-size: 3em;
-  line-height: 100px;
+  line-height: 60px;
 }
 /* line 24, ../sass/_header.scss */
 .sp-header .header-link {
   display: table;
   position: absolute;
   min-height: 30px;
   height: 30px;
-  top: 33%;
+  top: 15px;
   padding-left: 10px;
   padding-right: 10px;
   background-color: black;
@@ -326,3 +326,8 @@ html, body {
 .graph {
   height: 100%;
 }
+
+/* line 6, ../sass/_now_playing.scss */
+#view_container {
+  overflow: hidden;
+}

index.html

@@ -19,7 +19,7 @@
 </head>
 <body>
   <div id="view_container">
-    <div id="index" class="view">
+    <div id="now" class="view">
       <div class="graph"></div>
     </div>
     <div id="top" class="view">
@@ -32,9 +32,10 @@
   <!-- bower:js -->
   <script src="bower_components/jquery/dist/jquery.js"></script>
   <script src="bower_components/vis/dist/vis.js"></script>
+  <script src="bower_components/underscore/underscore.js"></script>
   <!-- endbower -->
   <!-- endbuild -->
 
   <script src="js/main.js"></script>
 </body>
-</html>
+</html>