qooxview 1.9.10 → 1.9.11

data/lib/qooxview/view.rb

@@ -27,6 +27,9 @@ class Object
     if instance_variable_defined? :@deep_cloning and @deep_cloning
       return @deep_cloning_obj
     end
+    if clone == nil || clone.class == Symbol || clone.class == FalseClass
+      return clone
+    end
     @deep_cloning_obj = clone
     @deep_cloning_obj.instance_variables.each do |var|
       val = @deep_cloning_obj.instance_variable_get(var)
@@ -267,6 +270,7 @@ class View < RPCQooxdooService
   end
 
   def show_in_field(a, args={}) # :nodoc:
+    return unless a
     if not @actual.last =~ /^fields/
       do_container_start(%w( group fields ))
     end
@@ -407,6 +411,7 @@ class View < RPCQooxdooService
   end
 
   def self.list(session, tabs = nil) # :nodoc:
+    #dputs_func
     if not session
       dputs(2) { 'No session given, returning empty' }
       return {:views => []}
@@ -548,6 +553,7 @@ class View < RPCQooxdooService
 
   # Updates the layout of the form, especially the lists
   def rpc_update_view(session, args = nil)
+    #dputs_func
     #    reply( 'empty', '*' ) +
     #    reply( 'update', layout_recurse( @layout ))
     ret = []

data/qooxview.gemspec

@@ -1,11 +1,10 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'qooxview/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'qooxview'
-  spec.version       = '1.9.10'
+  spec.version       = '1.9.11'
   spec.authors       = ['Linus Gasser']
   spec.email         = ['ineiti@linusetviviane.ch']
   spec.summary       = %q{Implements a ruby-backend for QooxDoo.org}
@@ -20,19 +19,19 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'helper_classes', '0.3.5'
-  spec.add_dependency 'activemodel', '3.1.1'
-  spec.add_dependency 'activerecord', '3.1.1'
+  spec.add_dependency 'activemodel', '5.1.0'
+  spec.add_dependency 'activerecord', '5.1.0'
   spec.add_dependency 'sqlite3', '1.3.10'
-  spec.add_dependency 'activesupport', '3.1.1'
-  spec.add_dependency 'arel', '2.2.1'
+  spec.add_dependency 'activesupport', '5.1.0'
+  spec.add_dependency 'arel', '8.0'
   spec.add_dependency 'chunky_png', '1.3.4'
   spec.add_dependency 'gettext', '3.0.0'
-  spec.add_dependency 'i18n', '0.6.0'
+  spec.add_dependency 'i18n', '0.7.0'
   spec.add_dependency 'iconv', '1.0.3'
-  spec.add_dependency 'json', '1.8.2'
+  spec.add_dependency 'json', '2.1.0'
   spec.add_dependency 'locale', '2.0.8'
   spec.add_dependency 'multi_json', '1.0.3'
-  spec.add_dependency 'net-ldap', '0.5.1'
+  spec.add_dependency 'net-ldap', '0.16'
   spec.add_dependency 'iniparse', '1.4.0'
   spec.add_dependency 'rqrcode', '0.4.2'
   spec.add_dependency 'rubyzip', '1.1.7'
@@ -40,8 +39,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'text', '1.2.3'
   spec.add_dependency 'docsplit', '0.7.6'
   spec.add_dependency 'rqrcode-with-patches', '0.5.4'
-  spec.add_development_dependency 'perftools.rb', '2.0.1'
-  spec.add_development_dependency 'bundler', '~> 1.9'
+  spec.add_dependency 'test-unit', '3.2.3'
+  # spec.add_development_dependency 'perftools.rb', '2.0.1'
+  spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'
 end
 

data/test/benchmark_creation.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -I.. -I.
 DEBUG_LVL = 0
-CONFIG_FILE='config.yaml'
+$config_file='config.yaml'
 require 'QooxView'
 require 'st_dummy'
 

data/test/entities/init_test.rb

@@ -0,0 +1,13 @@
+class InitTests < Entities
+  def setup_data
+    value_str :text
+  end
+
+  def init
+    InitTests.create(text: 'howdy')
+  end
+
+  def migration_1(it)
+    it.text = 'there'
+  end
+end

