clevic 0.12.0 → 0.13.0.b1

data/History.txt

@@ -1,3 +1,13 @@
+== 0.13.0
+* Now has Java Swing support with JRuby
+* new code works with qt4-qtruby-2.0.3
+* All models must now use Sequel. There is some code to ease porting
+  from ActiveRecord
+* preliminary and not yet working support for one_to_many fields in the UI
+  
+== 0.12.3
+* fix closeEditor not moving to the cursor to the correct place
+
 == 0.12.0
 * fix some breakage from Qt-4.5.x
 * paste single value to multiple cells

data/Manifest.txt

@@ -4,38 +4,10 @@ README.txt
 Rakefile
 TODO
 bin/clevic
-lib/clevic/dirty.rb
-lib/clevic.rb
-lib/clevic/browser.rb
-lib/clevic/cache_table.rb
-lib/clevic/db_options.rb
-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
-lib/clevic/order_attribute.rb
-lib/clevic/record.rb
-lib/clevic/search_dialog.rb
-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
-lib/clevic/ui/browser_ui.rb
-lib/clevic/ui/icon.png
-lib/clevic/ui/search_dialog.ui
-lib/clevic/ui/search_dialog_ui.rb
-lib/clevic/version.rb
 models/accounts_models.rb
 models/minimal_models.rb
 models/times_models.rb
+models/times_psql_models.rb
 models/times_sqlite_models.rb
 models/values_models.rb
 script/console
@@ -45,12 +17,219 @@ script/txt2html
 sql/accounts.sql
 sql/times.sql
 sql/times_sqlite.sql
-tasks/website.rake
 tasks/clevic.rake
 tasks/rdoc.rake
+tasks/website.rake
 test/test_cache_table.rb
 test/test_helper.rb
 test/test_model_index_extensions.rb
 test/test_order_attribute.rb
 test/test_sql_dialects.rb
+test/test_table_model.rb
 test/test_table_searcher.rb
