clevic 0.13.0.b9 → 0.13.0.b10

data/lib/clevic/table_view_paste.rb

@@ -12,7 +12,7 @@ class TableView
   def paste
     busy_cursor do
       sanity_check_read_only
-      
+
       # Try text/html then text/plain as tsv or csv
       # LATER maybe use the java-native-application at some point for
       # cut'n'paste internally?
@@ -28,14 +28,14 @@ class TableView
   rescue PasteError => e
     show_error e.message
   end
-  
+
   # Paste suitable html to the selection
   # Check for presence of tr tags, and make sure there are no colspan or rowspan attributes
   # on td tags.
   def paste_html
     emit_status_text "Fetching data."
     html = clipboard.html
-    
+
     # This should really be factored out somewhere and tested thoroughly
     emit_status_text "Analysing data."
     doc =
@@ -44,7 +44,7 @@ class TableView
     else
       Hpricot.parse( html )
     end
-    
+
     # call the plain text paste if we don't have tabular data
     if doc.search( "//tr" ).size == 0
       paste_text
@@ -62,13 +62,13 @@ class TableView
   #{cell_list}
         EOF
       end
-      
+
       # run through the tabular data and convert to simple array
       emit_status_text "Pasting data."
       ary = ( doc / :tr ).map do |row|
         ( row / :td ).map do |cell|
           # trim leading and trailing \r\n\t
-          
+
           # check for br
           unless cell.search( '//br' ).empty?
             # treat br as separate lines
@@ -79,11 +79,11 @@ class TableView
           end.gsub( /^[\r\n\t]*/, '').gsub( /[\r\n\t]*$/, '')
         end
       end
-      
+
       paste_array ary
     end
   end
-  
+
   # LATER probably need a PasteParser or something, to figure
   # out if a file is tsv or csv
   # Try tsv first, because number formats often have embedded ','.
@@ -92,7 +92,7 @@ class TableView
   # TODO could also heuristically check paste selection area
   def paste_text
     text = clipboard.text
-    
+
     case text
       when /\t/
         paste_array( CSV.parse( text, :col_sep => "\t" ) )
@@ -103,7 +103,7 @@ class TableView
         paste_value_to_selection( text )
     end
   end
-  
+
   # Paste array to either a single selection or a matching multiple selection
   # TODO Check for rectangularness, ie csv_arr.map{|row| row.size}.uniq.size == 1
   def paste_array( arr )
@@ -124,21 +124,21 @@ class TableView
         if selection_model.ranges.size != 1
           raise PasteError, "Can't paste tabular data to multiple selection."
         end
-        
+
         if selection_model.ranges.first.height != arr.size
           raise PasteError, "Height of paste area (#{selection_model.ranges.first.height}) doesn't match height of data (#{arr.size})."
         end
-        
+
         if selection_model.ranges.first.width != arr.first.size
           raise PasteError, "Width of paste area (#{selection_model.ranges.first.width}) doesn't match width of data (#{arr.first.size})."
         end
-        
+
         # size is the same, so do the paste
         paste_to_index( selected_index, arr )
       end
     end
   end
-  
+
   # set all indexes in the selection to the value
   def paste_value_to_selection( value )
     selection_model.selected_indexes.each do |index|
@@ -146,7 +146,7 @@ class TableView
       # save records to db via view, so we get error messages
       save_row( index )
     end
-    
+
     # notify of changed data
     model.data_changed do |change|
       sorted = selection_model.selected_indexes.sort
@@ -154,7 +154,7 @@ class TableView
       change.bottom_right = sorted.last
     end
   end
-  
+
   # Paste an array to the index, replacing whatever is at that index
   # and whatever is at other indices matching the size of the pasted
   # csv array. Create new rows if there aren't enough.
@@ -163,7 +163,7 @@ class TableView
     csv_arr.each_with_index do |row,row_index|
       # append row if we need one
       model.add_new_item if top_left_index.row + row_index >= model.row_count
