qooxview 1.9.10 → 1.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79e8ab8d671a83f68caf34a679b770b3c728a130
-  data.tar.gz: ab43a56aaaac12df6eb8e4efa0cf356f47dcac51
+  metadata.gz: 9c23748472d694e11be55e85c959055bd08158c5
+  data.tar.gz: 24f715cfadda8ffc48cc41f81b6e05b5890164cd
 SHA512:
-  metadata.gz: 8d2391b81f4f1c401658d6c8b5cb2d32b13ad2d7a62c628296660a479d7f992f2ae4e244916bf5cb0a0740192e5c209912cffc2cf36645034c848f73cd4573bd
-  data.tar.gz: db3d432b12cae9f0f72c877d4b5c1a93c9babd2d4640be6d2678f94299884875a74f181cea4e8d92c85a08c563eac7fdc5b0148aeca1b9911dfa8ff1d8e5e49c
+  metadata.gz: a76c27f533696e75d974f9b8655c1115bea68c5c485867b75785cc0fbc0702b9366573dc043d9020223fba5f7f853220bcfc789aa82ba5868dceb9430845c971
+  data.tar.gz: 49d5c59baa85e88e0f55115517f8c19893ec3db8605b42bd14e6c55bae4124e2af0737d6381e416b8f507c464d015b3661da506fe0cc92414d79aa9846f95c13

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.4.1

data/Gemfile.lock

@@ -1,79 +1,87 @@
+PATH
+  remote: ../HelperClasses
+  specs:
+    helper_classes (0.3.5)
+
 PATH
   remote: .
   specs:
