modified: Gemfile

modified:   Gemfile.lock
new file:   spec/javascripts/fixtures/baz.html.haml
new file:   spec/javascripts/foo_spec.js.coffee
new file:   spec/javascripts/spec.css
new file:   spec/javascripts/spec.js.coffee
	-- jasmine rice gem install - another attempt at testing

modified:   app/assets/javascripts/app.js
modified:   app/assets/javascripts/application.js
modified:   app/assets/javascripts/directives.js
	-- fixed variable overwriting bug in angular app

deleted:    app/assets/javascripts/audio_events.js.coffee
deleted:    app/assets/javascripts/audio_recordings.js.coffee
deleted:    app/assets/javascripts/permissions.js.coffee
deleted:    app/assets/javascripts/photos.js.coffee
deleted:    app/assets/javascripts/projects.js.coffee
deleted:    app/assets/javascripts/sites.js.coffee
deleted:    app/assets/javascripts/tags.js.coffee
deleted:    app/assets/javascripts/users.js.coffee
	-- deleted unecessary files, polluting debug

modified:   lib/modules/OS.rb
modified:   lib/modules/spectrogram.rb
	-- attempted a fix of the travis uninitialised constant bug

app/assets/javascripts/app.js

@@ -24,14 +24,8 @@ var bawApp = angular.module('baw', ['ngResource'], function($routeProvider, $loc
         otherwise({redirectTo: '/home'});
 
     // location config
-    //$locationProvider.html5Mode(true);
+    $locationProvider.html5Mode(true);
 
 
 
 });
-
-bawApp.factory('Todo', ['$resource', function($resource) {
-    return $resource('http://localhost:port/todos.json', {port:":3001"} , {
-        query: {method: 'GET', isArray: true}
-    });
-}]);

app/assets/javascripts/application.js

@@ -10,12 +10,13 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require angular.js
-//= require angular-resource.js
-//= require angular-ui.js
-//= require angular-ui-ieshiv.js
 //= require jquery
 //= require jquery_ujs
+//= require angular.js
+//= require angular-resource.js
+// require angular-ui.js
+// require angular-ui-ieshiv.js
+//= require app
 //= require_tree .
 
 

app/assets/javascripts/directives.js

@@ -1,4 +1,4 @@
-var bawApp = angular.module('baw', function() {
+bawApp.directive('baw', function() {
     return function(scope, element, attrs) {
         element.css('display', 'none');
         scope.$watch(attrs.ngDsFade, function(value) {

lib/modules/OS.rb

@@ -1,18 +1,18 @@
 # From http://stackoverflow.com/questions/170956/how-can-i-find-which-operating-system-my-ruby-program-is-running-on
 module OS
-  def OS.windows?
+  def self.windows?
     (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
   end
 
-  def OS.mac?
+  def self.mac?
    (/darwin/ =~ RUBY_PLATFORM) != nil
   end
 
-  def OS.unix?
+  def self.unix?
     !OS.windows?
   end
 
-  def OS.linux?
+  def self.linux?
     OS.unix? and not OS.mac?
   end
 end

lib/modules/spectrogram.rb

@@ -1,6 +1,8 @@
 require 'open3'
 
 module Spectrogram
+  include OS
+
   @sox_path = if OS.windows? then "./vendor/bin/sox/windows/sox.exe" else "sox" end
   @sox_arguments_verbose = "-V"
   @sox_arguments_output_audio = "-n"