clevic 0.12.0 → 0.13.0.b1

data/models/minimal_models.rb

@@ -3,21 +3,17 @@ require 'clevic.rb'
 # see sql/accounts.sql for schema
 
 # db connection
-Clevic::DbOptions.connect do
-  database 'accounts_test'
-  adapter :postgresql
-  username 'accounts'
-end
+Sequel.connect( "postgres://#{host}/accounts_test?user=#{$options[:username] || 'accounts'}&password=#{$options[:password]}" )
 
 # minimal definition to get combo boxes to show up
-class Entry < ActiveRecord::Base
+class Entry < Sequel::Model
   include Clevic::Record
-  belongs_to :debit, :class_name => 'Account', :foreign_key => 'debit_id'
-  belongs_to :credit, :class_name => 'Account', :foreign_key => 'credit_id'
+  many_to_one :debit, :class_name => 'Account', :foreign_key => 'debit_id'
+  many_to_one :credit, :class_name => 'Account', :foreign_key => 'credit_id'
 end
 
 # minimal definition to get sensible values in combo boxes
-class Account < ActiveRecord::Base
+class Account < Sequel::Model
   include Clevic::Record
   def to_s; name; end
 end

data/models/times_models.rb

@@ -1,28 +1,30 @@
-require 'clevic.rb'
-
 # model definitions
-class Entry < ActiveRecord::Base
+class Entry < Sequel::Model
   belongs_to :invoice
   belongs_to :activity
   belongs_to :project
   
   include Clevic::Record
+  
+  # spans of time more than 8 ours are coloured violet
+  # because they're often the result of typos.
   def time_color
     return if self.end.nil? || start.nil?
     'darkviolet' if self.end - start > 8.hours
   end
   
+  # tooltip for spans of time > 8 hours
   def time_tooltip
     return if self.end.nil? || start.nil?
     'Time interval greater than 8 hours' if self.end - start > 8.hours
   end
   
   define_ui do
-    plain       :date, :sample => '28-Dec-08'
+    plain       :date, :sample => '28-WWW-08'
     
     # The project field
-    relational  :project do |field|
-      field.display = 'project'
+    relational :project do |field|
+      field.display = :project
       field.conditions = 'active = true'
       field.order = 'lower(project)'
       
@@ -32,7 +34,7 @@ class Entry < ActiveRecord::Base
         if model_index.entity.invoice.nil?
           entity_view.invoice_from_project( table_view, model_index ) do
             # move here next if the invoice was changed
-            table_view.override_next_index model_index.choppy( :column => :start )
+            table_view.next_index = model_index.choppy( :column => :start )
           end
         end
       end
@@ -149,10 +151,11 @@ class Entry < ActiveRecord::Base
   
 end
 
-class Invoice < ActiveRecord::Base
-  include Clevic::Record
+class Invoice < Sequel::Model
   has_many :entries
 
+  include Clevic::Record
+  
   define_ui do
     plain :date
     distinct :client
@@ -167,10 +170,11 @@ class Invoice < ActiveRecord::Base
   end
 end
 
-class Project < ActiveRecord::Base
-  include Clevic::Record
+class Project < Sequel::Model
   has_many :entries
 
+  include Clevic::Record
+  
   define_ui do
     plain     :project
     plain     :description
@@ -184,7 +188,7 @@ class Project < ActiveRecord::Base
   # Return the latest invoice for this project
   # Not part of the UI.
   def latest_invoice