+lib/clevic/qt/ui/browser.ui
+lib/clevic/qt/ui/search_dialog_ui.rb
+lib/clevic/qt/ui/search_dialog.ui
+lib/clevic/qt/ui/browser_ui.rb
+lib/clevic/qt/table_model.rb
+lib/clevic/qt/text_area_delegate.rb
+lib/clevic/qt/browser.rb
+lib/clevic/qt/action_builder.rb
+lib/clevic/qt/field.rb
+lib/clevic/qt/set_delegate.rb
+lib/clevic/qt/item_delegate.rb
+lib/clevic/qt/clipboard.rb
+lib/clevic/qt/text_delegate.rb
+lib/clevic/qt/distinct_delegate.rb
+lib/clevic/qt/boolean_delegate.rb
+lib/clevic/qt/table_view.rb
+lib/clevic/qt/search_dialog.rb
+lib/clevic/qt/combo_delegate.rb
+lib/clevic/qt/extensions.rb
+lib/clevic/qt/delegates.rb
+lib/clevic/qt/relational_delegate.rb
+lib/clevic/table_view_paste.rb
+lib/clevic/sequel_ar_adapter.rb
+lib/clevic/model_builder.rb
+lib/clevic/rails_models_loaders.rb
+lib/clevic/sequel_length_validation.rb
+lib/clevic/cache_table.rb
+lib/clevic/table_model.rb
+lib/clevic/icons
+lib/clevic/icons/icon.png
+lib/clevic/qt.rb
+lib/clevic/swing
+lib/clevic/swing/ui
+lib/clevic/swing/ui/src
+lib/clevic/swing/ui/src/SearchDialog.form
+lib/clevic/swing/ui/src/SearchDialog.java
+lib/clevic/swing/ui/src/resources
+lib/clevic/swing/ui/src/resources/SearchDialog.properties
+lib/clevic/swing/ui/src/TagEditor.form
+lib/clevic/swing/ui/src/TagEditor.java
+lib/clevic/swing/ui/dist
+lib/clevic/swing/ui/dist/lib
+lib/clevic/swing/ui/dist/lib/swing-layout-1.0.3.jar
+lib/clevic/swing/ui/dist/README.TXT
+lib/clevic/swing/ui/nbproject
+lib/clevic/swing/ui/nbproject/genfiles.properties
+lib/clevic/swing/ui/nbproject/build-impl.xml
+lib/clevic/swing/ui/nbproject/project.xml
+lib/clevic/swing/ui/nbproject/project.properties
+lib/clevic/swing/ui/nbproject/private
+lib/clevic/swing/ui/nbproject/private/private.properties
+lib/clevic/swing/ui/nbproject/private/config.properties
+lib/clevic/swing/ui/nbproject/private/private.xml
+lib/clevic/swing/ui/build.xml
+lib/clevic/swing/ui/manifest.mf
+lib/clevic/swing/table_model.rb
+lib/clevic/swing/text_area_delegate.rb
+lib/clevic/swing/browser.rb
+lib/clevic/swing/cell_renderer.rb
+lib/clevic/swing/tag_editor.rb
+lib/clevic/swing/action_builder.rb
+lib/clevic/swing/field.rb
+lib/clevic/swing/set_delegate.rb
+lib/clevic/swing/clipboard.rb
+lib/clevic/swing/text_delegate.rb
+lib/clevic/swing/tag_delegate.rb
+lib/clevic/swing/selection_model.rb
+lib/clevic/swing/distinct_delegate.rb
+lib/clevic/swing/boolean_delegate.rb
+lib/clevic/swing/confirm_dialog.rb
+lib/clevic/swing/table_view.rb
+lib/clevic/swing/search_dialog.rb
+lib/clevic/swing/combo_delegate.rb
+lib/clevic/swing/swing_table_index.rb
+lib/clevic/swing/table_view_focus.rb
+lib/clevic/swing/cell_editor.rb
+lib/clevic/swing/extensions.rb
+lib/clevic/swing/delegate.rb
+lib/clevic/swing/action.rb
+lib/clevic/swing/relational_delegate.rb
+lib/clevic/swing/row_header.rb
+lib/clevic/ar_methods.rb
+lib/clevic/swing.rb
+lib/clevic/action_builder.rb
+lib/clevic/order_attribute.rb
+lib/clevic/dirty.rb
+lib/clevic/field.rb
+lib/clevic/attribute_list.rb
+lib/clevic/record.rb
+lib/clevic/sampler.rb
+lib/clevic/model_column.rb
+lib/clevic/table_searcher.rb
+lib/clevic/table_view.rb
+lib/clevic/field_valuer.rb
+lib/clevic/sequel_naked.rb
+lib/clevic/table_index.rb
+lib/clevic/view.rb
+lib/clevic/sequel_meta.rb
+lib/clevic/extensions.rb
+lib/clevic/delegate.rb
+lib/clevic/sql_dialects.rb
+lib/clevic/default_view.rb
+lib/clevic/many_field.rb
+lib/clevic/filter_command.rb
+lib/clevic/version.rb
+lib/clevic/generic_format.rb
+lib/clevic/emitter.rb
+lib/clevic/qt/ui/browser.ui
+lib/clevic/qt/ui/.gitignore
+lib/clevic/qt/ui/search_dialog_ui.rb
+lib/clevic/qt/ui/search_dialog.ui
+lib/clevic/qt/ui/browser_ui.rb
+lib/clevic/qt/table_model.rb
+lib/clevic/qt/text_area_delegate.rb
+lib/clevic/qt/browser.rb
+lib/clevic/qt/action_builder.rb
+lib/clevic/qt/field.rb
+lib/clevic/qt/set_delegate.rb
+lib/clevic/qt/item_delegate.rb
+lib/clevic/qt/clipboard.rb
+lib/clevic/qt/text_delegate.rb
+lib/clevic/qt/distinct_delegate.rb
+lib/clevic/qt/boolean_delegate.rb
+lib/clevic/qt/table_view.rb
+lib/clevic/qt/search_dialog.rb
+lib/clevic/qt/combo_delegate.rb
+lib/clevic/qt/extensions.rb
+lib/clevic/qt/delegates.rb
+lib/clevic/qt/relational_delegate.rb
+lib/clevic/table_view_paste.rb
+lib/clevic/sequel_ar_adapter.rb
+lib/clevic/model_builder.rb
+lib/clevic/rails_models_loaders.rb
+lib/clevic/sequel_length_validation.rb
+lib/clevic/cache_table.rb
+lib/clevic/table_model.rb
+lib/clevic/icons/icon.png
+lib/clevic/qt.rb
+lib/clevic/swing/ui/src/SearchDialog.form
+lib/clevic/swing/ui/src/SearchDialog.java
+lib/clevic/swing/ui/src/resources/SearchDialog.properties
+lib/clevic/swing/ui/src/TagEditor.form
+lib/clevic/swing/ui/src/TagEditor.java
+lib/clevic/swing/ui/dist/lib/swing-layout-1.0.3.jar
+lib/clevic/swing/ui/dist/README.TXT
+lib/clevic/swing/ui/nbproject/genfiles.properties
+lib/clevic/swing/ui/nbproject/build-impl.xml
+lib/clevic/swing/ui/nbproject/project.xml
+lib/clevic/swing/ui/nbproject/project.properties
+lib/clevic/swing/ui/nbproject/private/private.properties
+lib/clevic/swing/ui/nbproject/private/config.properties
+lib/clevic/swing/ui/nbproject/private/private.xml
+lib/clevic/swing/ui/build.xml
+lib/clevic/swing/ui/manifest.mf
+lib/clevic/swing/table_model.rb
+lib/clevic/swing/text_area_delegate.rb
+lib/clevic/swing/browser.rb
+lib/clevic/swing/cell_renderer.rb
+lib/clevic/swing/tag_editor.rb
+lib/clevic/swing/action_builder.rb
+lib/clevic/swing/field.rb
+lib/clevic/swing/set_delegate.rb
+lib/clevic/swing/clipboard.rb
+lib/clevic/swing/text_delegate.rb
+lib/clevic/swing/tag_delegate.rb
+lib/clevic/swing/selection_model.rb
+lib/clevic/swing/distinct_delegate.rb
+lib/clevic/swing/boolean_delegate.rb
+lib/clevic/swing/confirm_dialog.rb
+lib/clevic/swing/table_view.rb
+lib/clevic/swing/search_dialog.rb
+lib/clevic/swing/combo_delegate.rb
+lib/clevic/swing/swing_table_index.rb
+lib/clevic/swing/table_view_focus.rb
+lib/clevic/swing/cell_editor.rb
+lib/clevic/swing/extensions.rb
+lib/clevic/swing/delegate.rb
+lib/clevic/swing/action.rb
+lib/clevic/swing/relational_delegate.rb
+lib/clevic/swing/row_header.rb
+lib/clevic/ar_methods.rb
+lib/clevic/swing.rb
+lib/clevic/action_builder.rb
+lib/clevic/order_attribute.rb
+lib/clevic/dirty.rb
+lib/clevic/field.rb
+lib/clevic/attribute_list.rb
+lib/clevic/record.rb
+lib/clevic/sampler.rb
+lib/clevic/model_column.rb
+lib/clevic/table_searcher.rb
+lib/clevic/table_view.rb
+lib/clevic/field_valuer.rb
+lib/clevic/sequel_naked.rb
+lib/clevic/table_index.rb
+lib/clevic/view.rb
+lib/clevic/sequel_meta.rb
+lib/clevic/extensions.rb
+lib/clevic/delegate.rb
+lib/clevic/sql_dialects.rb
+lib/clevic/default_view.rb
+lib/clevic/many_field.rb
+lib/clevic/filter_command.rb
+lib/clevic/version.rb
+lib/clevic/generic_format.rb
+lib/clevic/emitter.rb

