clevic 0.13.0.b3 → 0.13.0.b5

data/History.txt

@@ -1,3 +1,24 @@
+== 0.13.0.b5
+* Lots of Bug fixes
+* moved all internals to Sequel::Dataset
+* bring Swing combos up to date with Qt combos
+* ActionBuilder fixes for Swing
+* fixes for restricted combos with defined sets, sampling and editing.
+
+== 0.13.0.b4
+* Skipped past this release somehow
+
+== 0.13.0.b3
+* WARNING most importantly, support for ActiveRecord style calls now requires
+  a require of 'clevic/sequel_ar_adapter.rb' in your model files.
+* use Dataset in CacheTable and TableSearcher. Allows for ordering
+  to stay correct when filtering views.
+* use of Dataset allows filtering in TableView to keep previous ordering,
+  and filter.
+
+== 0.13.0.b3
+* Squash various buglets as they're found.
+
 == 0.13.0
 * Now has Java Swing support with JRuby
 * new code works with qt4-qtruby-2.0.3

data/Manifest.txt

@@ -19,113 +19,119 @@ sql/times.sql
 sql/times_sqlite.sql
 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.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/model_builder.rb
-lib/clevic/qt/table_model.rb
-lib/clevic/qt/text_area_delegate.rb
-lib/clevic/qt/browser.rb
-lib/clevic/qt/accept_reject.rb
+lib/clevic/action_builder.rb
+lib/clevic/sequel_naked.rb
+lib/clevic/record.rb
+lib/clevic/icons/icon.png
+lib/clevic/dataset_roller.rb
+lib/clevic/dirty.rb
+lib/clevic/ordered_dataset.rb
+lib/clevic/rails_models_loaders.rb
+lib/clevic/default_view.rb
+lib/clevic/sequel_clevic.rb
+lib/clevic/sequel_ar_adapter.rb
+lib/clevic/sequel_length_validation.rb
+lib/clevic/ar_methods.rb
+lib/clevic/sampler.rb
+lib/clevic/table_index.rb
+lib/clevic/table_view.rb
+lib/clevic/field.rb
+lib/clevic/swing.rb
+lib/clevic/delegates/set_delegate.rb
+lib/clevic/delegates/distinct_delegate.rb
+lib/clevic/delegates/relational_delegate.rb
+lib/clevic/delegates/combo_delegate.rb
+lib/clevic/generic_format.rb
+lib/clevic/sequel_meta.rb
+lib/clevic/filter_command.rb
+lib/clevic/extensions.rb
+lib/clevic/view.rb
+lib/clevic/model_builder.rb
+lib/clevic/table_model.rb
+lib/clevic/delegate.rb
+lib/clevic/qt/qt_combo_box.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/accept_reject.rb
+lib/clevic/qt/search_dialog.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/field.rb
+lib/clevic/qt/set_delegate.rb
 lib/clevic/qt/extensions.rb
-lib/clevic/qt/delegates.rb
+lib/clevic/qt/model_builder.rb
+lib/clevic/qt/table_model.rb
+lib/clevic/qt/simplest_delegate.rb
+lib/clevic/qt/delegate.rb
+lib/clevic/qt/ui/browser.ui
+lib/clevic/qt/ui/browser_ui.rb
+lib/clevic/qt/ui/search_dialog_ui.rb
+lib/clevic/qt/ui/search_dialog.ui
+lib/clevic/qt/distinct_delegate.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/combo_delegate.rb
+lib/clevic/qt/browser.rb
+lib/clevic/qt/clipboard.rb
+lib/clevic/qt/text_area_delegate.rb
+lib/clevic/ui/browser_ui.rb
+lib/clevic/ui/search_dialog_ui.rb
 lib/clevic/qt.rb
-lib/clevic/swing/ui/src/SearchDialog.form
-lib/clevic/swing/ui/src/SearchDialog.java
+lib/clevic/many_field.rb
+lib/clevic/attribute_list.rb
+lib/clevic/framework.rb
+lib/clevic/model_column.rb
+lib/clevic/subclasses.rb
+lib/clevic/swing/cell_renderer.rb
+lib/clevic/swing/action_builder.rb
+lib/clevic/swing/cell_editor.rb
+lib/clevic/swing/search_dialog.rb
+lib/clevic/swing/text_delegate.rb
+lib/clevic/swing/table_view.rb
+lib/clevic/swing/row_header.rb
+lib/clevic/swing/field.rb
+lib/clevic/swing/set_delegate.rb
+lib/clevic/swing/selection_model.rb
+lib/clevic/swing/extensions.rb
+lib/clevic/swing/model_builder.rb
+lib/clevic/swing/table_model.rb
+lib/clevic/swing/table_view_focus.rb
+lib/clevic/swing/tag_editor.rb
+lib/clevic/swing/delegate.rb
+lib/clevic/swing/ui/manifest.mf
+lib/clevic/swing/ui/dist/lib/swing-layout-1.0.3.jar
+lib/clevic/swing/ui/dist/README.TXT
+lib/clevic/swing/ui/build.xml
 lib/clevic/swing/ui/src/resources/SearchDialog.properties
 lib/clevic/swing/ui/src/TagEditor.form
