clevic 0.13.0.b5 → 0.13.0.b6

data/lib/clevic/framework.rb

@@ -10,6 +10,7 @@
   are already defined by the time the framework-neutral
   class definition is executed.
 =end
+
 class Class
   
   # method_name can be a symbol or a string.

data/lib/clevic/model_builder.rb

@@ -1,5 +1,8 @@
-# TODO not needed for 1.9
-require 'hashery/orderedhash'
+if RUBY_VERSION > '1.9.0'
+  OrderedHash = Hash
+else
+  require 'hashery/orderedhash'
+end
 
 require 'clevic/table_model.rb'
 require 'clevic/cache_table.rb'
@@ -29,6 +32,7 @@ To that end, there are 2 ways to define UIs:
 I've tried to consistently refer to an instance of an Sequel::Model subclass as an 'entity'.
 
 ==Embedded View
+
 Minimal embedded definition is
 
   class Position < Sequel::Model
@@ -76,8 +80,9 @@ could be defined like this:
       # The project field
       relational  :project do |field|
         field.display = 'project'
-        field.conditions = 'active = true'
-        field.order = 'lower(project)'
+        
+        # see Sequel::Dataset docs
+        field.dataset.filter( :active => true ).order{ lower(project) }
         
         # handle data changed events. In this case,
         # auto-fill-in the invoice field.
@@ -266,10 +271,10 @@ is an ordinary editable field. Boolean values are displayed as checkboxes.
 is a multiline editable field.
 
   relational
-displays a set of values pulled from a belongs_to (many-to-one) relationship.
-In other words all the possible related entities that this one could belong_to. Some
+displays a set of values pulled from a many-to-one relationship.
+In other words all the possible related entities that this one could be related to. Some
 concise representation of the related entities are displayed in a combo box.
-:display is mandatory. All options applicable to ActiveRecord::Base#find can also be passed.
+:display is mandatory.
 
   distinct
 fetches the set of values already in the field, so you don't have to re-type them.
@@ -292,7 +297,7 @@ to a method already defined in the entity. In other words any of:
 - a relationship (one_to_many, etc)
 - a plain method that takes no parameters.
 
-will work. Named scopes might also work, but I haven't tried them yet.
+will work.
 
 You can do things like this:
 
@@ -361,6 +366,7 @@ the order can be accessed in Clevic::View.order, and specified by
   Clevic::View.order = [Position, Target, Account]
 
 =end
+
 class ModelBuilder
   
   # Create a definition for entity_view (subclass of Clevic::View).

data/lib/clevic/model_column.rb

@@ -4,6 +4,7 @@ Field metadata class. Includes information for type, reflections etc.
 Also, it eases the migration from AR to Sequel, which returns metadata as
 a hash instead of a class.
 =end
+
 class ModelColumn
   # these are from AR
   attr_accessor :primary, :scale, :sql_type, :name, :precision, :default, :type, :meta

data/lib/clevic/qt.rb

@@ -5,6 +5,10 @@
 require 'clevic/framework'
 
 require 'Qt4'
+require 'qtext'
+
+# needed here for tableize, humanize
+require 'sequel'
 
 # require these first, so TableModel and TableView get the correct ancestors
 require 'clevic/qt/table_model.rb'

data/lib/clevic/qt/browser.rb

@@ -129,10 +129,11 @@ class Browser < Qt::Widget
     views.each do |view_class|
       begin
         view = view_class.new
-        unless view.entity_class.table_exists?
-          puts "No table for #{view.entity_class.inspect}"
-          next
-        end
+        
+        # This will raise an exception if we can't talk to the
+        # table. Returns nil if there is an empty table, which is
+        # also fine.
+        view.entity_class.first
           
         # create the the table_view and the table_model for the entity_class
         tab = Clevic::TableView.new( view )

data/lib/clevic/sequel_ar_adapter.rb

@@ -151,14 +151,6 @@ module Sequel
         end
       end
       
-      def has_attribute?( attribute )
-        column_names.include?( attribute )
-      end
-      
-      def attribute_names
-        columns
-      end
-      
       def columns_hash
         db_schema
       end

data/lib/clevic/sequel_clevic.rb

@@ -34,6 +34,14 @@ module Sequel
           association_reflections 
         end
         
+        def attribute_names
+          columns + reflections.keys
+        end
+        
+        def has_attribute?( attribute )
+          attribute_names.include?( attribute )
+        end
+      
       end
       
       module InstanceMethods

data/lib/clevic/table_model.rb

