qooxview 1.9.11 → 1.9.13.pre.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c23748472d694e11be55e85c959055bd08158c5
-  data.tar.gz: 24f715cfadda8ffc48cc41f81b6e05b5890164cd
+  metadata.gz: b9dc1d652ab06b076f0a8c32b3ec1c26d7b0ebb4
+  data.tar.gz: 5dc2b0fe255e8273113bedc2a40d849fefee3b5c
 SHA512:
-  metadata.gz: a76c27f533696e75d974f9b8655c1115bea68c5c485867b75785cc0fbc0702b9366573dc043d9020223fba5f7f853220bcfc789aa82ba5868dceb9430845c971
-  data.tar.gz: 49d5c59baa85e88e0f55115517f8c19893ec3db8605b42bd14e6c55bae4124e2af0737d6381e416b8f507c464d015b3661da506fe0cc92414d79aa9846f95c13
+  metadata.gz: 805aab3ebb9df5f49ea40dabd5e40ee3aa338686ceeb9c770174716590c5de955977d9c88e423b44b4d870f524c864d6bf1df2646feac64869c19926e0a4eefd
+  data.tar.gz: 83862647d06e66de41811fb6239d84770907365c06aa863d874e94c7f1832d34660c71b30238a141f819e59821c04522ca79c5000c1ccc5d6771e7bfd8eb4ef0

data/lib/qooxview/additions.rb

@@ -21,7 +21,8 @@ class Array
   end
 
   def to_frontend(arg = nil)
-    collect { |a| a.to_frontend(arg) }.sort { |a, b| a[1]<=>b[1] }
+    collect { |a| a.to_frontend(arg) }.compact.reject{|e| e[1] == nil}.
+      sort { |a, b| a[1]<=>b[1] }
   end
 
   def to_s

data/lib/qooxview/entity.rb

@@ -31,7 +31,7 @@ class Entities < RPCQooxdooService
   def initialize
     begin
       @data_class = eval(singular(self.class.name))
-    rescue Exception => e
+    rescue Exception
       # Just in case the data-class is not created yet
       eval("class #{singular(self.class.name)} < Entity\nend", TOPLEVEL_BINDING)
       @data_class = eval(singular(self.class.name))
@@ -173,7 +173,7 @@ class Entities < RPCQooxdooService
   # instantiated - useful for stuff like long LDAP-lists...
   def get_data_instance(k)
     return nil if !k
-    if k.class != Integer
+    if k.class.to_s !~ /(Integer|Fixnum)/
       dputs(0) { 'This is very bad' }
       dputs(0) { "value k is #{k.inspect} - #{k.class}" }
       dputs(0) { "caller-stack is #{caller}" }
@@ -582,7 +582,7 @@ class Entity
         if not raw and e
           v = @proxy.get_value(f)
 
-          if e.class == Integer and v and v.dtype == 'entity'
+          if (e.class.to_s =~ /(Integer|Fixnum)/) && v && 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}" }

data/lib/qooxview/helpers/config_base.rb

@@ -150,7 +150,7 @@ class ConfigBase < Entity
   end
 
   def save_block_to_object(block, obj)
