clevic 0.11.1 → 0.12.0

data/History.txt

@@ -1,3 +1,24 @@
+== 0.12.0
+* fix some breakage from Qt-4.5.x
+* paste single value to multiple cells
+* text field for multiline text editing
+* fields now receive notify_data_changed. Clevic::View still receives it
+  but by default passes the notification to the fields.
+* add Clevic::TableModel#data_changed because the Qt dataChanged forced severe
+  clunkiness defining new ModelIndex instances.
+* Ctrl-S now saves current row. Display doesn't always update immediately though.
+* add timestamp to types recognised as dates/times
+* move field_column from Clevic::TableView to Clevic::TableModel
+* Decimal fields now accept more variations - ',' as thousands separators
+  is stripped out and a space can be used instead of a decimal point. No
+  explicit internationalised decimal formats though.
+* fix some weirdness with filtering
+* fields now take an id property. So one field in the db can be displayed
+  in several UI fields.
+* fields can take default values in the UI definition
+* save records after cell contents deleted
+* various other bug fixes
+
 == 0.11.1
 * Define views in separate classes (subclass of Clevic::View) while
 	maintaining view definition inside the ActiveRecord::Base subclass.

data/Manifest.txt

@@ -4,8 +4,6 @@ README.txt
 Rakefile
 TODO
 bin/clevic
-config/hoe.rb
-config/requirements.rb
 lib/clevic/dirty.rb
 lib/clevic.rb
 lib/clevic/browser.rb
@@ -15,6 +13,7 @@ lib/clevic/default_view.rb
 lib/clevic/delegates.rb
 lib/clevic/extensions.rb
 lib/clevic/field.rb
+lib/clevic/filter_command.rb
 lib/clevic/item_delegate.rb
 lib/clevic/model_builder.rb
 lib/clevic/model_column.rb
@@ -25,6 +24,7 @@ lib/clevic/sql_dialects.rb
 lib/clevic/table_model.rb
 lib/clevic/table_searcher.rb
 lib/clevic/table_view.rb
+lib/clevic/text_delegate.rb
 lib/clevic/view.rb
 lib/clevic/ui/.gitignore
 lib/clevic/ui/browser.ui
@@ -46,6 +46,8 @@ sql/accounts.sql
 sql/times.sql
 sql/times_sqlite.sql
 tasks/website.rake
+tasks/clevic.rake
+tasks/rdoc.rake
 test/test_cache_table.rb
 test/test_helper.rb
 test/test_model_index_extensions.rb

data/Rakefile