data/README.txt

@@ -4,13 +4,14 @@ http://clevic.rubyforge.org
 
 == DESCRIPTION:
 
-Database framework and Qt Model/View GUI for data capture and
-editing of tables in a pre-existing relational DBMS.
+Database framework and Model/View GUI for data capture and
+editing of tables in a pre-existing relational DBMS. Works with Qt
+and Java Swing.
 
-Using ActiveRecord means Clevic supports Postgresql, Mysql and so on. It's been tested with Postgres and sqlite.
+Using Sequel means Clevic supports Postgresql, Mysql and so on. It's been tested with Postgres and sqlite.
 
-Using Qt means it runs on Linux, Windows and OSX. Thoroughly tested
-in Linux, slightly tested in Windows and OSX.
+Using Qt and Swing means it runs on Linux, Windows and OSX. Qt is thoroughly tested
+in Linux, slightly tested in Windows and OSX. Swing is tested in Linux and OSX.
 
 == FEATURES:
 
@@ -23,7 +24,6 @@ in Linux, slightly tested in Windows and OSX.
 * Filter by current field.
 * search by field contents.
 * cut and paste in CSV format
-* point Clevic at a Rails project and see your models in a GUI
 
 === Shortcuts:
 
@@ -37,7 +37,7 @@ in Linux, slightly tested in Windows and OSX.
 
 === Model definition:
 