-    Invoice.find(
+    Invoice.adaptor.find(
       :first,
       :conditions => ["client = ? and status = 'not sent'", self.client],
       :order => 'invoice_number desc'
@@ -193,10 +197,11 @@ class Project < ActiveRecord::Base
 
 end
 
-class Activity < ActiveRecord::Base
-  include Clevic::Record
+class Activity < Sequel::Model
   has_many :entries
 
+  include Clevic::Record
+  
   # define how fields are displayed
   define_ui do
     plain :activity

data/models/times_psql_models.rb

@@ -0,0 +1,10 @@
+$options ||= {}
+
+require 'clevic.rb'
+require 'sequel'
+host = ENV['PGHOST'] || 'localhost'
+constring = "jdbc:postgresql://#{host}/times_test?user=#{$options[:username] || 'times'}&password=general"
+puts "constring: #{constring.inspect}"
+Sequel.connect( constring )
+
+require 'times_models.rb'

data/models/times_sqlite_models.rb

@@ -1,10 +1,3 @@
 require 'clevic.rb'
-
-# db connection options
-Clevic::DbOptions.connect( $options ) do
-  database :times
-  adapter :sqlite3
-end
-
+Sequel.sqlite( "#{ENV['HOME']}/projects/clevic-sequel/times.sqlite3" )
 require 'times_models.rb'
-

data/models/values_models.rb

@@ -1,17 +1,11 @@
 require 'clevic.rb'
 
 # db connection
-Clevic::DbOptions.connect( $options ) do
-  database :accounts_test
-  adapter :postgresql
-  username 'accounts'
-end
+Sequel.connect( "postgres://#{host}/accounts_test?user=#{$options[:username] || 'accounts'}&password=#{$options[:password]}" )
 
 # This is a read-only view, which is currently not implemented
-class Value < ActiveRecord::Base
+class Value < Sequel::Model
   set_table_name 'values'
-  #~ has_many :debits, :class_name => 'Entry', :foreign_key => 'debit_id'
-  #~ has_many :credits, :class_name => 'Entry', :foreign_key => 'credit_id'
   
   include Clevic::Record
   define_ui do

data/tasks/clevic.rake

@@ -12,7 +12,7 @@ def ui_rb_file( ui_file )
 end
 
 # list of .ui files
-UI_FILES = FileList.new( 'lib/clevic/ui/*.ui' )
+UI_FILES = FileList.new( 'lib/clevic/qt/ui/*.ui' )
 CLEAN.include( 'ChangeLog', 'coverage', 'profiling' )
 CLOBBER.include( 'ChangeLog', 'pkg', 'lib/clevic/ui/*_ui.rb' )
 

data/tasks/rdoc.rake

@@ -8,9 +8,5 @@ Rake::RDocTask.new do |rdoc|
   rdoc.main = 'README.txt'
   rdoc.rdoc_dir = 'doc'
   rdoc.rdoc_files.include %w{History.txt lib/**/*.rb README.txt TODO}
-  rdoc.options += [
-      '-SHN',
-      '-A', 'property=Property',
-      "--opname=index.html",
-    ]
+  rdoc.options += [ '-SHN' ]
 end

data/tasks/website.rake

@@ -14,7 +14,7 @@ task :website_generate => :ruby_env do
 end
 
 desc 'Upload website files to rubyforge'
-task :website_upload do
+task :upload_website do
   host = "#{rubyforge_username}@rubyforge.org"
   remote_dir = "/var/www/gforge-projects/#{PATH}/"
   local_dir = 'website'

data/test/test_cache_table.rb

@@ -1,28 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class PopulateCachePassengers < ActiveRecord::Migration
-  def self.up
-    Passenger.create :name => 'John Anderson', :flight => Flight.find_by_number('EK211'), :row => 36, :seat => 'A', :nationality => 'UAE'
-    Passenger.create :name => 'Genie', :flight => Flight.find_by_number('CA001'), :row => 1, :seat => 'A', :nationality => 'Canada'
-    Passenger.create :name => 'Aladdin', :flight => Flight.find_by_number('CA001'), :row => 2, :seat => 'A', :nationality => 'Canada'
-  end
-  
-  def self.down
-    Passenger.delete :all
-  end
-end
-
 # need to set up a test DB, and test data for this
 class TestCacheTable < Test::Unit::TestCase
-  def self.startup
-    PopulateCachePassengers.up
-  end
-  
-  def self.shutdown
-    PopulateCachePassengers.down
-  end
-  
-  
   def setup
     @cache_table = CacheTable.new( Passenger )
   end
@@ -49,8 +28,8 @@ class TestCacheTable < Test::Unit::TestCase
     end
     
     # test cache retrieval
-    (0...Passenger.count).each do |i|
-      assert @cache_table[i] == Passenger.find( :first, :offset => i ), "#{i}th cached record is not #{i}th db record"
+    (0...Passenger.count).each do |offset|
+      assert @cache_table[offset] == Passenger.limit(1,offset).first, "#{offset}th cached record is not #{offset}th db record"
     end
   end
   
@@ -68,15 +47,18 @@ class TestCacheTable < Test::Unit::TestCase
     (0...Passenger.count).each do |i|
       assert !@cache_table.cached_at?(i), "record #{i} should not be cached yet"
     end
+    
+    # force retrieval
     @cache_table[0]
+    
     (0...Passenger.count).each do |i|
       assert @cache_table.cached_at?(i), "#{i}th object should not be nil"
     end
   end
   
   should 'have id as a default order attribute' do
-    oa = OrderAttribute.new( Passenger, 'id' )
-    assert_equal oa, @cache_table.order_attributes[0]
+    oa = OrderAttribute.new( Passenger, :id )
+    assert_equal oa, @cache_table.order_attributes.first
   end
   
   def test_parse_order_attributes
@@ -93,23 +75,27 @@ class TestCacheTable < Test::Unit::TestCase
     
   should 'return nil for an empty set' do
     cache_table = @cache_table.renew( :conditions => "nationality = 'nothing'" )
-    assert_nil cache_table.index_for_entity( Passenger.find( :first ) )
+    assert_nil cache_table.index_for_entity( Passenger.first )
+  end
+  
+  should "filter with related objects" do
+    @cache_table = @cache_table.renew( :conditions => { :flight => Flight.first} )
   end
   
   def test_index_for_entity
     # test in ascending order
-    first_passenger = Passenger.find :first
+    first_passenger = Passenger.first
     index = @cache_table.index_for_entity( first_passenger )
     assert_equal 0, index, 'first passenger should have an index of 0'
     
     # test in descending order
     @cache_table = @cache_table.renew( :order => 'id desc' )
-    last_passenger = Passenger.find :first, :order => 'id desc'
+    last_passenger = Passenger.order( :id.desc ).first
     assert_equal 0, @cache_table.index_for_entity( last_passenger ), "last passenger in reverse order should have an index of 0"
     
     # test with two order fields
     @cache_table = @cache_table.renew( :order => 'nationality, row' )
-    passenger = Passenger.find :first, :order => 'nationality, row'
+    passenger = Passenger.order( :nationality, :row ).first
     assert_equal 0, @cache_table.index_for_entity( passenger ), "passenger in (nationality, row) order should have an index of 0"
   end
 end

data/test/test_helper.rb

@@ -2,103 +2,34 @@ require 'test/unit'
 require 'shoulda'
 
 require File.dirname(__FILE__) + '/../lib/clevic'
-
-require 'activerecord'
-require 'sqlite3'
-require 'faker'
-require 'generator'
-
-
-class Flight < ActiveRecord::Base
-  has_many :passengers
-end
-
-class Passenger < ActiveRecord::Base
-  belongs_to :flight
-end
-
-class CreateFlights < ActiveRecord::Migration
-  def self.up
-    create_table :flights do |t|
-      t.string :number
-      t.string :airline
-      t.string :destination
-    end
-    Flight.reset_column_information
-    Flight.create :number => 'EK211'
-    Flight.create :number => 'EK088'
-    Flight.create :number => 'EK761'
-    Flight.create :number => 'BA264'
-  end
-  
-  def self.down
-    Flight.delete_all
-  end
-end
-
-class CreatePassengers < ActiveRecord::Migration
-  def self.up
-    create_table :passengers do |t|
-      t.string :name
-      t.string :nationality
-      t.integer :flight_id
-      t.integer :row
-      t.string :seat
-    end
-    Passenger.reset_column_information
-  end
-  
-  def self.down
-    Passenger.delete_all
-  end
-end
-
-# Convenience class to create a test DB
-class OneBase
-  attr_reader :db_name, :adapter
-  
-  def initialize
-    @db_name = 'test_cache_table.sqlite3'
-
-    if File.exists? @db_name
-      p 'remove old db'
-      File.unlink @db_name
-    end
-    
-    @adapter = :sqlite3
-    @db = SQLite3::Database.new( @db_name )
-    @db_options = Clevic::DbOptions.connect do |dbo|
-      dbo.database @db_name
-      dbo.adapter @adapter
-    end
-  end
-
-  def feenesh
-    File.unlink @db_name
-  end
-end
+require File.dirname(__FILE__) + '/fixtures.rb'
 
 # Allow running of startup and shutdown things before
 # an entire suite, instead of just one per test
 class SuiteWrapper < Test::Unit::TestSuite
-  attr_accessor :tests
+  attr_accessor :tests, :db
   
   def initialize( name, test_case )
     super( name )
     @test_case = test_case
+    
+    # define in fixtures.rb
+    @db = $db
   end
   
   def startup
-    @onebase = OneBase.new
-    ActiveRecord::Migration.verbose = false
-    CreateFlights.up
-    CreatePassengers.up
+    CreateFlights.new( db ).up
+    CreatePassengers.new( db ).up
+    PopulateCachePassengers.new( db ).up
+    
+    Flight.columns
+    Passenger.columns
   end
   
   def shutdown
-    CreatePassengers.down
-    CreateFlights.down
-    @onebase.feenesh
+    PopulateCachePassengers.new( db ).down
+    CreatePassengers.new( db ).down
+    CreateFlights.new( db ).down
   end
   
   def run( *args )

data/test/test_order_attribute.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 require 'clevic/order_attribute.rb'
 
-class Dummy < ActiveRecord::Base
+class Dummy < Sequel::Model
 end
 
 # need to set up a test DB, and test data for this

data/test/test_table_model.rb

@@ -1,29 +1,8 @@
 require File.dirname(__FILE__) + '/test_helper'
 require 'clevic/table_model.rb'
 
-class PopulateCachePassengers < ActiveRecord::Migration
-  def self.up
-    Passenger.create :name => 'John Anderson', :flight => Flight.find_by_number('EK211'), :row => 36, :seat => 'A', :nationality => 'UAE'
-    Passenger.create :name => 'Genie', :flight => Flight.find_by_number('CA001'), :row => 1, :seat => 'A', :nationality => 'Canada'
-    Passenger.create :name => 'Aladdin', :flight => Flight.find_by_number('CA001'), :row => 2, :seat => 'A', :nationality => 'Canada'
-  end
-  
-  def self.down
-    Passenger.delete :all
-  end
-end
-
 # need to set up a test DB, and test data for this
 class TestTableModel < Test::Unit::TestCase
-  def self.startup
-    PopulateCachePassengers.up
-  end
-  
-  def self.shutdown
-    PopulateCachePassengers.down
-  end
-  
-  
   def setup
     @table_model = Clevic::TableModel.new( )
   end