britebox 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b54286d6165fb16b7e7c0e920bb750b9de039c6
-  data.tar.gz: 43bfdc620b9a7d81dff3f87576ae02a3a7ca7745
+  metadata.gz: 2fa1811b0fba08e5510eb6d8ba5f7ec0bbbc50a1
+  data.tar.gz: 683a9e4ab0215704e595707dd2b9e79e1ecdfa1a
 SHA512:
-  metadata.gz: 0fcdb8abec1665bb6a984307dd75a150862949ff20f38fd6cebbc33d7dd627b4c1e23441056820a46fe155d4f134a7a99c0a83a4157cf2aee4b61aaf4de2455c
-  data.tar.gz: 7b4d2bfb68404e0a260a91250d11d46fa966002b4baa83812c07e9c6879e37eb0203162f388d12fb76841b7424609098deba73b2cd53a9b82546ef288a5385e6
+  metadata.gz: 4d7344b2279ca9eb703482056aa1cb1f5d462b46a98304213b3c2e4eba2a59e082268e94892324b1d94978b13796fd4299f025c50513ea8d885c61acb55dd56a
+  data.tar.gz: 400ae595131e0cf4ff30c4b5ed40bd56b459ecc76660ce0a8cacb347c7872ece698c184c80852f825496760b27d330aadebeb82f9fec5310710b486ede7241ca

data/lib/britebox/config.rb

@@ -9,8 +9,9 @@ module Britebox
 
     OPTIONS = [
       :threads, :api_key, :watch_dir, :out_dir, :port, :ui_enabled, :simulate,
-      :logging_enabled, :log_file
+      :logging_enabled, :log_file, :recheck_enabled, :recheck_interval
     ]
+
     OPTIONS.each { |o| attr_accessor(o) }
 
     MAX_THREADS = 10
@@ -18,13 +19,16 @@ module Britebox
     validates_presence_of :threads, :api_key, :watch_dir, :out_dir, :port, :log_file
     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}"
+    validates_inclusion_of :recheck_interval, in: 1..1440, message: 'should be in range 1..1440'
     validate :watch_dir_present
 
     DEFAULT_OPTIONS = {
       threads: 10,
       port: 7000,
       logging_enabled: false,
-      log_file: '~/britebox.log'
+      log_file: '~/britebox.log',
+      recheck_enabled: false,
+      recheck_interval: 5
     }
 
     CONFIG_PATH = '~/.britebox.json'

data/lib/britebox/file_job_pool.rb

@@ -56,7 +56,7 @@ module Britebox
           cancelled_name = File.basename(file, File.extname(file)) + '_cancelled' + File.extname(file)
           File.rename file_name, File.expand_path(cancelled_name, out_dir)
         else
-          raise "unexpected error, status: #{fj.status}"
+          raise "unexpected error, #{fj.id}, status: #{fj.status}"
         end
 
         EventLog.add 'processing', "#{file}: Finished processing with status #{fj.status}"

data/lib/britebox/version.rb

@@ -1,3 +1,3 @@
 module Britebox
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

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

@@ -145,13 +145,24 @@
         });
       };
       $scope.save = function(cb_ok, cb_error) {
+        var k, sett, v, _ref;
         if (cb_ok == null) {
           cb_ok = null;
         }
         if (cb_error == null) {
           cb_error = null;
         }
-        return $http.post('/settings', $scope.settings).success(function(data, status, headers, config) {
+        sett = {};
+        _ref = $scope.settings;
+        for (k in _ref) {
+          v = _ref[k];
+          if (typeof v === 'string' && v.match(/^[0-9]+$/)) {
+            sett[k] = parseInt(v);
+          } else {
+            sett[k] = v;
+          }
+        }
+        return $http.post('/settings', sett).success(function(data, status, headers, config) {
           $scope.errors = {};
           if (cb_ok) {
             cb_ok();

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

@@ -10,6 +10,8 @@ app.controller 'SettingsCtrl', ['$scope', '$http', '$injector', ($scope, $http,
     {key: 'port',     title: 'Port', help: 'Launch web server on this port'}
     {key: 'logging_enabled', title: 'Enable logging', type: 'checkbox'}
     {key: 'log_file', title: 'Log file'}
+#    {key: 'recheck_enabled', title: 'Enable re-checking csv files with unknown records', type: 'checkbox'}
+#    {key: 'recheck_interval', title: 'Delay before re-checking, minutes', help: 'only records with "unknown" status will be proceed second time'}
   ]
 
   $scope.texts = {
@@ -30,7 +32,14 @@ app.controller 'SettingsCtrl', ['$scope', '$http', '$injector', ($scope, $http,
 
 
   $scope.save = (cb_ok = null, cb_error = null) ->
-    $http.post('/settings', $scope.settings).success (data, status, headers, config) ->
+    sett = {}
+    for k, v of $scope.settings
+      if typeof v == 'string' && v.match /^[0-9]+$/
+        sett[k] = parseInt(v)
+      else
+        sett[k] = v
+
+    $http.post('/settings', sett).success (data, status, headers, config) ->
       $scope.errors = {}
       cb_ok() if cb_ok
       $injector.get('$rootScope').$broadcast('settingsUpdated')

data/resources/public/javascripts/application.js

@@ -145,13 +145,24 @@
         });
       };
       $scope.save = function(cb_ok, cb_error) {
+        var k, sett, v, _ref;
         if (cb_ok == null) {
           cb_ok = null;
         }
         if (cb_error == null) {
           cb_error = null;
         }
-        return $http.post('/settings', $scope.settings).success(function(data, status, headers, config) {
+        sett = {};
+        _ref = $scope.settings;
+        for (k in _ref) {
+          v = _ref[k];
+          if (typeof v === 'string' && v.match(/^[0-9]+$/)) {
+            sett[k] = parseInt(v);
+          } else {
+            sett[k] = v;
+          }
+        }
+        return $http.post('/settings', sett).success(function(data, status, headers, config) {
           $scope.errors = {};
           if (cb_ok) {
             cb_ok();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: britebox
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Alexander Shapiotko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brite-api