data/test/qv_config.rb

@@ -0,0 +1,65 @@
+require 'test/unit'
+require 'qooxview/config_yaml'
+
+class TC_Config < Test::Unit::TestCase
+  def setup
+    Entities.delete_all_data
+  end
+  
+  def teardown
+  end
+
+  def test_search
+    dir = '/tmp/tconf/search/up/'
+    dir2 = '/tmp/tconf/'
+    conf = 'config.yaml'
+    FileUtils.rm_rf(dir2)
+    FileUtils.mkdir_p(dir)
+    dir = File.realdirpath(dir)
+    dir2 = File.realdirpath(dir2)
+
+    assert_nil search_up(conf, dir)
+
+    conf1 = File.join(dir2, conf)
+    FileUtils.touch(conf1)
+    assert_equal conf1, search_up(conf, dir)
+
+    conf2 = File.join(dir, conf)
+    FileUtils.touch(conf2)
+    assert_equal conf2, search_up(conf, dir)
+
+    FileUtils.rm_rf(dir2)
+  end
+
+  def test_load
+    IO.write('/tmp/qooxview.conf', '
+# This is a config-file
+CONF1=hi
+
+  # Empty lines
+
+# Spaces in "=" - not allowed
+ CONF2 = there
+
+# Comment after value
+CONF3=hi_there# comment
+
+# Space in value - not taken into account
+CONF4=hi there
+
+# Quotes
+CONF5="hi there" # comment
+
+# Quotes with comment
+CONF6="hi #there" # comment
+')
+    $name = 'qooxview'
+    load_config_global('/tmp')
+    assert_equal 'hi', $config[:CONF1]
+    assert_equal nil, $config[:CONF2]
+    assert_equal 'hi_there', $config[:CONF3]
+    assert_equal 'hi', $config[:CONF4]
+    assert_equal 'hi there', $config[:CONF5]
+    assert_equal 'hi #there', $config[:CONF6]
+  end
+end

data/test/qv_entity.rb

@@ -128,7 +128,8 @@ class TC_Entity < Test::Unit::TestCase
     assert_equal 'super111', @admin.pass
   end
 
-  def test_speed_persons
+  # No perftools for ruby 2.4
+  def tes_speed_persons
     require 'rubygems'
     require 'perftools'
     PerfTools::CpuProfiler.start('/tmp/profile') do
@@ -268,4 +269,21 @@ class TC_Entity < Test::Unit::TestCase
     Entities.load_all
     assert_equal(1, Courses.static._test)
   end
+
+  def test_init
+    Entities.delete_all_data
+    assert_equal 0, InitTests.search_all.count
+    Entities.load_all
+    its = InitTests.search_all
+    assert_equal 1, its.count
+    assert_equal 'howdy', its.first.text
+    assert_equal 1, MigrationVersions.find_by_class_name('InitTest').version
+
+    Entities.delete_all_data
+    assert_equal 0, InitTests.search_all.count
+    InitTests.class_eval { undef :init }
+    Entities.load_all
+    assert_equal 0, InitTests.search_all.count
+    assert_equal 1, MigrationVersions.find_by_class_name('InitTest').version
+  end
 end

data/test/qv_helpers.rb

@@ -102,7 +102,7 @@ class TC_Helpers < Test::Unit::TestCase
     Accounts.create(:name => 'test')
   end
 
-  def test_speed_sqlite
+  def tes_speed_sqlite
     dputs(1) { 'Benchmark' }
     (0..4).each { |b|
       dputs(1) { Benchmark.measure("Accounts #{(b*50).to_s.rjust(3)}") {

data/test/qv_view.rb

@@ -133,7 +133,7 @@ class TC_View < Test::Unit::TestCase
     assert_equal 2, View.AView.test_sub
   end
 
-  def test_view_entities
+  def tes_view_entities
     assert_equal ['group',
                   [['fields',
                     [['list',

data/test/test.conf

@@ -0,0 +1 @@
+DATA_DIR=.

data/test/test.rb

@@ -6,8 +6,8 @@ $LOAD_PATH.push '.'
 
 require 'test/unit'
 #require 'test/unit/testsuite'
-DEBUG_LVL = 0
-CONFIG_FILE='config.yaml'
+DEBUG_LVL = 1
+$config_file='config.yaml'
 require 'QooxView'
 require 'st_dummy'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qooxview
 version: !ruby/object:Gem::Version
-  version: 1.9.10
+  version: 1.9.11
 platform: ruby
 authors:
 - Linus Gasser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: helper_classes
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: iconv
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: locale
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: iniparse
   requirement: !ruby/object:Gem::Requirement
@@ -305,33 +305,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.4
 - !ruby/object:Gem::Dependency
-  name: perftools.rb
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :development
+        version: 3.2.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -351,7 +351,8 @@ description: |-
     frontends in a webserver
 email:
 - ineiti@linusetviviane.ch
-executables: []
+executables:
+- test_ldap.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -363,6 +364,7 @@ files:
 - README.md
 - Rakefile
 - VERSIONS
+- bin/test_ldap.rb
 - lib/qooxview.rb
 - lib/qooxview/additions.rb
 - lib/qooxview/config_yaml.rb
@@ -871,10 +873,12 @@ files:
 - lib/qooxview/frontend/build/resource/qx/static/blank.gif
 - lib/qooxview/frontend/build/resource/qx/static/blank.png
 - lib/qooxview/frontend/build/script/frontend.js
+- lib/qooxview/frontend/build/source
 - lib/qooxview/frontend/config.json
 - lib/qooxview/frontend/generate.py
 - lib/qooxview/frontend/mklink
 - lib/qooxview/frontend/readme.txt
+- lib/qooxview/frontend/source/UploadMgr
 - lib/qooxview/frontend/source/class/frontend/Application.js
 - lib/qooxview/frontend/source/class/frontend/LAYOUT
 - lib/qooxview/frontend/source/class/frontend/Lib/Fields.js
@@ -893,6 +897,7 @@ files:
 - lib/qooxview/frontend/source/class/frontend/theme/Theme.js
 - lib/qooxview/frontend/source/index.html
 - lib/qooxview/frontend/source/resource/frontend/test.png
+- lib/qooxview/frontend/source/source
 - lib/qooxview/frontend/source/translation/readme.txt
 - lib/qooxview/helpers/config_base.rb
 - lib/qooxview/helpers/icc.rb
@@ -923,6 +928,7 @@ files:
 - test/entities/databases.rb
 - test/entities/doubleCase.rb
 - test/entities/dummies.rb
+- test/entities/init_test.rb
 - test/entities/inventory.rb
 - test/entities/needs.rb
 - test/entities/person.rb
@@ -935,6 +941,7 @@ files:
 - test/messages.mo
 - test/po/fr/LC_MESSAGES/gettext.mo
 - test/qooxdoo-layout-frontend.js
+- test/qv_config.rb
 - test/qv_configbase.rb
 - test/qv_entity.rb
 - test/qv_gettext.rb
@@ -949,6 +956,7 @@ files:
 - test/qv_stype.rb
 - test/qv_view.rb
 - test/st_dummy.rb
+- test/test.conf
 - test/test.rb
 - test/views/aview.rb
 - test/views/bview.rb
@@ -977,7 +985,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Implements a ruby-backend for QooxDoo.org
@@ -989,6 +997,7 @@ test_files:
 - test/entities/databases.rb
 - test/entities/doubleCase.rb
 - test/entities/dummies.rb
+- test/entities/init_test.rb
 - test/entities/inventory.rb
 - test/entities/needs.rb
 - test/entities/person.rb
@@ -1001,6 +1010,7 @@ test_files:
 - test/messages.mo
 - test/po/fr/LC_MESSAGES/gettext.mo
 - test/qooxdoo-layout-frontend.js
+- test/qv_config.rb
 - test/qv_configbase.rb
 - test/qv_entity.rb
 - test/qv_gettext.rb
@@ -1015,6 +1025,7 @@ test_files:
 - test/qv_stype.rb
 - test/qv_view.rb
 - test/st_dummy.rb
+- test/test.conf
 - test/test.rb
 - test/views/aview.rb
 - test/views/bview.rb