-      
+
       row.each_with_index do |field, field_index|
         unless top_left_index.column + field_index >= model.column_count
           # do paste
@@ -183,7 +183,7 @@ class TableView
       # save records to db via view, so we get error messages
       save_row( top_left_index.choppy {|i| i.row += row_index; i.column = 0 } )
     end
-    
+
     # make the gui refresh
     model.data_changed do |change|
       change.top_left = top_left_index
@@ -193,7 +193,7 @@ class TableView
       end
     end
   end
-  
+
 end
 
 end

data/lib/clevic/version.rb

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

data/lib/clevic/view.rb

@@ -5,28 +5,28 @@ module Clevic
   # This contains the definition of a particular view of an entity.
   # See Clevic::ModelBuilder.
   class View
-    
+
     class << self
       def define_ui_block( &block )
         @define_ui_block ||= block
       end
-      
+
       def order
         @order ||= []
       end
-      
+
       # sometimes order has duplicates. So this is all unique
       # defined views in order of definition, or as specified.
       def views
         order.uniq
       end
-      
+
       def []( view_name )
         order.find do |view|
           view.name =~ /#{view_name.to_s}/i
         end
       end
-      
+
       # Handle situations where the array passed to 
       # Clevic::View.order has entity_class
       # objects in it. In other words, if there is one, pass back it's
@@ -40,7 +40,7 @@ module Clevic
           end
         end
       end
-      
+
       def entity_class( *args )
         if args.size == 0
           @entity_class || raise( "entity_class not specified for #{name}" )
@@ -48,11 +48,11 @@ module Clevic
           self.entity_class = args.first
         end
       end
-      
+
       def entity_class=( some_class )
         @entity_class = some_class
       end
-      
+
       def widget_name( *args )
         if args.size == 0
           # the class name by default
@@ -62,7 +62,7 @@ module Clevic
         end
       end
     end
-    
+
     # args can be anything that has a writer method. Often this
     # will be entity_class
     # block contains the ModelBuilder DSL
@@ -74,33 +74,33 @@ module Clevic
         end
       end
     end
-    
+
     # use block from constructor, or class ui block from eg Clevic::Record
     def define_ui_block
       @define_ui_block || self.class.define_ui_block
     end
-    
+
     # For descendants to override easily
     def entity_class
       @entity_class || self.class.entity_class
     end
     attr_writer :entity_class
-    
+
     # The title to display, eg in a tab
     def title
       @title || self.class.name
     end
     attr_writer :title
-    
+
     def fields
       @fields ||= define_ui.fields
     end
-    
+
     # used by the framework-specific code to name widgets
     def widget_name
       @widget_name || self.class.widget_name
     end
-    
+
     def model_builder( value = nil, &block )
       if value.nil?
         @model_builder ||= ModelBuilder.new( self )
@@ -110,7 +110,7 @@ module Clevic
       end
     end
     attr_writer :model_builder
-    
+
     # return a default UI constructed from model metadata
     def define_ui
       if define_ui_block.nil?
@@ -123,23 +123,23 @@ module Clevic
         model_builder( &define_ui_block )
       end
     end
-    
+
     # callback for view/model specific actions
     def define_actions( table_view, action_builder )
     end
-    
+
     # callback for notify 
     def notify_field( table_view, model_index )
       ndc = model_index.field.notify_data_changed
       case ndc
         when Proc
           ndc.call( self, table_view, model_index )
-          
+
         when Symbol
           send( ndc, table_view, model_index )
       end
     end
-    
+
     # Define data changed events. Default is to call notify_data_changed
     # for each field in the rectangular area defined by top_left and bottom_right
     # (which are include Clevic::TableIndex)
@@ -157,10 +157,10 @@ module Clevic
         end
       end
     end
-    
+
     # callback for key presses
     def notify_key_press( table_view, key_press_event, current_model_index )
     end
-    
+
   end
 end

data/models/accounts_models.rb

@@ -16,9 +16,9 @@ db.test_connection
 class Entry < Sequel::Model
   many_to_one :debit, :class_name => 'Account', :key => :debit_id
   many_to_one :credit, :class_name => 'Account', :key => :credit_id