-Models and their UI representation must be defined in Ruby. A descendant of ActiveRecord::Base
+Models and their UI representation must be defined in Ruby. A descendant of Sequel::Model
 that includes the Clevic::Record module will provide a minimally functional UI.
 
 Beyond that, the framework provides a DSL for defining more complex and useful behaviour
@@ -54,7 +54,7 @@ For implementation and more extensive comments, see Clevic::ModelBuilder.
 * use blocks to format values for particular fields.
 * sensible caching to handle large data sets without unnecessary memory and cpu usage
 * extensions to various Qt classes to make db programming easier.
-* uses ActiveRecord for data access. Does *not* use the Qt SQL models.
+* uses Sequel for data access.
 * leverages SQL whenever possible to handle large datasets, sorting, filtering
   etc. So it's probably not suitable for talking to a remote db across a slow link.
 
@@ -64,25 +64,21 @@ See TODO file.
 
 == SYNOPSIS:
 
-	clevic model_definition_file.rb
+	clevic [ --qt | --swing ] model_definition_file.rb
 	
-	OR
-	
-	clevic path_to_rails_project [model_tweaks.rb]
-
 == REQUIREMENTS:
 
 === Gems
+* Sequel
 * fastercsv
-* ruby-qt4
 * qtext
-* ActiveRecord
-
-=== Other
+* hashery
+* gather
 
+=== Libraries
+* qtruby4 >= 2.0.3
 * bsearch (http://0xcc.net/ruby-bsearch)
-* active_record/dirty (included, for active_record < 2.1.x)
-* db driver (ie postgres-pr)
+* db driver (ie pg)
 * rdbms (ie postgres)
 
 == INSTALL:
@@ -97,7 +93,7 @@ See TODO file.
 
 (The GPL-2 License)
 
-Copyright (C) 2008 John Anderson
+Copyright (C) 2008-2011 John Anderson
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU Library General Public License

data/Rakefile

@@ -7,14 +7,17 @@ $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.description          = "SQL table GUI with Qt, Swing, Sequel"
   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']
+    ['gather', '>=0.0.6'],
+    ['qtext', '>=0.6.6'],
+    ['hashery', '>=1.3.0'],
+    ['andand', '>= 1.3.0'],
+    ['sequel', '>= 3.8.0'],
+    ['hpricot', '>= 0.8.1'],
+    ['io-like', '>= 0.3.0']
     # This isn't always installed from gems
     #~ ['qtruby4', '>=1.4.9']
     # bsearch can't be installed from gems
@@ -31,6 +34,3 @@ end
 
 require 'newgem/tasks' # load /tasks/*.rake
 Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]

data/TODO

@@ -1,6 +1,8 @@
-relational_delegate not used?
+use Sequel::Dataset for filtering instead of find options
+
+export to CSV
+Accounts not landing after Ditto with auto-fill-in
 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?
@@ -14,11 +16,8 @@ Add additional :filter record sets that can be selected from menus?
 
 filter and search by virtual fields
 
-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.
-caching of repeated related entity lookups. Possibly ActiveRecord::QueryCache
-Ramen http://ramen.rubyforge.org/ for metadata. MySQL and MSSQL only right now.
+tests. Use ZenTest to generate tests?
+caching of repeated related entity lookups.
 
 metadata for virtual fields. Add a member to Field for class_name.constantize
 consolidate metadata across TableModel, and Field. Would like to have it all in Field.

data/bin/clevic

@@ -2,10 +2,7 @@
 
 require 'pathname'
 
-require 'clevic.rb'
-require 'clevic/browser.rb'
 require 'optparse'
-require 'active_support'
 
 $options = {}
 oparser = OptionParser.new
