africompta 1.9.10 → 1.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a91b9deaedb6cdd17d79b5c52d3fd3c1e028ec13
-  data.tar.gz: 6734c25f6cb35d0096497db5e2d72cef12fb571d
+  metadata.gz: '08243c15dad8df272891c62ea2faf14f74da98ac'
+  data.tar.gz: cae8035c25a7289f8cd3901d81dd6470b17ccc7d
 SHA512:
-  metadata.gz: a084bd9054e525ddcb3e1ade74d210f3d251a79622636c650e39cdcf4a360b3c5cb7071a0aa247fed0cd5e8fc39c0c02bafd19ac453906df2a96e3721702976f
-  data.tar.gz: ffd82a27c7707fd174dd7abe110d2d07c84053d098e12e0c2698d90e63b06484c257c1b01b6feb5a254970150cf9402285b5440a46e75e0dcbfde59826cb93b3
+  metadata.gz: 98b9ecec86b7f200b922c36556bfb9ac2cc8f416e71b43260cdaeca5d31522a38b4e810ef2e6a0ed0b3494ddf7fa1aaaedf3c33bf1c3dcc6d55876a97ff9df14
+  data.tar.gz: ec678fd7608c2391ea85791fb6da89fab6c0acbff3bf538b1755390199bff3b6370604adadc36373e20bbbc415a2a17d4c5860e22e9d1c39169a782f1f2ec5ee

data/.gitignore

@@ -8,8 +8,13 @@ config.yaml
 data
 tmp/
 .idea