+lib/clevic/swing/ui/src/SearchDialog.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/src/SearchDialog.java
+lib/clevic/swing/ui/nbproject/private/private.xml
+lib/clevic/swing/ui/nbproject/private/config.properties
+lib/clevic/swing/ui/nbproject/private/private.properties
+lib/clevic/swing/ui/nbproject/project.properties
 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/model_builder.rb
-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/swing_table_index.rb
+lib/clevic/swing/distinct_delegate.rb
+lib/clevic/swing/relational_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/browser.rb
+lib/clevic/swing/clipboard.rb
+lib/clevic/swing/tag_delegate.rb
+lib/clevic/swing/text_area_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/emitter.rb
+lib/clevic/table_view_paste.rb
+lib/clevic/cache_table.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

@@ -6,12 +6,19 @@ http://clevic.rubyforge.org
 
 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.
+and Java Swing. Uses SQL to do sorting and filtering wherever possible.
 
-Using Sequel means Clevic supports Postgresql, Mysql and so on. It's been tested with Postgres and sqlite.
+Based on the idea of a Field, which contains information to display
+a db field in a UI of some kind. This includes display formatting, edit
+formatting, edit parsing, sets of values for eg foreign keys.
+And lots more.
 
-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.
+Using Sequel means Clevic works with Postgresql, Mysql and so on. It's been
+tested with Postgres and sqlite.
+
+Using Qt and Swing means it runs on Linux, Windows and OSX. The Qt
+code is thoroughly tested in Linux, slightly tested in Windows and OSX. Swing 
+is tested in Linux and OSX.
 
 == FEATURES:
 
@@ -21,9 +28,9 @@ in Linux, slightly tested in Windows and OSX. Swing is tested in Linux and OSX.
 * in-place combo boxes for choosing values from related tables (foreign keys)
 * distinct combo boxes to list previous values for a field
 * display read-only fields from related tables
-* Filter by current field.
-* search by field contents.
-* cut and paste in CSV format
+* Recursive Filter by current field
+* search by field contents
+* cut and paste in CSV and paste from HTML in the Java framework.
 
 === Shortcuts:
 