-  
+
   include Clevic::Record
-  
+
   define_ui do
     plain       :date, :sample => '88-WWW-99'
     distinct    :supplier do |f|
@@ -28,7 +28,7 @@ class Entry < Sequel::Model
       f.notify_data_changed = lambda do |entity_view, table_view, model_index|
         if model_index.entity.credit.nil? && model_index.entity.debit.nil?
           entity_view.update_from_description( model_index )
-          
+
           # move edit cursor to amount field
           table_view.selection_model.clear
           table_view.override_next_index( model_index.choppy( :column => :amount ) )
@@ -43,10 +43,10 @@ class Entry < Sequel::Model
     plain       :cheque_number
     plain       :active, :sample => 'WW'
     plain       :vat, :label => 'VAT', :sample => 'WW', :tooltip => 'Does this include VAT?'
-    
+
     dataset.order( :date, :id )
   end
-  
+
   # Copy the values for the credit and debit fields
   # from the previous similar entry with a similar description
   def self.update_from_description( current_index )
@@ -56,13 +56,13 @@ class Entry < Sequel::Model
       filter( current_index.attribute.to_sym => current_index.attribute_value ). \
       order( :date.desc ). \
       first
-      
+
     if similar != nil
       # set the values
       current_index.entity.debit = similar.debit
       current_index.entity.credit = similar.credit
       current_index.entity.category = similar.category
-      
+
       # emit signal to that whole row has changed
       current_index.model.data_changed do |change|
         change.top_left = current_index.choppy( :column => 0 )
@@ -75,9 +75,9 @@ end
 class Account < Sequel::Model
   one_to_many :debits, :class_name => 'Entry', :key => :debit_id, :order => :date
   one_to_many :credits, :class_name => 'Entry', :key => :credit_id, :order => :date
-  
+
   include Clevic::Record
-  
+
   # define how fields are displayed
   define_ui do
     plain       :name
@@ -86,7 +86,7 @@ class Account < Sequel::Model
     plain       :pastel_number, :alignment => :right, :label => 'Pastel'
     plain       :fringe, :format => "%.1f"
     plain       :active
-    
+
     dataset.order( :name, :account_type )
   end
 end

data/models/examples.rb

@@ -31,10 +31,10 @@ See also Clevic::ModelBuilder and Clevic::Field
 
 == 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
 

data/models/times_models.rb

@@ -11,7 +11,7 @@ class Entry < Sequel::Model
   many_to_one :invoice
   many_to_one :activity
   many_to_one :project
-  
+
   # spans of time more than 8 ours are coloured violet
   # because they're often the result of typos.
   def time_color
@@ -19,21 +19,21 @@ class Entry < Sequel::Model
     # 8 hours
     '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-WWW-08'
-    
+
     # The project field
     relational :project do |field|
       field.display = :project
       field.dataset.filter( :active => true ).order{ lower(project) }
-      
+
       # handle data changed events. In this case,
       # auto-fill-in the invoice field.
       field.notify_data_changed do |entity_view, table_view, model_index|
@@ -45,31 +45,31 @@ class Entry < Sequel::Model
         end
       end
     end
-    
+
     relational  :invoice do |f|
       f.display 'invoice_number'
       f.dataset.filter( :status => 'not sent' ).order( :invoice_number )
     end
-    
+
     # call time_color method for foreground color value
     plain       :start, :foreground => :time_color, :tooltip => :time_tooltip
-    
+
     # another way to call time_color method for foreground color value
     plain       :end, :foreground => lambda{|x| x.time_color}, :tooltip => :time_tooltip
-    
+
     # multiline text
     text        :description, :sample => 'This is a long string designed to hold lots of data and description'
-    
+
     relational :activity do |f|
       f.display    'activity'
       f.sample     'Troubleshooting'
       f.dataset.filter( :active => true ).order{ lower(activity) }
     end 
