clevic 0.13.0.b9 → 0.13.0.b10

data/lib/clevic/swing/tag_editor.rb

@@ -8,14 +8,14 @@ class TagEditor < javax.swing.JComponent
   def initialize( field )
     super()
     @field = field
-    
+
     create_fields
     init_layout
   end
-  
+
   attr_reader :field
   attr_reader :entity
-  
+
   # Hopefully called by the editor framework
   # might be init_component
   def configureEditor( editor, entity )
@@ -34,7 +34,7 @@ class TagEditor < javax.swing.JComponent
     @add_button = javax.swing.JButton.new
     @remove_button = javax.swing.JButton.new
   end
-  
+
   def init_layout
     # This is mostly cut-n-pasted from the Netbeans Java sources. So don't tweak it.
     text_field.setName("text_field");

data/lib/clevic/swing/text_area_delegate.rb

@@ -12,7 +12,7 @@ module Clevic
       super( newrect )
     end
   end
-  
+
   class TextAreaDelegate < Delegate
     # TODO check that Ctrl-VK_ENTER stops editing
     def init_component( cell_editor )
@@ -21,23 +21,23 @@ module Clevic
       text_component.rows = ( edit_value.andand.count( "\n" ) || 0 ) + 2
       text_component.select_all
     end
-    
+
     def editor
       @editor ||= EditorScrollPane.new( text_component, javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS, javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS )
     end
-    
+
     def text_component
       @text_component ||= javax.swing.JTextArea.new
     end
-    
+
     def value
       text_component.text
     end
-    
+
     def minimal_edit
       text_component.select_all
     end
-    
+
     def needs_pre_selection?
       true
     end

data/lib/clevic/swing/text_delegate.rb

@@ -8,21 +8,21 @@ module Clevic
       editor.text = edit_value
       editor.select_all
     end
-    
+
     def editor
       @editor ||= javax.swing.JTextField.new.tap do |e|
         e.horizontal_alignment = field.swing_alignment
       end
     end
-    
+
     def value
       editor.text
     end
-    
+
     def minimal_edit
       editor.select_all
     end
-    
+
     def needs_pre_selection?
       true
     end

data/lib/clevic/table_index.rb

@@ -4,12 +4,12 @@ module Clevic
   # to be included in something that responds to model, row, column
   module TableIndex
     include FieldValuer
-    
+
     # return the Clevic::Field for this index
     def field
       @field ||= model.field_for_index( self )
     end
-    
+
     def dump
       if valid?
       <<-EOF
@@ -21,35 +21,35 @@ module Clevic
         'invalid'
       end
     end
-    
+
     def prev
       choppy( :row => row - 1 )
     end
-    
+
     # return the attribute of the underlying entity corresponding
     # to the column of this index
     def attribute
       model.attributes[column]
     end
-    
+
     # returns the list of ModelColumn metadata
     def meta
       # use the optimised version
       # TODO just use the model version instead?
       field.meta
     end
-    
+
     # return the table's field name. For associations, this would
     # be suffixed with _id
     def field_name
       meta.name
     end
-    
+
     # return the value of the field, it may be the _id value
     def field_value
       entity.send( field_name )
     end
-    
+
     # the underlying entity
     # TODO caching doesn't help with Qt because ModelIndex objects are
     # extremely short-lived. Not sure about swing.
@@ -57,9 +57,9 @@ module Clevic
       return nil if model.nil?
       model.collection[row]
     end
-    
+
     attr_writer :entity
-    
+
     # return true if validation failed for this indexes field
     def has_errors?
       # virtual fields don't have metadata
@@ -69,14 +69,14 @@ module Clevic
         entity.errors.invalid?( field_name.to_sym )
       end
     end
-    
+
     # return a collection of errors. Unlike AR, this
     # will always return an array that will have zero, one
     # or many elements.
     def errors
       [ entity.errors[field_name.to_sym] ].flatten
     end
-    
+
     # sort by row, then column
     def <=>( other )
       row_comp = self.row <=> other.row
@@ -86,11 +86,11 @@ module Clevic
         row_comp
       end
     end
-    
+
     def inspect
       "#<TableIndex (#{row},#{column}) '#{raw_value rescue "no raw value: #{$!.message}"}'>"
     end
