britebox 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 828f33e21107bef719e0cfe79663172057ae4191
-  data.tar.gz: f073980c5916b567d366e502f6830c8c4d233672
+  metadata.gz: af52b5e18fb92d49ca360ef3a68e4a5b65825e3c
+  data.tar.gz: 1c70ba5f08bdadef985eee62dda15a4ff435aa10
 SHA512:
-  metadata.gz: 98f40a0354d69a0d3d8f210da9f6835923aa4e6daf75986843e8b1700e84cec8b403395d84e5a6e11666f80a8a0f2a0dbf84e7c0148f2587c4456ba8b6a1e70a
-  data.tar.gz: 62e5d74ced143d6bb1d7d6f9b9739736ad6eea7463a41b83a9cd434e0729fb7d10fc75b95dadde58eea48dbc6627d753284d9548b2429bf8ae2dc14cbec33bf9
+  metadata.gz: 83d66b045e53371ab19a2f777cd8336474b41f6fbf6bc146c8af0c7e47b07541bf0fb49a02ef80cd3ead29dba115872f64e0b0107a6a6b03e3f3978293f3b7a1
+  data.tar.gz: 831f8252a4e93a07a4384eacfc88e722feba7b79ce25489ff2fb14b201ba7d010682ff5ab806506d11ef864bd2760f8f9fd686506c82ff029b690d7ebf07bbf1

data/bin/britebox

@@ -5,7 +5,6 @@ require 'britebox'
 require 'britebox/cli'
 
 Thread.abort_on_exception = true
-THREAD_NUM_MAX = 10
 
 # Register action on Ctrl-C
 [:SIGINT, :TERM, :INT].each do |sig|
@@ -82,9 +81,9 @@ if command == 'watch'
 
     opts.on('-t', '--threads THREADS', "Maximum number of parallel threads used for processing, "+
       "Default is #{Britebox::Config::DEFAULT_OPTIONS[:threads]}, " +
-      "Maximum is #{THREAD_NUM_MAX}") do |v|
-      unless (1..THREAD_NUM_MAX).include? v.to_i
-        puts "Threads number should be in range 1..#{THREAD_NUM_MAX}"
+      "Maximum is #{Britebox::Config::MAX_THREADS}") do |v|
+      unless (1..Britebox::Config::MAX_THREADS).include? v.to_i
+        puts "Threads number should be in range 1..#{Britebox::Config::MAX_THREADS}"
         exit 1
       end
       Britebox::Config.threads = v.to_i

data/lib/britebox/config.rb

@@ -1,11 +1,21 @@
 require 'json'
 require 'singleton'
+require 'active_model'
 
 module Britebox
   class Config
     include Singleton
+    include ActiveModel::Validations
 
     OPTIONS = [:threads, :api_key, :watch_dir, :out_dir, :port, :ui_enabled, :simulate]