@@ -1,143 +1,36 @@
-require 'rubygems'
-require 'rake/clean'
-require 'hoe'
-require 'pathname'
-
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
-
-Dir['tasks/**/*.rake'].each { |rake| load rake }
-
-# generate a _ui.rb filename from a .ui filename
-def ui_rb_file( ui_file )
-  ui_file.gsub( /\.ui$/, '_ui.rb' )
-end
-
-# list of .ui files
-UI_FILES = FileList.new( 'lib/clevic/ui/*.ui' )
-CLEAN.include( 'ChangeLog', 'coverage', 'profiling' )
-CLOBBER.include( 'ChangeLog', 'pkg', 'lib/clevic/ui/*_ui.rb' )
-
-UI_FILES.each do |ui_file|
-  # make tasks to generate _ui.rb files
-  file ui_rb_file( ui_file ) => [ ui_file ] do |t|
-    sh "rbuic4 #{t.prerequisites} -o #{t.name}" 
-  end
-  
-  # make tasks to start designer when the ui file is named
-  desc "Start Qt designer with #{ui_file}"
-  namespace :ui do |n|
-    task Pathname.new(ui_file).basename.to_s.ext do |t|
-      sh "designer #{ui_file}"
-    end
-  end
-end
-
-desc 'Generate all _ui.rb files'
-task :ui => UI_FILES.map{|x| ui_rb_file( x ) }
-
-namespace :ui do
-  desc 'Start Qt designer with the argument, or all .ui files.'
-  task :design do |t|
-    ARGV.shift()
-    if ARGV.size == 0
-      # start designer with all ui files
-      sh "designer #{UI_FILES.join(' ')}"
-    else
-      # start designer with all files that match an argument
-      sh "designer #{ ARGV.map{|x| UI_FILES.grep( /\/#{x}/ ) }.join(' ') }"
-    end
-    true
-  end
-end
-
-desc "Runs Clevic in normal mode, with live database."
-task :run => :ui do |t|
-  ARGV.shift()
-  exec "ruby -Ilib bin/clevic #{ARGV.join(' ')}"
-end
-
-desc "Runs Clevic in debug mode, with test databases"
-task :debug => :ui do |t|
-  ARGV.shift()
-  exec "ruby -w -rdebug -Ilib bin/clevic -D #{ARGV.join(' ')}"
-end
-
-desc "irb in this project's context"
-task :irb do |t|
-  ARGV.shift()
-  ENV['RUBYLIB'] ||= ''
-  ENV['RUBYLIB'] += ":#{File.expand_path('.')}/lib"
-  exec "irb -Ilib -rclevic"
-end
-
-# generate tasks for all model definition files
-MODELS_LIST = FileList.new( '**/*models.rb' )
-
-def short_model( model_file )
-  Pathname.new( model_file ).basename.to_s.gsub( /_models.rb/, '' )
-end
-
-MODELS_LIST.each do |model_file|
-  # generate irb contexts
-  desc "irb with #{model_file}"
-  namespace :irb do
-    task short_model( model_file ) do |t|
-      ARGV.shift()
-      ARGV.shift() if ARGV[0] == '--'
-      ENV['RUBYLIB'] ||= '.'
-      ENV['RUBYLIB'] += ":#{File.expand_path('.')}/lib"
-      exec "irb -Ilib -rclevic -r#{model_file} -rclevic/db_options.rb"
-    end
-  end
+%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
+require File.dirname(__FILE__) + '/lib/clevic/version.rb'
+
+# Generate all the Rake tasks
+# Run 'rake -T' to see list of generated tasks (from gem root directory)
+$hoe = Hoe.new('clevic', Clevic::VERSION::STRING) do |p|
+  p.developer('John Anderson', 'panic@semiosix.com')
+  p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")
+  p.rubyforge_name       = p.name # TODO this is default value
+  p.description          = "SQL table GUI with Qt"
+  p.extra_deps         = [
+    ['activesupport','>= 2.0.2'],
+    ['qtext', '>=0.6.5'],
+    ['activerecord', '>=2.0.2'],
+    ['fastercsv', '>=1.2.3'],
+    ['gather', '>=0.0.4'],
+    ['facets', '>=2.4.1']
+    # This isn't always installed from gems
+    #~ ['qtruby4', '>=1.4.9']
+    # bsearch can't be installed from gems
+  ]
+  p.extra_dev_deps = [
+    ['newgem', ">= #{::Newgem::VERSION}"]
+  ]
   
-  # generate runs
-  namespace :run do
-    desc "run clevic with #{model_file}"
-    task short_model( model_file )  => :ui do |t|
-      ARGV.shift()
-      ARGV.shift() if ARGV[0] == '--'
-      cmd = "ruby -Ilib bin/clevic -D #{model_file} #{ARGV.join(' ')}"
-      puts "cmd: #{cmd.inspect}"
-      exec cmd
-    end
-  end
-
-  namespace :warn do
-    desc "run clevic with #{model_file} and warnings on"
-    task short_model( model_file )  => :ui do |t|
-      ARGV.shift()
-      exec "ruby -w -Ilib bin/clevic -D #{model_file} #{ARGV.join(' ')}"
-    end
-  end
-end
-
-task :package => :ui
-
-desc "Update ChangeLog from the SVN log"
-task :changelog do |t|
-  ARGV.shift
-  exec "svn2cl --break-before-msg -o ChangeLog #{ARGV.join(' ')}"
+  p.clean_globs |= %w[**/.DS_Store tmp *.log]
+  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
+  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
+  p.rsync_args = '-av --delete --ignore-errors'
 end
 
-# remove hoe documentation task
-Rake::Task['docs'].clear
+require 'newgem/tasks' # load /tasks/*.rake
+Dir['tasks/**/*.rake'].each { |t| load t }
 