-    
+
     # return a string (row,column)
     # suitable for displaying to users, ie 1-based not 0-based
     def rc

data/lib/clevic/table_model.rb

@@ -15,10 +15,10 @@ class TableModel
   # the CacheTable of Clevic::Record or Sequel::Model objects
   attr_reader :collection
   alias_method :cache_table, :collection
-  
+
   # the collection of Clevic::Field objects
   attr_reader :fields
-  
+
   attr_accessor :read_only
   def read_only?; read_only; end
 
@@ -26,69 +26,69 @@ class TableModel
   attr_accessor :auto_new
   def auto_new?; auto_new; end
   def auto_new?; auto_new; end
-  
+
   attr_accessor :entity_view
   attr_accessor :builder
-  
+
   # If somre or all the entities in the collection is related to a single entity
   # somewhere else, this is it. Not sure if this is the right
   # way to do it, but try anyway.
   attr_accessor :one
-  
+
   def entity_class
     entity_view.entity_class
   end
-  
+
   def fields=( arr )
     @fields = arr
-    
+
     # reset these
     @labels = nil
     @attributes = nil
   end
-  
+
   # field is a symbol or string referring to a column.
   # returns the index of that field.
   def field_column( field )
     fields.each_with_index {|x,i| return i if x.id == field.to_sym }
   end
-  
+
   def field_for_index( model_index )
     fields[model_index.column]
   end
-  
+
   def labels
     @labels ||= fields.map {|x| x.label }
   end
-  
+
   def attributes
     @attributes ||= fields.map {|x| x.attribute }
   end
-  
+
   def collection=( arr )
     @collection = arr
     # fill in an empty record for data entry
     add_new_item if collection.empty? && auto_new?
   end
-  
+
   # add a new item, and set defaults from the Clevic::View
   # add_new_item_start and add_new_item_end are provided by
   # the GUI framework-specific class
   def add_new_item
     add_new_item_start
-    
+
     entity = entity_class.new
-    
+
     # set default values without triggering changed
     fields.each do |f|
       f.set_default_for( entity ) unless f.default.nil?
     end
-    
+
     collection << entity
-    
+
     add_new_item_end
   end
-  
+
   # rows is a collection of integers specifying row indices to remove
   def remove_rows( rows )
     # don't delete rows twice
@@ -99,25 +99,25 @@ class TableModel
     removals = rows_in_order.map do |index|
       collection[index]
     end
-    
+
     remove_notify( rows_in_order ) do
       removals.each do |to_remove, index|
         # destroy the db object, and its associated table row
         to_remove.destroy unless to_remove.nil? || to_remove.new?
       end
     end
-    
+
     # because it's too bloody complicated to figure out which items
     # were deleted and then remove them from the collection. And there
     # most likely isn't a big hit for doing this, unless there's a lot
     # of cached calcuation in the entities.
     self.collection = collection.renew
-    
+
     # create a new row if auto_new is on
     # should really be in a signal handler
     add_new_item if collection.empty? && auto_new?
   end
-  
+
   # save the model at the given index, if it's dirty
   # TODO Sequel uses modified?
   def save( index )
@@ -141,7 +141,7 @@ class TableModel
     puts $!.backtrace
     emit_data_error( index, nil, $!.message )
   end
-  
+
   def reload_data( dataset = nil, &dataset_block )
     # renew cache. All records will be dropped and reloaded.
     self.collection = self.cache_table.renew( dataset, &dataset_block )
@@ -159,7 +159,7 @@ class TableModel
       start_index.field
     )
     entity = searcher.search( start_index.entity )
-    
+
     # return matched indexes
     unless entity.nil?
       found_row = collection.index_for_entity( entity )
@@ -169,12 +169,12 @@ class TableModel
       []
     end
   end
-  
+
   class DataChange
     class ModelIndexProxy
       attr_accessor :row
       attr_accessor :column
-      
+
       def initialize( other = nil )
         unless other.nil?
           @row = other.row
@@ -182,18 +182,18 @@ class TableModel
         end
       end
     end
-    
+
     def top_left
       @top_left ||= ModelIndexProxy.new
     end
-    
+
     def bottom_right
       @bottom_right ||= ModelIndexProxy.new
     end