-    qooxview (1.9.9)
-      activemodel (= 3.1.1)
-      activerecord (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (= 2.2.1)
+    qooxview (1.9.11)
+      activemodel (= 5.1.0)
+      activerecord (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (= 8.0)
       chunky_png (= 1.3.4)
       docsplit (= 0.7.6)
       gettext (= 3.0.0)
-      helper_classes (= 0.3.2)
-      i18n (= 0.6.0)
+      helper_classes (= 0.3.5)
+      i18n (= 0.7.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)
+      net-ldap (= 0.16)
       rqrcode (= 0.4.2)
       rqrcode-with-patches (= 0.5.4)
       rubyzip (= 1.1.7)
       serialport (= 1.3.1)
       sqlite3 (= 1.3.10)
+      test-unit (= 3.2.3)
       text (= 1.2.3)
 
-PATH
-  remote: vendor/cache/HelperClasses
-  specs:
-    helper_classes (0.3.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activesupport (3.1.1)
-      multi_json (~> 1.0)
-    arel (2.2.1)
-    builder (3.0.4)
+    activemodel (5.1.0)
+      activesupport (= 5.1.0)
+    activerecord (5.1.0)
+      activemodel (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (~> 8.0)
+    activesupport (5.1.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
     chunky_png (1.3.4)
+    concurrent-ruby (1.0.5)
     docsplit (0.7.6)
     gettext (3.0.0)
       locale (>= 2.0.5)
       text
-    i18n (0.6.0)
+    i18n (0.7.0)
     iconv (1.0.3)
     iniparse (1.4.0)
-    json (1.8.2)
+    json (2.1.0)
     locale (2.0.8)
+    minitest (5.10.2)
     multi_json (1.0.3)
-    net-ldap (0.5.1)
-    perftools.rb (2.0.1)
-    rake (10.4.2)
+    net-ldap (0.16.0)
+    power_assert (1.0.2)
+    rake (10.5.0)
     rqrcode (0.4.2)
     rqrcode-with-patches (0.5.4)
       chunky_png
     rubyzip (1.1.7)
     serialport (1.3.1)
     sqlite3 (1.3.10)
+    test-unit (3.2.3)
+      power_assert
     text (1.2.3)
-    tzinfo (0.3.44)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.9)
+  bundler (~> 1.14)
   helper_classes!
-  perftools.rb (= 2.0.1)
   qooxview!
   rake (~> 10.0)
+
+BUNDLED WITH
+   1.14.6

data/bin/test_ldap.rb

@@ -0,0 +1,90 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+Encoding.default_external = Encoding::UTF_8
+
+require 'bundler/setup'
+require 'iniparse'
+require 'helper_classes/dputs'
+require 'net/ldap'
+
+include HelperClasses::DPuts
+
+DEBUG_LVL=4
+
+def get_param(lc, param)
+  lc['__anonymous__'][param].delete('"\'')
+end
+
+file_conf = '/etc/ldapscripts/ldapscripts.conf'
+ldap_config = IniParse.parse(File.read(file_conf))
+dputs(2) { "Configuration options are #{ldap_config.to_hash.inspect}" }
+@data_ldap_host, @data_ldap_base, @data_ldap_root, @data_ldap_users =
+    get_param(ldap_config, 'SERVER'), get_param(ldap_config, 'SUFFIX'),
+        get_param(ldap_config, 'BINDDN'), get_param(ldap_config, 'USUFFIX')
+
+file_pass = '/etc/ldap.secret'
+@data_ldap_pass = `cat #{ file_pass }`
+@data_ldap_users += ",#{@data_ldap_base}"
+%w( host base root pass users ).each { |v| eval("dputs( 3 ){ @data_ldap_#{v}.to_s}") }
+
+@data_ldap = Net::LDAP.new :host => @data_ldap_host,
+                           :auth => {
+                               :method => :simple,
+                               :username => @data_ldap_root,
+                               :password => @data_ldap_pass
+                           }
+
+# Read in the entries from the LDAP-directory
+dputs(3) { 'Reading LDAP-entries' }
+filter = Net::LDAP::Filter.eq('cn', '*')
+@field_id_ldap = :uidNumber
+
+case 1
+  when 0 # Read all entries
+    dputs(3) { "Going to read #{@data_ldap_base}" }
+    @data_ldap.search(:base => @data_ldap_base, :filter => filter) do |entry|
+      dputs(4) { "DN: #{entry.dn}" }
+    end
+  when 1 # Write to one entry
+    filter = Net::LDAP::Filter.eq('uid', 'ltest3')
+    dn, uidnumber = 0, 0
+    @data_ldap.search(:base => @data_ldap_base, :filter => filter) do |entry|
+      dputs(3) { "DN: #{entry.dn} - uidn: #{entry.uidnumber} - entry: #{entry}" }
+      dn = entry.dn
+      uidnumber = entry.uidnumber.first
+    end
+    dp dn
+    dp uidnumber
+    value_stored = 'test'
+    attribute = 'sn'
+    dputs(3) { 'Replacing attribute in ' +
+        "#{[@data_ldap_pass, dn, uidnumber, attribute, value_stored].inspect}" }
+
+    if not dn
+      dputs(0) { "Error: DN is empty... #{@dns.to_a.last(10).inspect}" }
+      dputs(0) { "Error: DN is empty: id, field, value = #{id}, #{field}, #{value}" }
+      #return
+    end
+
+    ret = @data_ldap.replace_attribute(dn, attribute, value_stored.to_s)
+    #ret = @data_ldap.add_attribute(dn, attribute, value_stored.to_s)
+    #ret = @data_ldap.replace_attribute(dn, 'objectClass', %w( inetOrgPerson posixAccount ))
+    dp ret
+    puts "Result: #{@data_ldap.get_operation_result.code}"
+    puts "Message: #{@data_ldap.get_operation_result.message}"
+
+
+    filter2 = Net::LDAP::Filter.eq(@field_id_ldap.to_s, uidnumber.to_s)
+    @data_ldap.search(:base => @data_ldap_base,
+                      :filter => filter2) do |entry|
+      dputs(3) { "Found entry: #{entry.inspect}" }
+      value_entry = entry[attribute][0].to_s
+      value_entry.force_encoding(Encoding::UTF_8)
+      if value_stored.to_s == value_entry
+        dputs(0) { "returning value #{value_stored.inspect}" }
+      else
+        dputs(0) { "Error: Didn't get right return value: #{value_entry.inspect} instead of #{value_stored.inspect}" }
+      end
+    end
+end

data/lib/qooxview.rb

@@ -39,10 +39,10 @@ show_info :welcome, "hello world"
 show_button :welt, :world
 end
 def rpc_button_welt( session, args* )
-reply( 'update', { :welcome => "Hallo Welt" } )
+reply( :update, welcome: "Hallo Welt" )
 end
 def rpc_button_world( session, args* )
-reply( 'update', { :welcome => "Hello world" } )
+reply( :update, welcome: "Hello world" )
 end
 end
 
@@ -75,7 +75,15 @@ of both:
 
 === Configuration-file
 
-A simple YAML-configuration style is supported by default.
+There are two configuration-files:
+- $name.conf - which holds general configurations like data-directory
+  - bash-style configuration, as it is also used by scripts
+  - this file is searched upwards from the $name.rb, then in /etc, if not found.
+   Deafault values used when not found:
+    - DATA_DIR=/var/lib/$name
+- config.yaml - application-specific configuration that is not used by scripts
+  - this file is searched in the DATA_DIR
+  - if not present, will be copied into DATA_DIR
 
 =end
 

data/lib/qooxview/additions.rb

@@ -136,19 +136,7 @@ class Date
   end
 end
 
-class Fixnum
-  def separator(sep = ' ')
-    self.to_s.tap do |s|
-      :go while s.gsub!(/^([^.]*)(\d)(?=(\d{3})+)/, "\\1\\2#{sep}")
-    end
-  end
-
-  def to_MB(label = 'MB')
-    "#{(self / 1_000_000).separator} #{label}"
-  end
-end
-
-class Bignum
+class Integer
   def separator(sep = ' ')
     self.to_s.tap do |s|
       :go while s.gsub!(/^([^.]*)(\d)(?=(\d{3})+)/, "\\1\\2#{sep}")

data/lib/qooxview/config_yaml.rb

@@ -1,8 +1,57 @@
-$config = {} if not defined? $config
-if defined?(CONFIG_FILE) and FileTest.exist?(CONFIG_FILE)
-  File.open(CONFIG_FILE) { |f| $config = YAML::load(f).to_sym }
+$config ||= {}
+$name = $0.match(/.*?([^\/]*?)(.rb)*$/)[1]
+
+# Searches for name in every directory from 'dir' towards the root and
+# returns the found filename.
+# If nothing is found, it returns nil
+# If 'dir' is nil, the directory of the running script is taken
+def search_up(name, dir = nil)
+  dir ||= File.realdirpath(File.dirname($0))
+  dputs(3){"Directory is #{dir}, searching #{name}"}
+  return File.join(dir, name) if File.exists?(File.join(dir, name))
+  return nil if File.realdirpath(dir) == '/'
+  search_up(name, File.realdirpath(File.join(dir, '..')))
+end
+
+def load_config_global(path=nil)
+  #dputs_func
+  if conf = search_up("#{$name.downcase}.conf", path)
+    dputs(3) { "Found configuration-file #{conf}" }
+    IO.readlines(conf).each { |l|
+      dputs(4) { "Reading line #{l}" }
+      next if l =~ /(^#|^\s*$)/
+      name, value =
+          case l
+            when /^\s*(.*?)="(.*?)".*$/
+              [$1, $2]
+            when /^\s*(.*?)=([^\s#]*)/
+              [$1, $2]
+            else
+              [nil, nil]
+          end
+      if name && value
+        dputs(3) { "Writing configuration _#{$1}_ = _#{$2}_" }
+        $config[$1.to_sym] = $2
+      end
+    }
+  end
+  unless defined?($data_dir)
+    $data_dir = $config[:DATA_DIR] || "/var/lib/#{$name.downcase}"
+    FileUtils.mkdir_p($data_dir)
+  end
+  unless defined?($config_file)
+    $config_file = File.join($data_dir, 'config.yaml')
+  end
+end
+
+def load_config_yaml(path = nil)
+  if defined?($config_file)
+    file = path ? File.join(path, $config_file) : $config_file
+    if FileTest.exist?(file)
+      File.open(file) { |f| $config.merge!(YAML::load(f).to_sym) }
+    end
+  end
 end
-$name = $0.match(/.*?([^\/]*).rb/)[1]
 
 def get_config(default, *path)
   get_config_rec(path, default)
@@ -39,4 +88,5 @@ def set_config(value, *path)
   end
 end
 
-defined?(CONFIG_FILE) and dputs(2) { "config is #{$config.inspect} - file is #{CONFIG_FILE}" }
+load_config_global
+load_config_yaml

data/lib/qooxview/entity.rb

@@ -43,6 +43,7 @@ class Entities < RPCQooxdooService
     @null_allowed = false
     @loading = false
     @is_loaded = false
+    @dont_migrate = false
 
     if @data_class != 'Entity'
       @@all[@data_class] = self
@@ -84,6 +85,11 @@ class Entities < RPCQooxdooService
     end
   end
 
+  # Overwrites ActiveSupport load, which is not needed
+  def self.load(has_static = true)
+    Entities.method_missing(self.name).load(has_static)
+  end
+
   # Here comes the definition of the data used in that Entity. If the
   # return-value is true, the data is loaded automatically
   def setup_data
@@ -167,9 +173,9 @@ class Entities < RPCQooxdooService
   # instantiated - useful for stuff like long LDAP-lists...
   def get_data_instance(k)
     return nil if !k
-    if k.class != Fixnum
+    if k.class != Integer
       dputs(0) { 'This is very bad' }
-      dputs(0) { "value k is #{k.inspect}" }
+      dputs(0) { "value k is #{k.inspect} - #{k.class}" }
       dputs(0) { "caller-stack is #{caller}" }
       raise 'WrongIndex'
     end
@@ -246,12 +252,12 @@ class Entities < RPCQooxdooService
     end
   end
 
-  def respond_to?(cmd)
+  def respond_to?(cmd, all = false)
     dputs(5) { cmd.inspect }
     if cmd =~ /^(match_by_|search_by_|list_|listp_|value_)/
       return true
     end
-    super cmd
+    super cmd, all
   end
 
   def whoami
@@ -344,7 +350,7 @@ class Entities < RPCQooxdooService
       dputs(2) { "Erasing data of #{k}" }
       v.delete_all(local_only)
     }
-    ConfigBases.init
+    ConfigBases.init_load
   end
 
   def self.save_all()
@@ -376,6 +382,8 @@ class Entities < RPCQooxdooService
   def self.reload
     Entities.save_all
     Entities.delete_all_data(true)
+    SQLite.dbs_close_all
+    SQLite.dbs_open_load_migrate
     Entities.load_all
   end
 
@@ -445,7 +453,7 @@ class Entity
 
   alias_method :old_respond_to?, :respond_to?
 
-  def respond_to?(cmd)
+  def respond_to?(cmd, all = false)
     field = cmd.to_s
     if field == 'to_ary'
       dputs(4) { 'not responding to_ary' }
@@ -455,7 +463,7 @@ class Entity
       when /=$/
         return true
       else
-        return (@proxy.get_value(cmd) or super)
+        return (@proxy.get_value(cmd) or super(cmd, all))
     end
   end
 
@@ -574,7 +582,7 @@ class Entity
         if not raw and e
           v = @proxy.get_value(f)
 
-          if e.class == Fixnum and v and v.dtype == 'entity'
+          if e.class == Integer and v and v.dtype == 'entity'
             dputs(5) { "Getting instance for #{v.inspect}" }
             dputs(5) { "Getting instance with #{e.class} - #{e.inspect}" }
             dputs(5) { "Field = #{field}; id = #{@id}" }
@@ -602,19 +610,6 @@ class Entity
     field = field_orig.to_s
     (direct = field =~ /^_/) and field.sub!(/^_/, '')
     dputs(4) { "Direct is #{direct.inspect} for field #{field_orig.inspect}" }
-=begin
-    v = if value.is_a? Entity
-      dputs( 3 ){ "Converting #{value} to #{value.id}" }
-      value.id
-    elsif value.is_a? Array
-      dputs(3){"Storing an array #{value.inspect}"}
-      dp value.collect{|val|
-        val.is_a?( Entity ) ? val.id : val
-      }
-    else
-      value
-    end
-=end
     v = value
     dputs(4) { "Self is #{self.public_methods.sort.inspect}" }
     if (self.public_methods.index("#{field}=".to_sym)) && (not direct)