-# make this respond to docs, so it fits in with the rest of the build
-Rake::RDocTask.new do |rdoc|
-  rdoc.name = :docs
-  rdoc.title = "Clevic DB UI builder"
-  rdoc.main = 'README.txt'
-  rdoc.rdoc_dir = 'doc'
-  rdoc.rdoc_files.include %w{History.txt lib/**/*.rb README.txt TODO}
-  rdoc.options += [
-      '-SHN',
-      '-f', 'darkfish',  # This is the important bit
-      '-A', 'property=Property',
-      #~ '--quiet',
-      "--opname=index.html",
-      #~ "--line-numbers",
-      #~ '--format=darkfish',
-      #~ "--inline-source"
-    ]
-end
+# TODO - want other tests/tasks run by default? Add them to the list
+# task :default => [:spec, :features]

data/TODO

@@ -1,14 +1,19 @@
-need a :name specified for Field that defaults to the attribute name
-allow directories for a setup.
-implement the :default field option
-ModelBuilder#modify_field to override default_ui definitions
-rename ModelBuilder to ViewBuilder?
+relational_delegate not used?
+cut'n'paste in text/plain, text/csv, text/yml and application/clevic
+HasFinder gem for complex reusable sql
+provide for easier directories for a setup.
+ModelBuilder#modify_field to override default_ui definitions. Or a better way to reuse field definitions.
+use rubigen for creating model definition files?
+undoable_command signal for delegates
 
-need a text field (multiple lines, edit in a separate window)
 need a map field (For ie -1 = short, 1 = long). Already in restricted, but it's kinda clunky.
 :records missing in define_ui causes a crash
+:records must take a NamedScope
+
+Add additional :filter record sets that can be selected from menus?
+
+filter and search by virtual fields
 
-:display and :format in ModelBuilder
 tests. Use ZenTest to generate tests
 Check out ar-extensions. Like operators look nice.
 make sure ActiveRecord doesn't keep updating column definitions. ie production mode.
@@ -122,7 +127,6 @@ maybe
 acts_as_shellable looks nice
 consolidate read-only-ness checks 
 Look at DataMapper. Not suitable - need to declare properties.
-use rubigen for creating model definition files?
 ActiveMDB for migrating?
 allow moving of rows
 discontiguous copying of entities/csv
@@ -140,10 +144,3 @@ QueryBuilder
 Accounts
 --------
 paste of "common" records with different dates
-
-Times
------
-
-Ctrl-Shift-" should not copy date if it already exists, and should not copy time if it's a different date.
-Ctrl-Shift-" after it's done, tab doesn't change fields
-look up invoice for project leaves the wrong fields highlighted, and focus in the wrong field.

data/bin/clevic