@@ -24,6 +21,10 @@ oparser.on( '-p', '--pass PASSWORD', String ) { |o| $options[:password] = o }
 oparser.on( '-P', '--profile PROFILE', String ) { |o| $options[:profile] = o }
 oparser.on( '-t', '--table TABLE', 'Table to display', String ) { |o| $options[:table] = o }
 oparser.on( '-d', '--database DATABASE', 'Database name', String ) { |o| $options[:database] = o }
+
+oparser.on( '-s', '--swing', 'Use JRuby Swing' ) { |o| require 'clevic/swing.rb' }
+oparser.on( '-q', '--qt', 'Use Qt-Ruby' ) { |o| require 'clevic/qt.rb' }
+
 oparser.on( '-D', '--debug' ) { |o| $options[:debug] = true }
 oparser.on( '-v', '--verbose' ) { |o| $options[:verbose] = true }
 oparser.on( '-V', '--version' ) do
@@ -64,7 +65,7 @@ def subclasses( base )
   ObjectSpace.each_object( Class ) do |x|
     if x.ancestors.include?( base )
       case
-        when x == ActiveRecord::Base; # don't include this
+        when x == Clevic.base_entity_class; # don't include this
         else; classes << x
       end
     end
@@ -72,50 +73,13 @@ def subclasses( base )
   classes.sort{|a,b| a.name <=> b.name}
 end
 
-def load_rails_models( root, config, models )
-  # initialize Rails
-  load config / 'environment.rb'
-  require 'initializer.rb'
-  Rails::Initializer.run do |config|
-    config.frameworks -= [ :action_mailer, :action_pack, :active_resource ]
-  end
-  
-  # load lib/ files for the rails project
-  $: << ( root / 'lib' ).realpath.to_s
-  ( root / 'lib' ).children.each do |filename|
-    load filename if filename.file?
-  end
-
-  # include Dirty if it isn't already
-  begin
-    ActiveRecord::Dirty
-  rescue NameError
-    ActiveRecord::Base.send(:include, ActiveRecord::Dirty)
-  end
-  
-  # load models
-  models.find do |dir_entry|
-    # don't load directory entries
-    next unless dir_entry.file?
-    # only load .rb files
-    next unless dir_entry.basename.to_s =~ /\.rb$/
-    begin
-      load dir_entry
-    rescue Exception => e
-      puts "Error loading #{dir_entry.basename.to_s}: #{e.message}"
-      puts e.backtrace
-    end
-  end
-  
-  # include the Clevic::Record module in each descendant of
-  # ActiveRecord::Base so that the default views will be created.
-  subclasses( ActiveRecord::Base ).each do |model|
-    if model.table_exists?
-      model.send :include, Clevic::Record unless model.abstract_class?
-    end
-  end
+# do nothing ...
+def maybe_load_rails_models
 end
 
+# ... unless this is included
+# require 'clevic/rails_models_loader.rb'
+
 def load_single_model_file( pathname )
   ( pathname + '.rb' ).require_if_exists
   pathname.require_if_exists
@@ -125,14 +89,7 @@ end
 
 def load_models( pathname )
   if pathname.directory?
-    config = pathname / 'config'
-    app = pathname / 'app'
-    models = app / 'models'
-    # check if this is a Rails directory
-    if config.exist? && app.exist? && models.exist?
-      # this is probably a Rails project"
-      load_rails_models( pathname, config, models )
-    end
+    maybe_load_rails_models
   else
     # assume we have a single file, and try some variations
     load_single_model_file( pathname )
@@ -140,25 +97,7 @@ def load_models( pathname )
 end
 
 begin
-  # load model files
-  raise "no model definition file specified" if args.empty?
-  args.each { |arg| load_models( Pathname.new( arg ) ) }
-
-  app = Qt::Application.new( args )
-
-  # show UI
-  main_window = Qt::MainWindow.new
-  browser = Clevic::Browser.new( main_window )
-  # this must come after Clevic::Browser.new
-  main_window.show
-  # make sure any partially edited records are saved when the window is closed
-  app.connect( SIGNAL('lastWindowClosed()') ) { browser.save_all }
-  begin
-    app.exec
-  rescue
-    puts $!.message
-    puts $!.backtrace
-  end
+  Clevic::Browser.run( args )
 rescue Exception => e
   puts e.message
   puts e.backtrace