-    
+
     attr_writer :bottom_right
     attr_writer :top_left
-    
+
     attr_reader :index
     def index=( other )
       self.top_left = ModelIndexProxy.new( other )

data/lib/clevic/table_searcher.rb

@@ -11,20 +11,20 @@ the matching record next after this.
 class TableSearcher
   include OrderedDataset
   attr_reader :search_criteria, :field
-  
+
   # dataset is a Sequel::Dataset, which has an associated Sequel::Model
   # field is an instance of Clevic::Field
   # search_criteria responds to from_start?, direction, whole_words? and search_text
   def initialize( dataset, search_criteria, field )
     raise "field must be specified" if field.nil?
     raise "unknown order #{search_criteria.direction}" unless [:forwards, :backwards].include?( search_criteria.direction )
-    
+
     self.dataset = dataset
-    
+
     @search_criteria = search_criteria
     @field = field
   end
-  
+
   # start_entity is the entity to start from, ie any record found after it will qualify
   # return the first entity found that matches the criteria
   def search( start_entity = nil )
@@ -36,12 +36,12 @@ protected
   def search_field_expression
     if field.association?
       raise "display not specified for #{field}" if field.display.nil?
-      
+
       # for related table displays as procs
       unless [String,Symbol].include?( field.display.class )
         raise( "search field #{field.inspect} cannot search lambda display" ) 
       end
-      
+
       # TODO this will only work with a path value with no dots
       # otherwise the SQL gets complicated with joins etc
       field.related_class \
@@ -52,7 +52,7 @@ protected
       field.attribute.to_sym
     end
   end
-  
+
   # return an expression, or an array or expressions for representing search_criteria.search_text and whole_words?
   def search_text_expression
     if search_criteria.whole_words?
@@ -66,7 +66,7 @@ protected
       "%#{search_criteria.search_text}%"
     end
   end
-  
+
   # Add the relevant conditions to use start_entity as the
   # entity where the search starts, ie the first one after it is found
   # start_entity is a model instance
@@ -76,12 +76,12 @@ protected
     # pure boolean expression - they need something to compare it to.
     dataset.filter( expression => true )
   end
-  
+
   # return a dataset based on dataset which filters on search_criteria
   def search_dataset( start_entity )
     likes = Array[*search_text_expression].map{|ste| Sequel::SQL::StringExpression.like(search_field_expression, ste, {:case_insensitive=>true})}
     rv = dataset.filter( Sequel::SQL::BooleanExpression.new(:OR, *likes ) )
-    
+
     # if we're not searching from the start, we need
     # to find the next match. Which is complicated from an SQL point of view.
     unless search_criteria.from_start?
@@ -89,25 +89,25 @@ protected
       # build up the ordering conditions
       rv = find_from( rv, start_entity )
     end
-    
+
     # reverse order by direction if necessary
     rv = rv.reverse if search_criteria.direction == :backwards
-    
+
     # return dataset
     rv
   end
-  
+
   # recursively create a case statement to do the comparison
   # because and ... and ... and filters on *each* one rather than
   # consecutively.
   def build_recursive_comparison( start_entity, index = 0 )
     # end recursion
     return false if index == order_attributes.size
-    
+
     # fetch the current order attribute and direction
     attribute, direction = order_attributes[index]
     value = start_entity.send( attribute )
-    
+
     # build case statement using Sequel expressions, including recursion
     # pseudo-SQL is
     # case
@@ -115,7 +115,7 @@ protected
     #   when attribute = value then #{build_recursive_comparison( operator, index+1 )}
     #   else false
     # end
-    
+
     {
       # if values are unequal, comparison levels end here
       attribute.identifier.send( comparator(direction), value ) => true,
@@ -123,7 +123,7 @@ protected
       { attribute => value } => build_recursive_comparison( start_entity, index+1 )
     }.case( false ) # the else (default) clause, ie we don't want to see these records
   end
-  
+
   # return either > or < depending on both search_criteria.direction
   # and local_direction
   def comparator( local_direction = 1 )
@@ -132,11 +132,11 @@ protected
       when :forwards; 1
       when :backwards; -1
     end * local_direction
-    
+
     # 1 indexes >, -1 indexes <
     ['','>','<'][comparator_direction]
   end
-  
+
 end
 
 end