+*.mo
+*.pot
 compta.db.*
 test/test.pdf
 test/*db
 test/data*
-/*gem
+test/thread*
+/*gem
+
+afri_compta.conf

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
   remote: .
   specs:
-    africompta (1.9.10.pre.1)
-      qooxview (= 1.9.10.pre.1)
+    africompta (1.9.10)
+      prawn (= 1.0.0)
+      qooxview (= 1.9.10)
 
 PATH
   remote: ../HelperClasses
   specs:
-    helper_classes (0.3.2)
+    helper_classes (0.3.5)
 
 PATH
   remote: ../QooxView
   specs:
-    qooxview (1.9.10.pre.1)
+    qooxview (1.9.10)
       activemodel (= 3.1.1)
       activerecord (= 3.1.1)
       activesupport (= 3.1.1)
@@ -20,11 +21,11 @@ PATH
       chunky_png (= 1.3.4)
       docsplit (= 0.7.6)
       gettext (= 3.0.0)
-      helper_classes (= 0.3.2)
+      helper_classes (= 0.3.5)
       i18n (= 0.6.0)
       iconv (= 1.0.3)
       iniparse (= 1.4.0)
-      json (= 1.8.2)
+      json (= 2.1.0)
       locale (= 2.0.8)
       multi_json (= 1.0.3)
       net-ldap (= 0.5.1)
@@ -59,10 +60,14 @@ GEM
     i18n (0.6.0)
     iconv (1.0.3)
     iniparse (1.4.0)
-    json (1.8.2)
+    json (2.1.0)
     locale (2.0.8)
     multi_json (1.0.3)
     net-ldap (0.5.1)
+    pdf-core (0.2.5)
+    prawn (1.0.0)
+      pdf-core (~> 0.2.2)
+      ttfunk (~> 1.1.1)
     rqrcode (0.4.2)
     rqrcode-with-patches (0.5.4)
       chunky_png
@@ -70,7 +75,8 @@ GEM
     serialport (1.3.1)
     sqlite3 (1.3.10)
     text (1.2.3)
-    tzinfo (0.3.44)
+    ttfunk (1.1.1)
+    tzinfo (0.3.53)
 
 PLATFORMS
   ruby

data/africompta.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'africompta'
-  s.version = '1.9.10'
+  s.version = '1.9.11'
   s.date = '2015-06-20'
   s.summary = 'Africompta-module for QooxView'
   s.description = 'With this module you can have a simple accounting-system.
@@ -19,5 +19,6 @@ see http://github.com/ineiti/AfriCompta_client .'
       'https://github.com/ineiti/AfriCompta'
   s.license = 'GPLv3'
 
-  s.add_dependency 'qooxview', '1.9.10'
+  s.add_dependency 'qooxview', '1.9.11'
+  s.add_dependency 'prawn', '1.0.0'
 end

data/bin/afri_compta.rb

@@ -0,0 +1,119 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+if ARGV == %w(-p)
+  DEBUG_LVL = 0
+else
+  DEBUG_LVL = 2
+end
+
+require 'bundler/setup'
+require 'helper_classes'
+include HelperClasses
+include System
+
+Encoding.default_external = Encoding::UTF_8
+
+require 'fileutils'
+
+begin
+  require 'africompta'
+  if not FileTest.exists? $config_file
+    puts "Config-file doesn't exist, copying a standard one"
+    FileUtils.cp "#{File.join(AFRICOMPTA_DIR, '..', '..', 'config.yaml')}.default",
+                 $config_file
+    load_config_yaml
+  end
+rescue Exception => e
+  puts "#{e.inspect}"
+  puts "#{e.to_s}"
+  puts e.backtrace
+  exit
+end
+
+begin
+  QooxView::init('entities', 'views')
+rescue Exception => e
+  case e.to_s
+    when /UpdatePot|MakeMo|PrintHelp|value_entity_uncomplete/
+    else
+      puts e.inspect
+      puts e.backtrace
+      dputs(0) { "Error: Couldn't load things!" }
+      dputs(0) { "#{e.inspect}" }
+      dputs(0) { "#{e.to_s}" }
+      puts e.backtrace
+  end
+  exit
+end
+
+webrick_port = get_config(3302, :Webrick, :port)
+dputs(2) { "Starting at port #{webrick_port}" }
+
+$profiling = get_config(nil, :profiling)
+if $profiling
+  dputs(1) { 'Starting Profiling' }
+  require 'rubygems'
+  require 'perftools'
+  PerfTools::CpuProfiler.start("/tmp/#{$profiling}") do
+    QooxView::startWeb webrick_port, get_config(30, :profiling, :duration)
+    dputs(1) { 'Finished profiling' }
+  end
+
+  if $profiling
+    puts "Now run the following:
+pprof.rb --pdf /tmp/#{$profiling} > /tmp/#{$profiling}.pdf
+open /tmp/#{$profiling}.pdf
+CPUPROFILE_FREQUENCY=500
+    "
+  end
+else
+  dputs(1) { 'Starting autosave' }
+  $autosave = Thread.new {
+    loop {
+      sleep 60
+      rescue_all "Error: couldn't save all" do
+        Entities.save_all
+      end
+    }
+  }
+
+  # Shows time every minute in the logs
+  if get_config(false, :showTime)
+    dputs(1) { 'Showing time' }
+    $show_time = Thread.new {
+      loop {
+        sleep 60
+        dputs(1) { 'It is now: ' + Time.now.strftime('%Y-%m-%d %H:%M') }
+      }
+    }
+  end
+
+  # Catch SIGINT signal so we can save everything before quitting
+  trap('SIGINT') {
+    throw :ctrl_c
+  }
+
+  ConfigBase.set_functions(%w(accounting accounting_standalone))
+  # Finally start QooxView
+  catch :ctrl_c do
+    rescue_all 'Error: QooxView aborted' do
+      log_msg :main, "Started Gestion on port #{webrick_port}"
+      images_path = File.join(File.expand_path(File.dirname(__FILE__)), 'Images')
+      RPCQooxdooHandler.add_file_path(:Images, images_path)
+      include HelperClasses::HashAccessor
+      $config = {}
+      Welcome.nologin
+      QooxView::startWeb webrick_port
+    end
+  end
+
+  # Clean up all threads
+  if get_config(true, :autosave)
+    $autosave.kill
+  end
+  $show_time and $show_time.kill
+
+  # And finally save all before quitting
+  Entities.save_all
+end

data/bin/africompta.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+cd "$( dirname ${BASH_SOURCE[0]} )/.."
+DIR_AC="$(pwd)"
+DIR_RES="$DIR_AC/.."
+
+echo "DATA_DIR=$HOME/Library/AfriCompta" > ../afri_compta.conf
+export PATH="$DIR_RES/ruby/bin:$PATH"
+export GEM_PATH="$DIR_RES/ruby/lib/ruby"
+echo path: $PATH
+echo gem_path: $GEM_PATH
+ruby --version
+which ruby
+pkill -f "afri_compta.rb"
+bin/afri_compta.rb &
+AFRICOMPTA=$!
+sleep 5
+echo $AFRICOMPTA
+open -Wn -a Safari.app http://localhost:3302
+kill $!
+#open -a Safari.app http://localhost:3302/$!
+#pkill -f "afri_compta.rb"
+echo Done with AfriCompta
+#read a

data/config.yaml.default

@@ -0,0 +1,19 @@
+# Uncomment to automatically login admin
+#autologin: admin
+# Together with autologin, allows for more than one at the same time,
+# for example for chat
+#multilogin: true
+
+StorageType:
+  CSV:
+    backup_count: 5
+
+#profiling: profile.txt
+#  duration: 30
+
+Webrick:
+#  port: 3302
+
+Views:
+#  CourseTabs:
+#    order: 0

data/lib/africompta.rb

@@ -1,2 +1,8 @@
 require 'bundler/setup'
-require 'africompta/africompta'
+require 'qooxview'
+require 'africompta/acaccess'
+require 'africompta/acqooxview'
+
+AFRICOMPTA_DIR = File.join(File.dirname(__FILE__), 'africompta')
+QooxView.load_dirs(%w(entities views).collect { |d|
+                     File.join(AFRICOMPTA_DIR, d) })

data/lib/africompta/acaccess.rb

@@ -64,30 +64,6 @@ class ACaccess < RPCQooxdooPath
     ret
   end
 
-  def self.accounts_fetch_old(user)
-    ret = ''
-
-    Accounts.matches_by_account_id(0).to_a.concat(
-        Accounts.matches_by_account_id(nil)).sort { |a, b|
-      a.global_id <=> b.global_id }.each { |a|
-      dputs(2) { "Found one root-account #{a.rev_index} - #{a.path_id}" }
-      if a.global_id
-        dputs(3) { "It's global" }
-        a.get_tree { |acc|
-          dputs(4) { "In get_tree #{acc.path_id}: #{acc.deleted == true} - #{acc.rev_index}" }
-          if acc.rev_index > user.account_index
-            dputs(4) { "Found account #{acc.name} with index #{acc.rev_index}" }
-            ret += "#{acc.to_s}\n"
-          end
-        }
-      else
-        dputs(3) { "It's not global" }
-      end
-      dputs(3) { 'Will search for next' }
-    }
-    ret
-  end
-
   def self.accounts_fetch(user)
     Accounts.data.select { |_k, v| v._rev_index > user.account_index }.
         collect { |k, _v| Accounts.get_data_instance(k) }.
@@ -100,9 +76,9 @@ class ACaccess < RPCQooxdooPath
     # Two cases:
     # path/arg/user,pass - arg is used
     # path/user,pass - arg is nil
-    path, arg, id = p.split("/")
+    path, arg, id = p.split('/')
     arg, id = id, arg if not id
-    user, pass = id.split(",")
+    user, pass = id.split(',')
 
     log_msg 'ACaccess.get', "get-merge-path #{path} - #{arg} with " +
                               "user #{user} and pass #{pass}"
@@ -120,52 +96,55 @@ class ACaccess < RPCQooxdooPath
         ret = ''
         dputs(2) { "user index is: #{u.account_index}" }
         # Returns only one account
-        if $1 == '_one'
-          return Accounts.match_by_global_id(arg).to_s
-        end
-        if $1 == '_all'
-          dputs(2) { 'Putting all accounts' }
-          ret = Accounts.search_all.collect { |acc|
-            dputs(4) { "Found account #{acc.name} with index #{acc.rev_index}" }
-            acc.to_s(true)
-          }.join("\n")
-        elsif $1 == '_count'
-          ret += Accounts.search_all.size.to_s
-        elsif $1 == '_part'
-          acc_start, acc_end = arg.split(",")
-          dputs(2) { "Putting accounts #{acc_start}..#{acc_end}" }
-          Accounts.search_all.select { |acc|
-            acc.rev_index >= acc_start.to_i and acc.rev_index <= acc_end.to_i
-          }.each { |acc|
-            dputs(4) { "Found account #{acc.name} with index #{acc.rev_index}" }
-            ret += "#{acc.to_s(true)}\n"
-          }
-        else
-          dputs(2) { 'Starting to search accounts' }
-          t = Time.now
-          ret += ACaccess.accounts_fetch(u)
-          dputs(2) { "Found #{ret.count("\n")} after #{Time.now - t} seconds" }
+        case $1
+          when '_one'
+            return Accounts.match_by_global_id(arg).to_s
+          when '_all'
+            dputs(2) { 'Putting all accounts' }
+            ret = Accounts.search_all.collect { |acc|
+              dputs(4) { "Found account #{acc.name} with index #{acc.rev_index}" }
+              acc.to_s(true)
+            }.join("\n")
+          when '_count'
+            ret += Accounts.search_all.size.to_s
+          when '_part'
+            acc_start, acc_end = arg.split(',')
+            dputs(2) { "Putting accounts #{acc_start}..#{acc_end}" }
+            Accounts.search_all.select { |acc|
+              acc.rev_index >= acc_start.to_i and acc.rev_index <= acc_end.to_i
+            }.each { |acc|
+              dputs(4) { "Found account #{acc.name} with index #{acc.rev_index}" }
+              ret += "#{acc.to_s(true)}\n"
+            }
+          else
+            dputs(2) { 'Starting to search accounts' }
+            t = Time.now
+            ret += ACaccess.accounts_fetch(u)
+            dputs(2) { "Found #{ret.count("\n")} after #{Time.now - t} seconds" }
         end
         dputs(3) { 'Finished search' }
         return ret
-
       # Gets all movements (for the accounts of that user)
       when /movements_get(.*)/
         dputs(2) { "movements_get#{$1} with #{arg.inspect}" }
         start, stop = u.movement_index + 1, u_local.movement_index - 1
-        # Returns only one account
-        if $1 == '_one'
-          return Movements.match_by_global_id(arg).to_s
-        end
-        if $1 == '_all_actual'
-          start, stop = arg.split(/,/)
-          ret = print_movements_actual(start, stop)
-        else
-          if $1 == '_all'
-            start, stop = arg.split(/,/)
-          end
-          ret = print_movements(start, stop)
-        end
+        ret = case $1
+                when '_one'
+                  # Returns only one account
+                  Movements.match_by_global_id(arg).to_s
+                when '_all_actual'
+                  start, stop = arg.split(/,/)
+                  print_movements_actual(start, stop)
+                when '_all'
+                  Movements.search_all.collect { |m|
+                    m.to_s
+                  }.join("\n")
+                when '_range'
+                  start, stop = arg.split(/,/)
+                  print_movements(start, stop)
+                else
+                  print_movements(start, stop)
+              end
         dputs(2) { "Sending a total of #{ret.length}" }
         dputs(3) { "Sending:\n #{ret.inspect}" }
         return ret
@@ -174,7 +153,7 @@ class ACaccess < RPCQooxdooPath
         return $VERSION.to_s
 
       when 'index'
-        return [u_local.account_index, u_local.movement_index].join(",")
+        return [u_local.account_index, u_local.movement_index].join(',')
 
       when 'local_id'
         return u_local.full
@@ -196,11 +175,17 @@ class ACaccess < RPCQooxdooPath
           mov.delete
         end
         dputs(3) { 'Finished deleting' }
+
+      when 'get_db'
+        Entities.save_all
+        return IO.read(Accounts.storage[:SQLiteAC].db_file)
     end
+
     return ''
   end
 
   def self.post(path, input)
+    #dputs_func
     dputs(5) { "self.post with #{path} and #{input.inspect}" }
     log_msg 'ACaccess.post', "post-merge-path #{path} with " +
                                "user #{input['user']} and pass #{input['pass']}"
@@ -231,7 +216,7 @@ class ACaccess < RPCQooxdooPath
             else
               dputs(0) { "Error: couldn't create movement from #{m.inspect}" }
             end
-            u.update_movement_index
+            u.update_movement_index unless input._debug
           }
         end
       when 'movement_delete'
@@ -244,7 +229,7 @@ class ACaccess < RPCQooxdooPath
       when 'account_put'
         dputs(3) { "Going to put account #{input['account'].inspect}" }
         acc = Accounts.from_s(input['account'])
-        u.update_account_index
+        u.update_account_index unless input._debug
         dputs(2) { "Saved account #{acc.global_id}" }
       when 'account_delete'
         dputs(3) { 'Going to delete account' }
@@ -253,5 +238,6 @@ class ACaccess < RPCQooxdooPath
     end
     return 'ok'
   end
+
 end