-    
+
     distinct    :module, :tooltip => 'Module or sub-project'
     plain       :charge, :tooltip => 'Is this time billable?'
     distinct    :person, :default => 'John', :tooltip => 'The person who did the work'
-    
+
     dataset.order( :date, :start, :id )
   end
 
@@ -77,11 +77,11 @@ class Entry < Sequel::Model
     action_builder.action :smart_copy, 'Smart Copy', :shortcut => 'Ctrl+"' do
       smart_copy( view )
     end
-    
+
     action_builder.action :invoice_from_project, 'Invoice from Project', :shortcut => 'Ctrl+Shift+I' do
       invoice_from_project( view, view.current_index ) do
         # execute the block if the invoice is changed
-        
+
         # save this before selection model is cleared
         current_index = view.current_index
         view.selection_model.clear
@@ -89,35 +89,35 @@ class Entry < Sequel::Model
       end
     end
   end
-  
+
   # do a smart copy from the previous line
   def self.smart_copy( view )
     view.sanity_check_read_only
     view.sanity_check_ditto
-    
+
     # need a reference to current_index here, because selection_model.clear will
     # invalidate view.current_index. And anyway, its shorter and easier to read.
     current_index = view.current_index
     if current_index.row >= 1
       # fetch previous item
       previous_item = view.model.collection[current_index.row - 1]
-      
+
       # copy the relevant fields
       current_index.entity.date = previous_item.date if current_index.entity.date.nil?
       # depends on previous line
       current_index.entity.start = previous_item.end if current_index.entity.date == previous_item.date
-      
+
       # copy rest of fields
       [:project, :invoice, :activity, :module, :charge, :person].each do |attr|
         current_index.entity.send( "#{attr.to_s}=", previous_item.send( attr ) )
       end
-      
+
       # tell view to update
       view.model.data_changed do |change|
         change.top_left = current_index.choppy( :column => 0 )
         change.bottom_right = current_index.choppy( :column => view.model.fields.size - 1 )
       end
-      
+
       # move to the first empty time field
       next_field =
       if current_index.entity.start.nil?
@@ -125,7 +125,7 @@ class Entry < Sequel::Model
       else
         :end
       end
-      
+
       # next cursor location
       view.selection_model.clear
       view.current_index = current_index.choppy( :column => next_field )
@@ -142,10 +142,10 @@ class Entry < Sequel::Model
       unless invoice.nil?
         # make a reference to the invoice
         current_index.entity.invoice = invoice
-        
+
         # update view from top_left to bottom_right
         table_view.model.data_changed( current_index.choppy( :column => :invoice ) )
-        
+
         unless block.nil?
           if block.arity == 1
             block.call( invoice )
@@ -156,14 +156,14 @@ class Entry < Sequel::Model
       end
     end
   end
-  
+
 end
 
 class Invoice < Sequel::Model
   include Clevic::Record
-  
+
   one_to_many :entries
-  
+
   define_ui do
     plain :date
     distinct :client
@@ -173,7 +173,7 @@ class Invoice < Sequel::Model
     plain :quote_date, :format => '%d-%b-%y', :edit_format => '%d-%b-%Y', :tooltip => 'the date and time when the quote was supplied', :default => lambda{|x| DateTime.now}
     plain :quote_amount
     plain :description
-    
+
     dataset.order( :invoice_number )
   end
 end
@@ -182,17 +182,17 @@ class Project < Sequel::Model
   one_to_many :entries
 
   include Clevic::Record
-  
+
   define_ui do
     plain     :project
     plain     :description
     distinct  :client
     plain     :rate
     plain     :active
-    
+
     dataset.order( :project )
   end
-  
+
   # Return the latest invoice for this project
   # Not part of the UI.
   def latest_invoice
@@ -207,12 +207,12 @@ class Activity < Sequel::Model
   one_to_many :entries
 
   include Clevic::Record
-  
+
   # define how fields are displayed
   define_ui do
     plain :activity
     plain :active
-    
+
     dataset.order( :activity )
   end
 end