-    dputs(3) { "Pushing block #{block} to object #{obj.name}" }
+    dputs(3) { "Pushing block #{block} to object #{obj}" }
     ConfigBases.get_block_fields(block).each { |f|
       value = data_get(f)
       dputs(3) { "Setting #{f} in #{block} to #{value}" }

data/lib/qooxview/helpers/permission.rb

@@ -82,6 +82,7 @@ class Permission
   end
 
   def self.can_view( permission, view )
+    # dputs_func
     action = view.to_s.gsub( /^View\./, '' )
     dputs( 4 ){ "Does #{permission.inspect} allow to do #{action} knowing #{@@view.inspect} and #{@@parent.inspect}" }
     if not permission or permission.length == 0
@@ -89,7 +90,7 @@ class Permission
     end
 
     permission.to_a.each{|p|
-      perm_list = self.getViewParent( p )
+      perm_list = self.getViewParent( p.to_s )
       dputs( 5 ){ "p is #{p} and perm_list is #{perm_list.inspect}" }
       perm_list.each{|pl|
         type, data = pl.split(':')

data/lib/qooxview/storage_handler.rb

@@ -217,6 +217,7 @@ module StorageHandler
   end
 
   def create(args, allow_double = false)
+    # dputs_func
     oldload = @loading
     @loading = true
     if args.class != Hash
@@ -263,7 +264,7 @@ module StorageHandler
   end
 
   def save_data(d)
-    #dputs_func
+    # dputs_func
     dputs(5) { "Saving #{d.inspect}" }
     d.to_sym!
     if d.has_key? @data_field_id
@@ -292,6 +293,10 @@ module StorageHandler
     dputs(3) { "Deleting id #{id}" }
     @data.delete(id)
     @data_instances.delete(id)
+    @storage.each{|k, di|
+      di.delete id
+    }
+    @changed = true
   end
 
   def set_entry(id, field, v)
@@ -416,7 +421,7 @@ module StorageHandler
     @keys = {}
     @storage.each { |k, di|
       dputs(5) { "Loading #{k} at #{di.name} with #{di.inspect}" }
-      @data.merge!(di.load) { |k, o, n| o.merge(n) }
+      @data.merge!(di.load) { |_, o, n| o.merge(n) }
       dputs(5) { "Loaded #{@data.inspect} for #{self.name}" }
     }
     if @data.length == 0 && respond_to?(:init)

data/lib/qooxview/storage_type.rb

@@ -102,6 +102,9 @@ class StorageType
   # If a double-entry has been detected after creation
   def data_double( data )  
   end
+
+  def delete(id)
+  end
   
   def self.new_st( st, entity, config = {} )
     if StorageType.has? st

data/lib/qooxview/storages/csv.rb

@@ -30,7 +30,7 @@ class CSV < StorageType
   # Saves the data stored, optionally takes an index to say
   # which data needs to be saved
   def save(data)
-    #dputs_func
+    # dputs_func
     @add_only ?
         dputs(5) { "Not saving data for #{@name}" } :
         @mutex.synchronize {
@@ -54,12 +54,16 @@ class CSV < StorageType
 
             tmpfile = "#{@csv_file}_tmp"
             File.open(tmpfile, 'w') { |f|
-              data_each(data) { |d|
-                write_line(f, d)
-                if di = @entity.data_instances[d[@data_field_id]]
-                  di.changed = false
-                end
-              }
+              if data.length == 0
+                f << '{}'
+              else
+                data_each(data) { |d|
+                  write_line(f, d)
+                  if di = @entity.data_instances[d[@data_field_id]]
+                    di.changed = false
+                  end
+                }
+              end
             }
             FileUtils.mv tmpfile, @csv_file
             #%x[ sync ]
@@ -115,6 +119,7 @@ class CSV < StorageType
   # loads the data
   def load
     # Go and fetch eventual existing data from the file
+    # dputs_func
     dputs(3) { "Starting to load #{@csv_file}" }
     @mutex.synchronize {
       cleanup if Dir.glob("#{@csv_file}*").size > 1
@@ -125,6 +130,7 @@ class CSV < StorageType
           data = {}
           File.open(file, 'r').readlines().each { |l|
             dputs(5) { "Reading line #{l}" }
+            l == '{}' and next
             # Convert the keys in the lines back to Symbols
             data_parse = JSON.parse(l)
             data_csv = {}

data/lib/qooxview/storages/sqlite.rb

@@ -23,9 +23,9 @@ class SQLite < StorageType
     FileUtils.mkdir_p(@sqlite_dir)
     @name_file = name_file
     @db_file = File.join(@sqlite_dir, @name_file)
-    #    ActiveRecord::Base.logger = Logger.new('debug.log')
+    # ActiveRecord::Base.logger = Logger.new('debug.log')
     ActiveRecord::Migration.verbose = false
-    #ActiveRecord::Base.logger = Logger.new(STDERR)
+    # ActiveRecord::Base.logger = Logger.new(STDERR)
 
     @mutex_es = Mutex.new
 
@@ -66,6 +66,7 @@ class SQLite < StorageType
     @mutex_es.synchronize {
       dputs(3) { "Saving #{@entries_save.count} entries in #{@db_class}" }
       @entries_save.each_value { |v|
+        dputs(4){"Saving #{db_class} #{v.inspect} - #{v.id}"}
         v.save
       }
       @entries_save = {}
@@ -74,11 +75,12 @@ class SQLite < StorageType
 
   def set_entry(data, field, value)
     @mutex_es.synchronize {
+      # dp "#{db_class} #{data.inspect} #{field} #{value}"
       dputs(5) { "Searching id #{data.inspect}" }
       if @entries[data]
         @entries[data].save
       end
-      dat = @db_class.first(data).first
+      dat = @db_class.find(data)
       # dat = @db_class.first(:conditions => {@data_field_id => data})
       # dp @entries[data]
       # dp dat
@@ -98,6 +100,7 @@ class SQLite < StorageType
   # Each new entry is directly stored, helping somewhat if the program or the
   # computer crashes
   def data_create(data)
+    # dputs_func
     dputs(5) { "Creating early data #{data.inspect} with #{data.class}" }
     dputs(5) { "hello for #{data.inspect}" }
     dputs(5) { "db_class is #{@db_class.inspect}" }
@@ -170,6 +173,17 @@ class SQLite < StorageType
     end
   end
 
+  def delete(id)
+    entry = @db_class.find_by(id: id)
+    if entry != nil
+      entry.destroy
+      @entries[id].delete
+      if e = @entries_save[id]
+        e.delete
+      end
+    end
+  end
+
   def self.with_all_sqlites
     RPCQooxdooService.entities { |e|
       e.storage.each { |storage_name, storage_class|
@@ -204,6 +218,7 @@ class SQLite < StorageType
         e.load
         e.loading = false
         u = Users.match_by_name('local')
+        dputs(2){"User is #{u}"}
       end
     }
   end

data/lib/qooxview/view.rb

@@ -36,7 +36,7 @@ class Object
       begin
         @deep_cloning = true
         val = val.deep_clone
-      rescue TypeError
+      rescue TypeError, RuntimeError
         next
       ensure
         @deep_cloning = false
@@ -596,7 +596,7 @@ class View < RPCQooxdooService
     ret = []
     args.keys.each { |a|
       if l = layout_find(a)
-        dputs(3) { "found layout for #{a}" }
+        dputs(3) { "found layout #{l} for #{a}" }
         ret += reply(:update, a => args[a])
       end
     }
@@ -824,7 +824,7 @@ class View < RPCQooxdooService
   end
 
   # Gets the request and converts the ids of the Entites back to
-  # the objects they once were - which makes life much more easy... 
+  # the objects they once were - which makes life much more easy...
   def parse_request(method, session, params)
     #dputs_func
     dputs(3) { "Parsing #{params.inspect}" }

data/qooxview.gemspec

@@ -4,14 +4,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'qooxview'
-  spec.version       = '1.9.11'
+  spec.version = '1.9.13-10'
   spec.authors       = ['Linus Gasser']
-  spec.email         = ['ineiti@linusetviviane.ch']
+  spec.email = 'ineiti.blue'
   spec.summary       = %q{Implements a ruby-backend for QooxDoo.org}
   spec.description   = %q{This is a very simple framework to create small
   frontends in a webserver}
   spec.homepage      = 'https://github.com/ineiti/qooxview'
-  spec.license       = 'GPLv3'
+  spec.license = 'GPL-3.0'
 
   spec.files         = `if [ -d '.git' ]; then git ls-files -z; fi`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/test/entities/databases.rb

@@ -1,7 +1,7 @@
 class Movements < Entities
   def setup_data
     @default_type = :SQLite
-    
+
     value_str :desc
     value_int :money
   end

data/test/qv_sqlite.rb

@@ -70,4 +70,17 @@ class TC_SQLite < Test::Unit::TestCase
     assert_equal 300, one.money
     assert_equal 500, two.money
   end
+
+  def test_rm_add
+    dp 'deleting'
+    assert_not_equal nil, Entities.Movements.find_by_desc('pain')
+    @m2.delete
+    assert_equal nil, Entities.Movements.find_by_desc('pain')
+    Entities.delete_all_data(true)
+    Entities.load_all
+    assert_equal nil, Entities.Movements.find_by_desc('pain')
+    dp 'recreating'
+    @m2 = Entities.Movements.create( :desc => 'mappa', :money => 250 )
+    assert_equal 250, @m2.money
+  end
 end

data/test/qv_store_csv.rb

@@ -7,12 +7,12 @@ class TC_Store_CSV < Test::Unit::TestCase
 
     dputs(2) { 'Setting up data' }
     @admin = Persons.create(:first_name => 'admin', :pass => 'super123',
-                                     :address => 'cdlf 24', :credit => 10000)
+                            :address => 'cdlf 24', :credit => 10000)
     Courses.create(:first_name => 'base_1010', :start => '1.10.2010')
     @base_1011 = Courses.create(:first_name => 'base_1011', :start => '1.11.2010',
-                                         :teacher => @admin)
+                                :teacher => @admin)
     @dummies_one = Dummies.create(:first_name => 'one', :phone => '111',
-                                           :no_cache => '123')
+                                  :no_cache => '123')
     dputs(2) { 'Finished setting up data' }
   end
 
@@ -43,8 +43,8 @@ class TC_Store_CSV < Test::Unit::TestCase
 
   def test_backup_count
     (0..5).each { |i|
-      assert( get_persons_csv.size == i,
-              "We don't have #{i} files, but #{get_persons_csv.size}: #{get_persons_csv.inspect}")
+      assert(get_persons_csv.size == i,
+             "We don't have #{i} files, but #{get_persons_csv.size}: #{get_persons_csv.inspect}")
       @admin.first_name = "admin#{i}"
       Entities.save_all
     }
@@ -53,8 +53,8 @@ class TC_Store_CSV < Test::Unit::TestCase
 
   def test_dirty_data
     (0..5).each { |i|
-      assert( get_persons_csv.size == i,
-              "We don't have #{i} files, but #{get_persons_csv.size}: #{get_persons_csv.inspect}")
+      assert(get_persons_csv.size == i,
+             "We don't have #{i} files, but #{get_persons_csv.size}: #{get_persons_csv.inspect}")
       @admin.first_name = "admin#{i}"
       Entities.save_all
     }
@@ -83,4 +83,18 @@ class TC_Store_CSV < Test::Unit::TestCase
     Entities.load_all
     assert_equal 1, get_persons_csv.count, get_persons_csv
   end
+
+  def test_empty_file
+    assert_equal 1, Persons.search_all_.length
+    Entities.save_all
+
+    dputs(2) { 'deleting admin' }
+    @admin.delete
+    assert_equal 0, Persons.search_all_.length
+    Entities.save_all
+
+    dputs(2) { 'loading everything again' }
+    Entities.load_all
+    assert_equal 0, Persons.search_all_.length
+  end
 end

data/test/test.rb

@@ -23,7 +23,7 @@ QooxView.init('entities', 'views')
 
 tests = Dir.glob('qv_*.rb')
 #tests = %w( permission )
-#tests = %w( entity )
+#tests = %w( store_csv )
 #tests = %w( configbase )
 
 tests.each { |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qooxview
 version: !ruby/object:Gem::Version
-  version: 1.9.11
+  version: 1.9.13.pre.10
 platform: ruby
 authors:
 - Linus Gasser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: helper_classes
@@ -349,15 +349,13 @@ dependencies:
 description: |-
   This is a very simple framework to create small
     frontends in a webserver
-email:
-- ineiti@linusetviviane.ch
+email: ineiti.blue
 executables:
 - test_ldap.rb
 extensions: []
 extra_rdoc_files: []
 files:
 - ".project"
-- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -967,7 +965,7 @@ files:
 - test/views/print.rb
 homepage: https://github.com/ineiti/qooxview
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -980,12 +978,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Implements a ruby-backend for QooxDoo.org

data/.ruby-version

@@ -1 +0,0 @@
-2.4.1