@@ -10,6 +10,7 @@ An instance of Clevic::TableModel is constructed by Clevic::ModelBuilder from th
 UI definition in a Clevic::View, or from the default Clevic::View created by
 including the Clevic::Record module in a Sequel::Model subclass.
 =end
+
 class TableModel
   # the CacheTable of Clevic::Record or Sequel::Model objects
   attr_reader :collection

data/lib/clevic/table_searcher.rb

@@ -7,6 +7,7 @@ Search for a record in the collection given a set of criteria. One of the
 criteria will be a starting record, and the search method should return
 the matching record next after this.
 =end
+
 class TableSearcher
   include OrderedDataset
   attr_reader :search_criteria, :field

data/lib/clevic/table_view.rb

@@ -595,6 +595,8 @@ class TableView
     unless found_row.nil?
       if column.is_a? Symbol
         column = model.field_column( column )
+      elsif column.nil?
+        column = 0
       else
         raise "column #{column} does not exist" if column >= model.fields.size
       end

data/lib/clevic/version.rb

@@ -3,7 +3,7 @@ module Clevic #:nodoc:
     MAJOR = 0
     MINOR = 13
     TINY  = 0
-    PRE   = 'b5'
+    PRE   = 'b6'
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/models/examples.rb

@@ -0,0 +1,46 @@
+module Clevic
+
+=begin rdoc
+
+See also Clevic::ModelBuilder and Clevic::Field
+
+== Examples:
+* No-frills models
+* Simple Accounting database
+* Read-only based on SQL views
+* Not yet working multi-valued fields
+* Work hours database
+* Work hours database using Sqlite
+* Work hours database using Postgres
+* Work hours database using ActiveRecord style models
+
+==No-frills models
+ :include:models/minimal_models.rb
+
+==Simple Accounting database
+ :include:models/accounts_models.rb
+
+== Read-only based on SQL views
+ :include:models/values_models.rb
+
+== Not yet working multi-valued fields
+ :include:models/contacts.rb
+
+== Work hours database
+ :include:models/times_models.rb
+
+== Work hours database using Sqlite
+ :include:models/times_sqlite_models.rb
+ 
+== Work hours database using Postgres
+ :include:models/times_psql_models.rb
+ 
+== Work hours database using ActiveRecord style models
+ :include:models/times_ar_style_models.rb
+
+=end
+
+class Examples
+end
+
+end

data/tasks/clevic.rake

@@ -1,9 +1,5 @@
-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(' ')}"
+namespace :gem do
+  task :package => :ui
 end
 
 # generate a _ui.rb filename from a .ui filename
@@ -70,7 +66,7 @@ task :irb do |t|
 end
 
 # generate tasks for all model definition files
-MODELS_LIST = FileList.new( '**/*models.rb' )
+MODELS_LIST = FileList.new( 'models/**/*models.rb' )
 
 def short_model( model_file )
   Pathname.new( model_file ).basename.to_s.gsub( /_models.rb/, '' )

data/test/test_helper.rb

@@ -1,9 +1,16 @@
+gem "test-unit" unless RUBY_VERSION < '1.9.0'
+
 require 'test/unit'
 require 'shoulda'
 
 require File.dirname(__FILE__) + '/../lib/clevic'
 require File.dirname(__FILE__) + '/fixtures.rb'
 
+if RUBY_VERSION < '1.9.0'
+  require 'generator'
+  Enumerator = Generator
+end
+
 # Allow running of startup and shutdown things before
 # an entire suite, instead of just one per test
 class SuiteWrapper < Test::Unit::TestSuite

data/test/test_table_searcher.rb

@@ -1,5 +1,4 @@
-require 'generator'
-require 'logger'
+#~ require 'logger'
 
 require File.dirname(__FILE__) + '/test_helper.rb'
 require 'clevic/table_searcher.rb'
@@ -63,7 +62,7 @@ class TestTableSearcher < Test::Unit::TestCase
   context "searching" do
     setup do
       @simple_search_criteria.search_text = CreateFakePassengers::NATIONALITIES[0]
-      @passenger_generator = Generator.new( @all_passengers )
+      @passenger_generator = Enumerator.new( @all_passengers )
       @simple_search_criteria.from_start = true
     end
     
@@ -126,10 +125,11 @@ class TestTableSearcher < Test::Unit::TestCase
     
     should 'raise an exception for no display value' do
       @flight_field = Clevic::Field.new( :flight, Passenger, {} )
+
       @flight_field.display = nil
-      
       assert_nil @flight_field.display