@@ -26,6 +26,11 @@ oparser.on( '-t', '--table TABLE', 'Table to display', String ) { |o| $options[:
 oparser.on( '-d', '--database DATABASE', 'Database name', String ) { |o| $options[:database] = o }
 oparser.on( '-D', '--debug' ) { |o| $options[:debug] = true }
 oparser.on( '-v', '--verbose' ) { |o| $options[:verbose] = true }
+oparser.on( '-V', '--version' ) do
+  require 'clevic/version.rb'
+  puts "clevic-#{Clevic::VERSION::STRING}"
+  exit 0
+end
 oparser.on( '-h', '-?', '--help' ) do |o|
   puts oparser.to_s
   exit( 1 )

data/lib/clevic/browser.rb

@@ -169,7 +169,7 @@ class Browser < Qt::Widget
   
   # make sure all outstanding records are saved
   def save_all
-    tables_tab.each {|x| x.save_row( x.current_index ) }
+    tables_tab.tabs.each {|x| x.save_row( x.current_index ) }
   end
 end
 

data/lib/clevic/cache_table.rb

@@ -49,7 +49,7 @@ class CacheTable < Array
   # The count of the records according to the db, which may be different to
   # the records in the cache
   def sql_count
-    @entity_class.count( @options.reject{|k,v| k == :order} )
+    entity_class.count( options.reject{|k,v| k == :order} )
   end
   
   # Return the set of OrderAttribute objects for this collection.
@@ -63,26 +63,22 @@ class CacheTable < Array
       # add the primary key if nothing is specified
       # because we need an ordering of some kind otherwise
       # index_for_entity will not work
-      if !@order_attributes.any? {|x| x.attribute == @entity_class.primary_key }
-        @order_attributes << OrderAttribute.new( @entity_class, @entity_class.primary_key )
+      if !@order_attributes.any? {|x| x.attribute == entity_class.primary_key }
+        @order_attributes << OrderAttribute.new( entity_class, entity_class.primary_key )
       end
     end
     @order_attributes
   end
   
   # add an id to options[:order] if it's not in there
-  # also create @order_attributes, and @auto_new
+  # also create @order_attributes
   def sanitise_options!
-    # save this for later
-    @auto_new = @options[:auto_new]
-    @options.delete :auto_new
-    
-    # make sure we have a string here
-    @options[:order] ||= ''
+    # make sure we have a string here, even if it's blank
+    options[:order] ||= ''
     
     # recreate the options[:order] entry to include default
-    # TODO why though?
-    @options[:order] = order_attributes.map{|x| x.to_sql}.join(',')
+    # TODO why though? Can't remember
+    options[:order] = order_attributes.map{|x| x.to_sql}.join(',')
   end
 
   # Execute the block with the specified preload_count,
@@ -104,7 +100,7 @@ class CacheTable < Array
     offset = index < 0 ? index + @row_count : index
     
     # fetch self.preload_count records
-    records = @entity_class.find( :all, @options.merge( :offset => offset, :limit => preload_count ) )
+    records = entity_class.find( :all, options.merge( :offset => offset, :limit => preload_count ) )
     records.each_with_index {|x,i| self[i+index] = x if !cached_at?( i+index )}
     
     # return the first one
@@ -118,10 +114,11 @@ class CacheTable < Array
   end
   
   # make a new instance that has the attributes of this one, but an empty
-  # data set. pass in ActiveRecord options to filter
-  def renew( options = {} )
+  # data set. pass in ActiveRecord options to filter.
+  # TODO using named scopes might make filtering easier.
+  def renew( args = nil )
     clear
-    self.class.new( @entity_class, @options.merge( options ) )
+    self.class.new( entity_class, args || options )
   end
   
   # find the index for the given entity, using a binary search algorithm (bsearch).
@@ -129,8 +126,7 @@ class CacheTable < Array
   # 0 is returned if the entity is nil
   # nil is returned if the array is empty
   def index_for_entity( entity )
-    return nil if size == 0
-    return nil if entity.nil?
+    return nil if size == 0 || entity.nil?
     
     # only load one record at a time, because mostly we only
     # need one for the binary seach. No point in pulling several out.
@@ -165,24 +161,9 @@ class CacheTable < Array
     end
   end
   
-  def auto_new?
-    @auto_new
-  end
-  
   def search( field, search_criteria, start_entity )
     Clevic::TableSearcher.new( entity_class, order_attributes, search_criteria, field ).search( start_entity )
   end
-
-  # delete the given index. If the size ends up as 0,
-  # make sure there's always at least one empty record
-  def delete_at( index )
-    retval = super
-    if self.size == 0 && auto_new?
-      self << @entity_class.new
-    end
-    retval
-  end
-  
 end
 
 # This is part of Array in case the programmer wants to use
@@ -193,7 +174,7 @@ class Array
     !at(index).nil?
   end
   
-  def searcher
+  def search
     raise "not implemented"
   end
 end

data/lib/clevic/default_view.rb

@@ -41,6 +41,8 @@ module Clevic
         entity_class.actions( table_view, action_builder )
       elsif entity_class.respond_to?( :define_actions )
         entity_class.define_actions( table_view, action_builder )
+      else
+        super
       end
     end
     
@@ -50,6 +52,8 @@ module Clevic
         entity_class.data_changed( top_left_model_index, bottom_right_model_index, table_view )
       elsif entity_class.respond_to?( :notify_data_changed )
         entity_class.notify_data_changed( table_view, top_left_model_index, bottom_right_model_index )
+      else
+        super
       end
     end
     
@@ -59,6 +63,8 @@ module Clevic
         entity_class.key_press_event( key_press_event, current_model_index, table_view )
       elsif entity_class.respond_to?( :notify_key_press )
         entity_class.notify_key_press( table_view, key_press_event, current_model_index )
+      else
+        super
       end
     end
   end

data/lib/clevic/delegates.rb

@@ -96,6 +96,12 @@ class ComboDelegate < Clevic::ItemDelegate
       editor.add_item( model_index.gui_value, model_index.gui_value.to_variant )
     end
   end
+
+  def add_nil_item( editor )
+    if ( editor.find_data( nil.to_variant ) == -1 )
+      editor.add_item( '', nil.to_variant )
+    end
+  end
   
   # Override the Qt method. Create a ComboBox widget and fill it with the possible values.
   def createEditor( parent_widget, style_option_view_item, model_index )
@@ -109,11 +115,7 @@ class ComboDelegate < Clevic::ItemDelegate
       populate_current( @editor, model_index )
       
       # create a nil entry
-      if allow_null?
-        if ( @editor.find_data( nil.to_variant ) == -1 )
-          @editor.add_item( '', nil.to_variant )
-        end
-      end
+      add_nil_item( @editor ) if allow_null?
       
       # allow prefix matching from the keyboard
       @editor.editable = true
@@ -156,13 +158,14 @@ class ComboDelegate < Clevic::ItemDelegate
   # stored in an underlying model. Intended to be overridden by subclasses.
   def translate_from_editor_text( editor, text )
     index = editor.find_text( text )
+    
     if index == -1
       text unless restricted?
     else
       editor.item_data( index ).value
     end
   end
-
+  
   # Send the data from the editor to the model. The data will
   # be translated by translate_from_editor_text,
   def setModelData( editor, abstract_item_model, model_index )
@@ -187,7 +190,7 @@ class ComboDelegate < Clevic::ItemDelegate
     else
       model_index.attribute_value = editor.text
     end
-    emit abstract_item_model.dataChanged( model_index, model_index )
+    abstract_item_model.data_changed( model_index )
   end
 
 end
@@ -242,7 +245,6 @@ class DistinctDelegate < ComboDelegate
       else
         query_order_frequency( conn, model_index )
     end
-    puts "query: #{query}"
     rs = conn.execute( query )
     rs.each do |row|
       value = row[attribute.to_s]
@@ -255,8 +257,9 @@ class DistinctDelegate < ComboDelegate
   end
 end
 
-# A Combo box which only allows a restricted set of value to be entered.
-class RestrictedDelegate < ComboDelegate
+# A Combo box which allows a set of values. May or may not
+# be restricted to the set.
+class SetDelegate < ComboDelegate
   # options must contain a :set => [ ... ] to specify the set of values.
   def initialize( parent, field )
     raise "RestrictedDelegate must have a :set in options" if field.set.nil?
@@ -268,13 +271,13 @@ class RestrictedDelegate < ComboDelegate
   end
   
   def restricted?
-    true
+    field.restricted || false
   end
   
   def populate( editor, model_index )
-    field.set.each do |item|
+    field.set_for( model_index.entity ).each do |item|
       if item.is_a?( Array )
-        # this is a hash, so use key as db value
+        # this is a hash-like set, so use key as db value
         # and value as display value
         editor.add_item( item.last, item.first.to_variant )
       else
@@ -282,12 +285,15 @@ class RestrictedDelegate < ComboDelegate
       end
     end
   end
-
-  #~ def translate_from_editor_text( editor, text )
-    #~ item_index = editor.find_text( text )
-    #~ item_data = editor.item_data( item_index )
-    #~ item_data.to_int
-  #~ end
+  
+  def createEditor( parent_widget, style_option_view_item, model_index )
+    editor = super
+    
+    # the set is provided, so never insert things
+    editor.insert_policy = Qt::ComboBox::NoInsert
+    editor
+  end
+    
 end
 
 # Edit a relation from an id and display a list of relevant entries.