@@ -32,8 +39,9 @@ in Linux, slightly tested in Windows and OSX. Swing is tested in Linux and OSX.
 * Ctrl-] for copy previous record, one field right
 * Ctrl-[ for copy previous record, one field left
 * Ctrl-f to find a record
-* Ctrl-l to filter by current selection
-* cursor keys for movement
+* Ctrl-l to add a filter (by current selection)
+* Ctrl-k to remove a filter
+* cursor keys, PgUp PgDown etc for movement
 
 === Model definition:
 
@@ -43,24 +51,25 @@ 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
 (see Clevic::ModelBuilder).
 
-In the models/ subdirectory, start with minimal_models.rb.
-account_models.rb and times_models.rb provide definitions for more real-world examples.
-Associated SQL schemas are in the sql subdirectory.
+=== Examples
 
-For implementation and more extensive comments, see Clevic::ModelBuilder.
+In the models/ subdirectory, start with minimal_models.rb. account_models.rb 
+and times_models.rb provide definitions for real-world examples. Associated 
+SQL schemas are in the sql subdirectory. For implementation and more extensive 
+comments, see Clevic::ModelBuilder.
 
 === Framework
 
-* use blocks to format values for particular fields.
+* uses Sequel for data access.
+* can 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 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.
 
 == PROBLEMS:
 
-See TODO file.
+There are some tests for algorithmic code, but Clevic needs a comprehensive testing framework.
 
 == SYNOPSIS:
 
@@ -72,7 +81,8 @@ See TODO file.
 * Sequel
 * fastercsv
 * qtext
-* hashery
+* hashery (for ruby-1.8.x)
+* qtbindings
 * gather
 
 === Libraries
@@ -83,11 +93,16 @@ See TODO file.
 
 == INSTALL:
 
+	Get bsearch from http://0xcc.net/ruby-bsearch
+	
+	Install qt bindings from https://github.com/ryanmelt/qtbindings
+	
 	sudo gem install
 
 == THANKS:
 
-* Michelle Riley for help debugging the windows gem
+* Michelle Riley for help debugging under windows
+* Jacob Buys for pointing out the qtbindings gem
 
 == LICENSE:
 

data/Rakefile

@@ -17,9 +17,8 @@ $hoe = Hoe.new('clevic', Clevic::VERSION::STRING) do |p|
     ['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']
+    ['io-like', '>= 0.3.0'],
+    #['qtbindings', '>=4.6.3']
     # bsearch can't be installed from gems
   ]
   p.extra_dev_deps = [

data/TODO

@@ -1,5 +1,8 @@
-use Sequel::Dataset for filtering instead of find options
-can't use find on certain fields, ie code in adjustments
+override_next_index broken again, on ditto
+Sort out the whole /bin/clevic vs gem 'clevic', '~> 0.12.0' thing.
+Meta should be related to ModelColumn somehow. Which is pretty messy itself.
+
+can't use find on certain fields, ie code in adjustments. Partially fixed.
 
 export to CSV
 Accounts not landing after Ditto with auto-fill-in
@@ -10,8 +13,6 @@ use rubigen for creating model definition files?
 undoable_command signal for delegates
 
 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?
 
@@ -49,17 +50,15 @@ search with acts_as_searchable and hyperestraier
 
 moving of columns
 /-style keyboard search by selected column, or everything if no column selected
-/-style filtering?
 
 for dates, add year if not specified, with 6 months on either side range. Configurable?
-value parsing not in model
 copy a field from a mouse-selection (ctrl-b maybe)
 hiding of fields
 
 save context menu settings, filter settings, etc
 filtering by various things. http://doc.trolltech.com/4.3/qsortfilterproxymodel.html
 highlighting by various things
-cut and paste (in model format)
+cut and paste (in model format. Could use indirect format ie table/row/column. Kinda pointless though since references would essentially do the same thing.)
 
 drop cached model objects from CacheTable when they're not in use. WeakRef?
 
@@ -101,22 +100,19 @@ numeric months
 
 Combos
 ------
-shortlist combos by prefix. See Qt Examples.
+shortlist combos by prefix. See Qt Examples, and Swing code.
 turn on/off smart filters for relational delegates. Like selecting only distincts in the last year.
 context menu for delegates, ie sort order, last used, etc
 
 shortcut sets, depending on which OS you're used. use QKeyEvent::matches ( QKeySequence::StandardKey key )
 
 Doing data capture, sort by id, but unfilter reverts to date/id rather than entry order
-optional warnings for back-dated entries. Highlighting 
+optional warnings for back-dated entries. Highlighting.
 make bsearch easier to install
 
 handle db errors
 easier way to run models, search LOAD_PATH
 
-cache belongs_to associations, during loading, but don't affect ability to pick up
-changes more or less instantly.
-
 preferences
 -----------
 store previous searches, by model & app
@@ -126,7 +122,6 @@ maybe
 -----
 acts_as_shellable looks nice
 consolidate read-only-ness checks 
-Look at DataMapper. Not suitable - need to declare properties.
 ActiveMDB for migrating?
 allow moving of rows
 discontiguous copying of entities/csv
@@ -135,7 +130,6 @@ pasting of csv, into rectangular regions
 collect a set of data requests to the model, and do them in one SQL query. See EntryTableView#moveCursor
 Use SQL cursors for find & find_next?
 Use roo to parse spreadsheets?
-Criteria for SQL statement building http://criteria.rubyforge.org/
 SqlCache
 SqlStatement
 Csv2Sql

data/bin/clevic

@@ -22,8 +22,13 @@ 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( '-s', '--swing', 'Use JRuby Swing' ) do |o|
+  require 'clevic/swing.rb'
+end
+
+oparser.on( '-q', '--qt', 'Use Qt-Ruby' ) do |o|
+  require 'clevic/qt.rb'
+end
 
 oparser.on( '-D', '--debug' ) { |o| $options[:debug] = true }
 oparser.on( '-v', '--verbose' ) { |o| $options[:verbose] = true }
@@ -39,6 +44,12 @@ end
 
 args = oparser.parse( ARGV )
 
+if RUBY_PLATFORM == 'java'
+  require 'clevic/swing'
+else
+  require 'clevic/qt'
+end
+
 if $options[:debug]
   require 'pp'
   pp $options
@@ -60,23 +71,6 @@ class Pathname
   alias_method :/, :+
 end
 
-def subclasses( base )
-  classes = []
-  ObjectSpace.each_object( Class ) do |x|
-    if x.ancestors.include?( base )
-      case
-        when x == Clevic.base_entity_class; # don't include this
-        else; classes << x
-      end
-    end
-  end
-  classes.sort{|a,b| a.name <=> b.name}
-end
-
-# do nothing ...
-def maybe_load_rails_models
-end
-
 # ... unless this is included
 # require 'clevic/rails_models_loader.rb'
 
@@ -89,7 +83,10 @@ end
 
 def load_models( pathname )
   if pathname.directory?
-    maybe_load_rails_models
+    # load all children
+    pathname.children.grep( /.rb$/ ).each do |child|
+      require child.to_s
+    end
   else
     # assume we have a single file, and try some variations
     load_single_model_file( pathname )
@@ -97,6 +94,7 @@ def load_models( pathname )
 end
 
 begin
+  # pulled in by the clevic/qt or clevic/swing files
   Clevic::Browser.run( args )
 rescue Exception => e
   puts e.message