-      assert_raise RuntimeError do
+
+      assert_raise( RuntimeError ) do
         table_searcher = Clevic::TableSearcher.new( Passenger.dataset, @simple_search_criteria, @flight_field )
         table_searcher.search
       end
@@ -171,7 +171,7 @@ class TestTableSearcher < Test::Unit::TestCase
       @simple_search_criteria.whole_words = false
       @simple_search_criteria.from_start = true
       table_searcher = Clevic::TableSearcher.new( Passenger.dataset, @simple_search_criteria, @nationality_field )
-      expecteds = Generator.new @should_find
+      expecteds = Enumerator.new @should_find
       last_entity = nil
       while next_entity = table_searcher.search( last_entity )
         assert_equal next_entity, expecteds.next

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: clevic
 version: !ruby/object:Gem::Version 
-  hash: 173
+  hash: 171
   prerelease: 7
   segments: 
   - 0
   - 13
   - 0
   - b
-  - 5
-  version: 0.13.0.b5
+  - 6
+  version: 0.13.0.b6
 platform: ruby
 authors: 
 - John Anderson
@@ -17,196 +17,241 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +02:00
+date: 2011-05-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: fastercsv
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 25
         segments: 
+        - 1
         - 2
-        - 0
-        - 2
-        version: 2.0.2
+        - 3
+        version: 1.2.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: fastercsv
+  name: gather
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 19
         segments: 
-        - 1
-        - 2
-        - 3
-        version: 1.2.3
+        - 0
+        - 0
+        - 6
+        version: 0.0.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: gather
+  name: andand
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 27
         segments: 
+        - 1
+        - 3
         - 0
-        - 0
-        - 6
-        version: 0.0.6
+        version: 1.3.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: qtext
+  name: sequel
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 39
         segments: 
+        - 3
+        - 8
         - 0
-        - 6
-        - 6
-        version: 0.6.6
+        version: 3.8.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hashery
+  name: bsearch
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
         - 1
-        - 3
+        - 5
         - 0
-        version: 1.3.0
+        version: 1.5.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: andand
+  name: hpricot
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 61
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sequel
+  name: hashery
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 27
         segments: 
+        - 1
         - 3
-        - 8
         - 0
-        version: 3.8.0
+        version: 1.3.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: io-like
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 19
         segments: 
         - 0
-        - 8
-        - 1
-        version: 0.8.1
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: io-like
+  name: qtbindings
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 33
         segments: 
-        - 0
+        - 4
+        - 6
         - 3
-        - 0
-        version: 0.3.0
+        version: 4.6.3
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: newgem
+  name: qtext
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 9
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
-  type: :development
+        - 6
+        - 7
+        version: 0.6.7
+  type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: test-unit
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 3
         segments: 
-        - 1
-        - 8
         - 0
-        version: 1.8.0
+        version: "0"
   type: :development
   version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
+  type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: faker
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 3
+        - 1
+        version: 0.3.1
+  type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: bones
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 3
+        - 6
+        - 0
+        version: 3.6.0
+  type: :development
+  version_requirements: *id014
 description: SQL table GUI with Qt / Java Swing and Sequel
-email: 
-- panic@semiosix.com
+email: panic@semiosix.com
 executables: 
 - clevic
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- Manifest.txt
 - README.txt
+- TODO
 files: 
 - History.txt
 - Manifest.txt
@@ -214,6 +259,7 @@ files:
 - Rakefile
 - TODO
 - bin/clevic
+- models/examples.rb
 - models/accounts_models.rb
 - models/minimal_models.rb
 - models/times_models.rb
@@ -228,7 +274,6 @@ files:
 - sql/times.sql
 - sql/times_sqlite.sql
 - tasks/clevic.rake
-- tasks/rdoc.rake
 - test/test_cache_table.rb
 - test/test_helper.rb
 - test/test_model_index_extensions.rb
@@ -288,8 +333,6 @@ files:
 - 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/many_field.rb
 - lib/clevic/attribute_list.rb
@@ -351,6 +394,8 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
+- -W
+- http://gitweb.semiosix.com/gitweb.cgi?p=clevic;a=blob;f=%s;hb=HEAD
 - --main
 - README.txt
 require_paths: 
@@ -381,7 +426,7 @@ rubyforge_project: clevic
 rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: Database framework and Model/View GUI for data capture and editing of tables in a pre-existing relational DBMS
+summary: SQL table GUI with Qt / Java Swing and Sequel
 test_files: 
 - test/test_table_searcher.rb
 - test/test_model_index_extensions.rb