+    OPTIONS.each { |o| attr_accessor(o) }
+
+    MAX_THREADS = 10
+
+    validates_presence_of :threads, :api_key, :watch_dir, :out_dir, :port
+    validates_inclusion_of :port, in: 1..65535, message: ' should be in range 1..65535'
+    validates_inclusion_of :threads, in: 1..MAX_THREADS, message: "should be in range 1..#{MAX_THREADS}"
+    validate :watch_dir_present
 
     DEFAULT_OPTIONS = {
       threads: 10,
@@ -19,12 +29,28 @@ module Britebox
       init_defaults
     end
 
-    def self.load
+    def self.method_missing(method, *args)
+      if self.instance.respond_to? method
+        self.instance.send(method, *args)
+      else
+        super
+      end
+    end
+
+    def self.respond_to?(method)
+      if self.instance.respond_to? method
+        true
+      else
+        super
+      end
+    end
+
+    def load
       data = read_config
 
       if data && data['config']
         data['config'].each do |k, v|
-          self.instance.send("#{k}=", v) if self.instance.respond_to?(k)
+          self.send("#{k}=", v) if self.respond_to?(k)
         end
         true
       else
@@ -32,30 +58,48 @@ module Britebox
       end
     end
 
-    def self.read_config
+    def read_config
       path = File.expand_path(CONFIG_PATH)
       if File.exists? path
         JSON.parse File.read path rescue nil
       end
     end
 
-    def self.values
+    def values
       data = {}
       OPTIONS.each do |k|
-        data[k] = self.instance.send(k)
+        data[k] = self.send(k)
       end
       data
     end
 
-    def self.save
+    def attributes
+      values
+    end
+
+    def update(new_values)
+      old_values = self.attributes
+
+      new_values.each do |k, v|
+        self.send("#{k}=", v)
+      end
+      if self.valid?
+        save
+      else
+        old_values.each do |k, v|
+          self.send("#{k}=", v)
+        end
+        false
+      end
+    end
+
+    def save
       path = File.expand_path(CONFIG_PATH)
 
       data = read_config
       data ||= {}
-      data['config'] ||= {}
-      OPTIONS.each do |key|
-        data['config'][key.to_s] = self.instance.send(key)
-      end
+      data['config'] = attributes
+
       begin
         File.open(path, 'w+') do |file|
           file.write JSON.pretty_generate data
@@ -67,25 +111,17 @@ module Britebox
       end
     end
 
+    private
+
     def init_defaults
       DEFAULT_OPTIONS.each do |key, val|
         send("#{key}=", val) if send(key).nil?
       end
     end
 
-    OPTIONS.each do |key|
-      attr_accessor key
-
-      define_singleton_method key do
-        self.instance.send(key)
-      end
-
-      define_singleton_method "#{key}=" do |val|
-        self.instance.send("#{key}=", val)
-      end
+    def watch_dir_present
+      errors.add(:watch_dir, 'is not exist') unless File.exists? self.watch_dir.to_s
     end
 
-
-
   end
 end

data/lib/britebox/version.rb

@@ -1,3 +1,3 @@
 module Britebox
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/britebox/web_ui.rb

@@ -8,6 +8,7 @@ module Britebox
     set :static, true
     set :run, false
     set :server, %w[webrick]
+    set :bind, 'localhost'
 
     configure do
       disable :logging
@@ -26,7 +27,6 @@ module Britebox
     end
 
     get '/' do
-      #send_file File.expand_path('index.html', settings.public_folder)
       erb :index
     end
 
@@ -66,6 +66,20 @@ module Britebox
       Config.values.to_json
     end
 
+    post '/settings' do
+      content_type :json
+
+      request.body.rewind
+      data = JSON.parse request.body.read
+
+      if Config.update(data)
+        Config.values.to_json
+      else
+        status 422
+        {errors: Config.errors.messages}.to_json
+      end
+    end
+
 
   end
 end

data/resources/assets/javascripts/britebox.coffee

@@ -1 +1,2 @@
 app = angular.module('BriteBox', ['ngResource'])
+delay = (ms, func) -> setTimeout func, ms

data/resources/assets/javascripts/compiled-coffee.js

@@ -0,0 +1,263 @@
+(function() {
+  var app, delay;
+
+  app = angular.module('BriteBox', ['ngResource']);
+
+  delay = function(ms, func) {
+    return setTimeout(func, ms);
+  };
+
+  app.controller('FileJobsCtrl', [
+    '$scope', '$resource', '$injector', function($scope, $resource, $injector) {
+      $scope.FileJob = $resource("/file_jobs/:id", {
+        id: '@id'
+      }, {});
+      $scope.file_jobs = $scope.FileJob.query();
+      $scope.texts = {
+        connection_lost: '<strong>Connection lost</strong>. Process died or been killed'
+      };
+      setInterval(function() {
+        $scope.FileJob.query().$then(function(response) {
+          $injector.get('$rootScope').$broadcast('closeMessageByText', $scope.texts.connection_lost);
+          return $scope.file_jobs = response.data;
+        }, function(error) {
+          return $injector.get('$rootScope').$broadcast('showMessage', 'danger', $scope.texts.connection_lost);
+        });
+        return $scope.$apply();
+      }, 1000);
+      $scope.statusClass = function(fj) {
+        switch (fj.status) {
+          case 'pending':
+            return '';
+          case 'verifying':
+            return 'label-info';
+          case 'error':
+            return 'label-danger';
+          case 'complete':
+            return 'label-success';
+          default:
+            return '';
+        }
+      };
+      $scope.pauseFileJob = function(fj) {
+        fj.status = 'paused';
+        return $scope.FileJob.save(fj);
+      };
+      $scope.resumeFileJob = function(fj) {
+        fj.status = 'pending';
+        return $scope.FileJob.save(fj);
+      };
+      return $scope.cancelFileJob = function(fj) {
+        fj.status = 'cancelled';
+        return $scope.FileJob.save(fj);
+      };
+    }
+  ]);
+
+  app.controller('NotificationCtrl', [
+    '$scope', function($scope) {
+      var _this = this;
+      $scope.notifications = [];
+      $scope.$on('showMessage', function(data, type, message) {
+        return $scope.showMessage(type, message);
+      });
+      $scope.$on('closeMessageByText', function(data, message) {
+        return $scope.closeMessageByText(message);
+      });
+      $scope.closeMessage = function(index) {
+        return $scope.notifications.splice(index, 1);
+      };
+      $scope.closeMessageByText = function(message) {
+        return $.each($scope.notifications, function(k, v) {
+          if (v['message'] === message) {
+            return $scope.notifications.splice(k, 1);
+          }
+        });
+      };
+      return $scope.showMessage = function(type, message) {
+        var add;
+        add = true;
+        $.each($scope.notifications, function(k, v) {
+          if (v['message'] === message && v['type'] === type) {
+            return add = false;
+          }
+        });
+        if (add) {
+          return $scope.notifications.push({
+            type: type,
+            message: message
+          });
+        }
+      };
+    }
+  ]);
+
+  app.controller('SettingsCtrl', [
+    '$scope', '$http', '$injector', function($scope, $http, $injector) {
+      $scope.settings = {};
+      $scope.errors = {};
+      $scope.modal_fields = [
+        {
+          key: 'api_key',
+          title: 'API Key',
+          help: ''
+        }, {
+          key: 'watch_dir',
+          title: 'Watch directory'
+        }, {
+          key: 'out_dir',
+          title: 'Output directory',
+          help: 'Processed files will be placed here. restart'
+        }, {
+          key: 'threads',
+          title: 'Threads',
+          help: 'Number of parallel threads used for processing, minimum is 1, maximum is 10'
+        }, {
+          key: 'port',
+          title: 'Port',
+          help: 'Launch web server on this port'
+        }
+      ];
+      $scope.texts = {
+        get_error: 'Unable to load settings. Please reload page',
+        simulation_mode: 'Running in <b>Simulation mode</b>. No real requests to API will be made.',
+        saved: 'Settings succesfully saved'
+      };
+      $scope.reload = function() {
+        return $http.get('/settings').success(function(data, status, headers, config) {
+          $scope.settings = data;
+          $scope.errors = {};
+          $injector.get('$rootScope').$broadcast('settingsUpdated');
+          if ($scope.settings['simulate']) {
+            return $injector.get('$rootScope').$broadcast('showMessage', 'info', $scope.texts.simulation_mode);
+          }
+        }).error(function(data, status, headers, config) {
+          return $injector.get('$rootScope').$broadcast('showMessage', 'danger', $scope.texts.get_error);
+        });
+      };
+      $scope.save = function(cb_ok, cb_error) {
+        var sett;
+        if (cb_ok == null) {
+          cb_ok = null;
+        }
+        if (cb_error == null) {
+          cb_error = null;
+        }
+        sett = {};
+        $('.settings-field input.form-control').each(function(k, elem) {
+          var value;
+          value = $(elem).val();
+          if ($scope.isNumber(value)) {
+            value = parseFloat(value);
+          }
+          return sett[$(elem).attr('name')] = value;
+        });
+        return $http.post('/settings', sett).success(function(data, status, headers, config) {
+          $scope.errors = {};
+          if (cb_ok) {
+            cb_ok();
+          }
+          return $injector.get('$rootScope').$broadcast('settingsUpdated');
+        }).error(function(data, status, headers, config) {
+          console.log("error", data, status, headers, config);
+          $scope.errors = {};
+          $.each(data.errors, function(k, v) {
+            return $scope.errors[k] = v.join(", ");
+          });
+          console.log("errors", $scope.errors);
+          if (cb_error) {
+            return cb_error();
+          }
+        });
+      };
+      $scope.modalRevert = function() {
+        $scope.reload();
+        return $('#settingsModal button.close').click();
+      };
+      $scope.modalSave = function() {
+        return $scope.save(function() {
+          $scope.reload();
+          $('#settingsModal button.close').click();
+          return $injector.get('$rootScope').$broadcast('showMessage', 'success', $scope.texts.saved);
+        });
+      };
+      $scope.isValidField = function(field) {
+        return !$scope.errors[field];
+      };
+      $scope.formGroupClass = function(field) {
+        if ($scope.isValidField(field)) {
+          return '';
+        } else {
+          return 'has-error';
+        }
+      };
+      $scope.isNumber = function(n) {
+        return !isNaN(parseFloat(n)) && isFinite(n);
+      };
+      return $scope.reload();
+    }
+  ]);
+
+  app.controller('SettingsObserverCtrl', [
+    '$scope', '$http', '$injector', function($scope, $http, $injector) {
+      var _this = this;
+      $scope.settings = {};
+      $scope.$on('settingsUpdated', function(data) {
+        return $scope.reload();
+      });
+      return $scope.reload = function() {
+        var elem;
+        elem = $('[ng-controller="SettingsCtrl"]')[0];
+        return delay(100, function() {
+          var sett;
+          sett = angular.element(elem).scope().settings;
+          return $scope.settings = JSON.parse(JSON.stringify(sett));
+        });
+      };
+    }
+  ]);
+
+  app.filter('bytes', function() {
+    return function(bytes, precision) {
+      var number, units;
+      if (precision == null) {
+        precision = 1;
+      }
+      if (isNaN(parseFloat(bytes)) || !isFinite(bytes)) {
+        return '-';
+      }
+      if (bytes === 0) {
+        return '0 bytes';
+      }
+      units = ['bytes', 'kB', 'MB', 'GB', 'TB', 'PB'];
+      number = Math.floor(Math.log(bytes) / Math.log(1024));
+      return (bytes / Math.pow(1024, Math.floor(number))).toFixed(precision) + ' ' + units[number];
+    };
+  });
+
+  app.filter('capitalize', function() {
+    return function(string) {
+      if (string == null) {
+        string = '';
+      }
+      return string.toLowerCase().replace(/\b[a-z]/g, function(letter) {
+        return letter.toUpperCase();
+      });
+    };
+  });
+
+  app.filter('duration', function() {
+    return function(duration, options) {
+      var hr, min, sec;
+      if (isNaN(parseFloat(duration)) || !isFinite(duration)) {
+        return '-';
+      }
+      duration = parseInt(duration);
+      sec = duration % 60;
+      min = (duration - sec) / 60 % 60;
+      hr = (duration - sec - 60 * min) / 3600;
+      return "" + ("0" + hr).slice(-2) + ":" + ("0" + min).slice(-2) + ":" + ("0" + sec).slice(-2);
+    };
+  });
+
+}).call(this);

data/resources/assets/javascripts/controllers/file_jobs_ctrl.coffee

@@ -18,6 +18,14 @@ app.controller 'FileJobsCtrl', ['$scope', '$resource', '$injector', ($scope, $re
     $scope.$apply()
   , 1000)
 
+  $scope.statusClass = (fj) ->
+    switch fj.status
+      when 'pending' then ''
+      when 'verifying' then 'label-info'
+      when 'error' then 'label-danger'
+      when 'complete' then 'label-success'
+      else ''
+
   $scope.pauseFileJob = (fj) ->
     fj.status = 'paused';
     $scope.FileJob.save(fj)

data/resources/assets/javascripts/controllers/settings_ctrl.coffee

@@ -1,28 +1,74 @@
 app.controller 'SettingsCtrl', ['$scope', '$http', '$injector', ($scope, $http, $injector) ->
 
-  #$scope.Settings = $resource("/settings/:id", {id: '@id'}, {})
-
   $scope.settings = {}
+  $scope.errors = {}
+  $scope.modal_fields = [
+    {key: 'api_key',  title: 'API Key', help: ''}
+    {key: 'watch_dir',title: 'Watch directory'}
+    {key: 'out_dir',  title: 'Output directory', help: 'Processed files will be placed here. restart'}
+    {key: 'threads',  title: 'Threads', help: 'Number of parallel threads used for processing, minimum is 1, maximum is 10'}
+    {key: 'port',     title: 'Port', help: 'Launch web server on this port'}
+  ]
+
   $scope.texts = {
     get_error: 'Unable to load settings. Please reload page'
     simulation_mode: 'Running in <b>Simulation mode</b>. No real requests to API will be made.'
+    saved: 'Settings succesfully saved'
   }
 
   $scope.reload = () ->
-    $http({method: 'GET', url: '/settings'}).success (data, status, headers, config) ->
+    $http.get('/settings').success (data, status, headers, config) ->
       $scope.settings = data
-
+      $scope.errors = {}
+      $injector.get('$rootScope').$broadcast('settingsUpdated')
       if $scope.settings['simulate']
         $injector.get('$rootScope').$broadcast('showMessage', 'info', $scope.texts.simulation_mode)
+    .error (data, status, headers, config) ->
+      $injector.get('$rootScope').$broadcast('showMessage', 'danger', $scope.texts.get_error)
+
+
+  $scope.save = (cb_ok = null, cb_error = null) ->
+    sett = {}
+    $('.settings-field input.form-control').each (k, elem) ->
+      value = $(elem).val()
+      value = parseFloat(value) if $scope.isNumber(value)
+      sett[$(elem).attr('name')] = value
 
+    $http.post('/settings', sett).success (data, status, headers, config) ->
+      $scope.errors = {}
+      cb_ok() if cb_ok
+      $injector.get('$rootScope').$broadcast('settingsUpdated')
 
     .error (data, status, headers, config) ->
-      $injector.get('$rootScope').$broadcast('showMessage', 'danger', $scope.texts.get_error)
+      console.log "error", data, status, headers, config
+      $scope.errors = {}
+      $.each data.errors, (k, v) ->
+        $scope.errors[k] = v.join(", ")
+      console.log "errors", $scope.errors
+      cb_error() if cb_error
 
 
-  $scope.save = () ->
-    # ...
+  $scope.modalRevert = () ->
+    $scope.reload()
+    $('#settingsModal button.close').click()
 
-  $scope.reload()
+  $scope.modalSave = () ->
+    $scope.save ->
+      $scope.reload()
+      $('#settingsModal button.close').click()
+      $injector.get('$rootScope').$broadcast('showMessage', 'success', $scope.texts.saved)
+
+  $scope.isValidField = (field) ->
+    !$scope.errors[field]
 
+  $scope.formGroupClass = (field) ->
+    if $scope.isValidField(field)
+      ''
+    else
+      'has-error'
+
+  $scope.isNumber = (n) ->
+    !isNaN(parseFloat(n)) && isFinite(n)
+
+  $scope.reload()
 ]

data/resources/assets/javascripts/controllers/settings_observer_ctrl.coffee

@@ -0,0 +1,13 @@
+app.controller 'SettingsObserverCtrl', ['$scope', '$http', '$injector', ($scope, $http, $injector) ->
+
+  $scope.settings = {}
+
+  $scope.$on 'settingsUpdated', (data) => $scope.reload()
+
+  $scope.reload = () ->
+    elem = $('[ng-controller="SettingsCtrl"]')[0]
+    delay 100, ->
+      sett = angular.element(elem).scope().settings
+      $scope.settings = JSON.parse JSON.stringify(sett)
+
+]

data/resources/assets/javascripts/filters/capitalize.coffee

@@ -0,0 +1,4 @@
+app.filter 'capitalize', ->
+  (string) ->
+    string ?= ''
+    string.toLowerCase().replace /\b[a-z]/g, (letter) -> letter.toUpperCase()

data/resources/public/javascripts/application.js

@@ -1,8 +1,12 @@
 (function() {
-  var app;
+  var app, delay;
 
   app = angular.module('BriteBox', ['ngResource']);
 
+  delay = function(ms, func) {
+    return setTimeout(func, ms);
+  };
+
   app.controller('FileJobsCtrl', [
     '$scope', '$resource', '$injector', function($scope, $resource, $injector) {
       $scope.FileJob = $resource("/file_jobs/:id", {
@@ -21,6 +25,20 @@
         });
         return $scope.$apply();
       }, 1000);
+      $scope.statusClass = function(fj) {
+        switch (fj.status) {
+          case 'pending':
+            return '';
+          case 'verifying':
+            return 'label-info';
+          case 'error':
+            return 'label-danger';
+          case 'complete':
+            return 'label-success';
+          default:
+            return '';
+        }
+      };
       $scope.pauseFileJob = function(fj) {
         fj.status = 'paused';
         return $scope.FileJob.save(fj);
@@ -77,16 +95,39 @@
   app.controller('SettingsCtrl', [
     '$scope', '$http', '$injector', function($scope, $http, $injector) {
       $scope.settings = {};
+      $scope.errors = {};
+      $scope.modal_fields = [
+        {
+          key: 'api_key',
+          title: 'API Key',
+          help: ''
+        }, {
+          key: 'watch_dir',
+          title: 'Watch directory'
+        }, {
+          key: 'out_dir',
+          title: 'Output directory',
+          help: 'Processed files will be placed here. restart'
+        }, {
+          key: 'threads',
+          title: 'Threads',
+          help: 'Number of parallel threads used for processing, minimum is 1, maximum is 10'
+        }, {
+          key: 'port',
+          title: 'Port',
+          help: 'Launch web server on this port'
+        }
+      ];
       $scope.texts = {
         get_error: 'Unable to load settings. Please reload page',
-        simulation_mode: 'Running in <b>Simulation mode</b>. No real requests to API will be made.'
+        simulation_mode: 'Running in <b>Simulation mode</b>. No real requests to API will be made.',
+        saved: 'Settings succesfully saved'
       };
       $scope.reload = function() {
-        return $http({
-          method: 'GET',
-          url: '/settings'
-        }).success(function(data, status, headers, config) {
+        return $http.get('/settings').success(function(data, status, headers, config) {
           $scope.settings = data;
+          $scope.errors = {};
+          $injector.get('$rootScope').$broadcast('settingsUpdated');
           if ($scope.settings['simulate']) {
             return $injector.get('$rootScope').$broadcast('showMessage', 'info', $scope.texts.simulation_mode);
           }
@@ -94,11 +135,88 @@
           return $injector.get('$rootScope').$broadcast('showMessage', 'danger', $scope.texts.get_error);
         });
       };
-      $scope.save = function() {};
+      $scope.save = function(cb_ok, cb_error) {
+        var sett;
+        if (cb_ok == null) {
+          cb_ok = null;
+        }
+        if (cb_error == null) {
+          cb_error = null;
+        }
+        sett = {};
+        $('.settings-field input.form-control').each(function(k, elem) {
+          var value;
+          value = $(elem).val();
+          if ($scope.isNumber(value)) {
+            value = parseFloat(value);
+          }
+          return sett[$(elem).attr('name')] = value;
+        });
+        return $http.post('/settings', sett).success(function(data, status, headers, config) {
+          $scope.errors = {};
+          if (cb_ok) {
+            cb_ok();
+          }
+          return $injector.get('$rootScope').$broadcast('settingsUpdated');
+        }).error(function(data, status, headers, config) {
+          console.log("error", data, status, headers, config);
+          $scope.errors = {};
+          $.each(data.errors, function(k, v) {
+            return $scope.errors[k] = v.join(", ");
+          });
+          console.log("errors", $scope.errors);
+          if (cb_error) {
+            return cb_error();
+          }
+        });
+      };
+      $scope.modalRevert = function() {
+        $scope.reload();
+        return $('#settingsModal button.close').click();
+      };
+      $scope.modalSave = function() {
+        return $scope.save(function() {
+          $scope.reload();
+          $('#settingsModal button.close').click();
+          return $injector.get('$rootScope').$broadcast('showMessage', 'success', $scope.texts.saved);
+        });
+      };
+      $scope.isValidField = function(field) {
+        return !$scope.errors[field];
+      };
+      $scope.formGroupClass = function(field) {
+        if ($scope.isValidField(field)) {
+          return '';
+        } else {
+          return 'has-error';
+        }
+      };
+      $scope.isNumber = function(n) {
+        return !isNaN(parseFloat(n)) && isFinite(n);
+      };
       return $scope.reload();
     }
   ]);
 
+  app.controller('SettingsObserverCtrl', [
+    '$scope', '$http', '$injector', function($scope, $http, $injector) {
+      var _this = this;
+      $scope.settings = {};
+      $scope.$on('settingsUpdated', function(data) {
+        return $scope.reload();
+      });
+      return $scope.reload = function() {
+        var elem;
+        elem = $('[ng-controller="SettingsCtrl"]')[0];
+        return delay(100, function() {
+          var sett;
+          sett = angular.element(elem).scope().settings;
+          return $scope.settings = JSON.parse(JSON.stringify(sett));
+        });
+      };
+    }
+  ]);
+
   app.filter('bytes', function() {
     return function(bytes, precision) {
       var number, units;
@@ -117,6 +235,17 @@
     };
   });
 
+  app.filter('capitalize', function() {
+    return function(string) {
+      if (string == null) {
+        string = '';
+      }
+      return string.toLowerCase().replace(/\b[a-z]/g, function(letter) {
+        return letter.toUpperCase();
+      });
+    };
+  });
+
   app.filter('duration', function() {
     return function(duration, options) {
       var hr, min, sec;

data/resources/views/_settings_modal.erb

@@ -8,39 +8,22 @@
       <div class="modal-body">
         <form>
 
-          <div class="form-group">
-            <label for="settings-api_key">API Key</label>
-            <input type="text" class="form-control" id="settings-api_key" placeholder="" value="{{settings.api_key}}">
-            <!--<p class="help-block">Example block-level help text here.</p>-->
-          </div>
-
-          <div class="form-group">
-            <label for="settings-watch_dir">Watch directory</label>
-            <input type="text" class="form-control" id="settings-watch_dir" placeholder="" value="{{settings.watch_dir}}">
-            <!--<p class="help-block">Example block-level help text here.</p>-->
-          </div>
-
-          <div class="form-group">
-            <label for="settings-out_dir">Output directory</label>
-            <input type="text" class="form-control" id="settings-out_dir" placeholder="" value="{{settings.out_dir}}">
-            <p class="help-block">Processed files will be placed here.</p>
-          </div>
-
-          <div class="form-group">
-            <label for="settings-threads">Threads</label>
-            <input type="text" class="form-control" id="settings-threads" placeholder="" value="{{settings.threads}}">
-            <p class="help-block">Number of parallel threads used for processing, minimum is 1, maximum is 10</p>
-          </div>
-
-          <div class="form-group">
-            <label for="settings-port">Launch web server on port</label>
-            <input type="text" class="form-control" id="settings-port" placeholder="" value="{{settings.port}}">
+          <div ng-repeat="opts in modal_fields" class="form-group settings-field {{formGroupClass(opts.key)}}">
+            <label for="settings-{{opts.key}}">{{opts.title}}:</label>
+            <input type="text"
+                   class="form-control"
+                   id="settings-{{opts.key}}"
+                   placeholder=""
+                   name="{{opts.key}}"
+                   ng-model="settings[opts.key]">
+            <p class="help-block" ng-if="opts.help && isValidField(opts.key)">{{opts.help}}</p>
+            <p class="help-block" ng-if="!isValidField(opts.key)">{{opts.title}} {{errors[opts.key]}}</p>
           </div>
         </form>
       </div>
       <div class="modal-footer">
-        <a href="#" class="btn">Close</a>
-        <a href="#" class="btn btn-primary">Save changes</a>
+        <a href="#" class="btn close-button" ng-click="modalRevert()">Revert changes</a>
+        <a href="#" class="btn btn-primary" ng-click="modalSave()">Save changes</a>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->

data/resources/views/index.erb

@@ -17,6 +17,9 @@
     .notifications {
       padding: 10px 50px 10px;
     }
+    .btn.close-button:hover, .btn.close-button:focus {
+      color: #000;
+    }
   </style>
 </head>
 <body>
@@ -40,7 +43,7 @@
 
 <%= erb :_settings_modal %>
 
-<div ng-controller="SettingsCtrl">
+<div ng-controller="SettingsObserverCtrl">
   <dl class="dl-horizontal text-muted">
     <dt>Watching directory</dt>
     <dd>{{settings.watch_dir}}</dd>
@@ -50,7 +53,7 @@
 </div>
 
 <div ng-controller="FileJobsCtrl">
-  <table class="table table-hover">
+  <table class="table">
     <thead>
       <tr>
         <th style="width: 50px;">#</th>
@@ -60,7 +63,7 @@
         <th style="width: 100px;">Processed</th>
         <th>
           Progress
-          <div style="float: right;margin-right: 70px;">Actions</div>
+          <div style="float: right;margin-right: 80px;">Actions</div>
         </th>
       </tr>
     </thead>
@@ -69,7 +72,9 @@
         <td>{{key + 1}}</td>
         <td>{{file_job.file_name}}</td>
         <td>{{file_job.size_total|bytes}}</td>
-        <td>{{file_job.status}}</td>
+        <td>
+          <span class="label {{statusClass(file_job)}}">{{file_job.status|capitalize}}</span>
+        </td>
         <td>{{file_job.percent_complete|number:1}} %</td>
         <td>
           <span ng-if="file_job.duration">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: britebox
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Alexander Shapiotko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brite-api
@@ -53,6 +53,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.3
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: CLI tool for bath csv file processing via BriteVerify API
 email:
 - support@briteverify.com
@@ -74,10 +88,13 @@ files:
 - lib/britebox.rb
 - resources/assets/images/screenshot.png
 - resources/assets/javascripts/britebox.coffee
+- resources/assets/javascripts/compiled-coffee.js
 - resources/assets/javascripts/controllers/file_jobs_ctrl.coffee
 - resources/assets/javascripts/controllers/notification_ctrl.coffee
 - resources/assets/javascripts/controllers/settings_ctrl.coffee
+- resources/assets/javascripts/controllers/settings_observer_ctrl.coffee
 - resources/assets/javascripts/filters/bytes.coffee
+- resources/assets/javascripts/filters/capitalize.coffee
 - resources/assets/javascripts/filters/duration.coffee
 - resources/public/javascripts/angular-resource.min.js
 - resources/public/javascripts/angular.min.js