clevic 0.12.0 → 0.13.0.b1

data/lib/clevic/table_view_paste.rb

@@ -0,0 +1,199 @@
+# This has all the code for handling pasting
+require 'hpricot'
+
+module Clevic
+
+class PasteError < RuntimeError
+end
+
+class TableView
+  # get something from the clipboard and put it at the current selection
+  # intended to be called by action / keyboard / menu handlers
+  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?
+      case
+      when clipboard.html?
+        paste_html
+      when clipboard.text?
+        paste_text
+      else
+        raise PasteError, "clipboard has neither text nor html, so can't paste"
+      end
+    end
+  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 =
+    if html.is_a? Hpricot::Doc
+      html
+    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
+    else
+      # throw exception if there are [col|row]span > 1
+      spans = doc.search( "//td[@rowspan > 1 || @colspan > 1]" )
+      if spans.size > 0
+        # make an itemised list of 
+        cell_list = spans.map{|x| "- #{x.inner_text}"}.join("\n")
+        raise PasteError, <<-EOF
+  Pasting will not work because source contains spanning cells.
+  If the source is a spreadsheet, you probably have merged cells
+  somewhere. Split them, and try copy and paste again.
+  Cells contain
+  #{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
+            cell.search('//text()').map( &:to_s ).join("\n")
+          else
+            # otherwise just join text elements
+            cell.search( '//text()' ).join('')
+          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 ','.
+  # if tsv doesn't work, try with csv and test for rectangularness
+  # otherwise assume it's one string.
+  # TODO could also heuristically check paste selection area
+  def paste_text
+    text = clipboard.text
+    
+    case text
+      when /\t/
+        paste_array( FasterCSV.parse( text, :col_sep => "\t" ) )
+      # assume multi-line text, or text with commas, is csv
+      when /[,\n]/
+        paste_array( FasterCSV.parse( text, :col_sep => ',' ) )
+      else
+        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 )
+    if selection_model.single_cell?
+      # only one cell selected, so paste like a spreadsheet
+      selected_index = selection_model.selected_indexes.first
+      if arr.size == 0 or ( arr.size == 1 and arr.first.size == 0 )
+        # empty array, so just clear the current selection
+        selected_index.attribute_value = nil
+      else
+        paste_to_index( selected_index, arr )
+      end
+    else
+      if arr.size == 1 && arr.first.size == 1
+        # single value to multiple selection
+        paste_value_to_selection arr.first.first
+      else
+        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|
+      index.text_value = value
+      # 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
+      change.top_left = sorted.first
+      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.
+  def paste_to_index( top_left_index, csv_arr )
+    csv_arr_size = csv_arr.size
+    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
+          cell_index = top_left_index.choppy {|i| i.row += row_index; i.column += field_index }
+          emit_status_text( "pasted #{row_index+1} of #{csv_arr_size}")
+          begin
+            cell_index.text_value = field
+          rescue
+            puts $!.message
+            puts $!.backtrace
+            show_error( $!.message )
+          end
+        else
+          emit_status_text( "#{pluralize( top_left_index.column + field_index, 'column' )} for pasting data is too large. Truncating." )
+        end
+      end
+      # 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
+      change.bottom_right = top_left_index.choppy do |i|
+        i.row += csv_arr.size - 1
+        i.column += csv_arr.first.size - 1
+      end
+    end
+  end
+  
+end
+
+end

data/lib/clevic/version.rb

@@ -1,9 +1,10 @@
 module Clevic #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 12
+    MINOR = 13
     TINY  = 0
+    PRE   = 'b1'
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, TINY, PRE].join('.')
   end
 end

data/lib/clevic/view.rb

@@ -5,79 +5,130 @@ module Clevic
   # This contains the definition of a particular view of an entity.
   # See Clevic::ModelBuilder.
   class View
-    @order = []
-    def self.order
-      @order
-    end
     
-    # Handle situations where the array passed to 
-    # Clevic::View.order = has ActiveRecord::Base
-    # objects in it. In other words, if there is one, pass back it's
-    # default view class rather than the ActiveRecord::Base subclass.
-    def self.order=( array )
-      @order = array.map do |x|
-        if x.ancestors.include?( ActiveRecord::Base )
-          x.default_view_class
+    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
+      # default view class rather than the entity_class
+      def order=( array )
+        @order = array.map do |x|
+          if x.ancestors.include?( Clevic.base_entity_class )
+            x.default_view_class
+          else
+            x
+          end
+        end
+      end
+      
+      def entity_class( *args )
+        if args.size == 0
+          @entity_class || raise( "entity_class not specified for #{name}" )
         else
-          x
+          self.entity_class = args.first
         end
       end
-    end
-    
-    def self.entity_class( *args )
-      if args.size == 0
-        @entity_class || raise( "entity_class not specified for #{name}" )
-      else
-        @entity_class = args.first
+      
+      def entity_class=( some_class )
+        @entity_class = some_class
+      end
+      
+      def widget_name( *args )
+        if args.size == 0
+          # the class name by default
+          @widget_name || name
+        else
+          @widget_name = args.first
+        end
       end
     end
     
-    def self.entity_class=( some_class )
-      @entity_class = some_class
+    # args can be anything that has a writer method. Often this
+    # will be entity_class
+    # block contains the ModelBuilder DSL
+    def initialize( args = {}, &block )
+      @define_ui_block = block
+      unless args.nil?
+        args.each do |key,value|
+          self.send( "#{key}=", value )
+        end
+      end
     end
     
-    def self.widget_name( *args )
-      if args.size == 0
-        # the class name by default
-        @widget_name || name
-      else
-        @widget_name = args.first
-      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
-      self.class.entity_class
+      @entity_class || self.class.entity_class
     end
+    attr_writer :entity_class
     
     # The title to display, eg in a tab
     def title
-      self.class.name
+      @title || self.class.name
     end
+    attr_writer :title
     
-    # used for the Qt object_name when ModelBuilder is constructing a widget
-    # here so it can be overridden by descendants
+    def fields
+      @fields ||= define_ui.fields
+    end
+    
+    # used by the framework-specific code to name widgets
     def widget_name
-      self.class.widget_name
+      @widget_name || self.class.widget_name
     end
     
-    def model_builder( &block )
-      @model_builder ||= ModelBuilder.new( self )
-      @model_builder.exec_ui_block( &block )
+    def model_builder( value = nil, &block )
+      if value.nil?
+        @model_builder ||= ModelBuilder.new( self )
+        @model_builder.exec_ui_block( &block )
+      else
+        @model_builder
+      end
     end
+    attr_writer :model_builder
     
     # return a default UI constructed from model metadata
     def define_ui
-      model_builder do
-        default_ui
+      if define_ui_block.nil?
+        # use the define_ui from Clevic::View to build a default UI
+        model_builder do
+          default_ui
+        end
+      else
+        # use the provided block
+        model_builder( &define_ui_block )
       end
     end
     
-    # define view/model specific actions
+    # callback for view/model specific actions
     def define_actions( table_view, action_builder )
     end
     
-    # notify 
+    # callback for notify 
     def notify_field( table_view, model_index )
       ndc = model_index.field.notify_data_changed
       case ndc
@@ -91,7 +142,7 @@ module Clevic
     
     # 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 Qt::ModelIndex instances)
+    # (which are include Clevic::TableIndex)
     def notify_data_changed( table_view, top_left, bottom_right )
       if top_left == bottom_right
         # shortcut to just the one, seeing as it's probably the most common
@@ -107,7 +158,7 @@ module Clevic
       end
     end
     
-    # be notified of key presses
+    # callback for key presses
     def notify_key_press( table_view, key_press_event, current_model_index )
     end
     

data/models/accounts_models.rb

@@ -1,18 +1,17 @@
 require 'clevic.rb'
 
-# db connection
-Clevic::DbOptions.connect( $options ) do
-  # use a different db for testing, so real data doesn't get broken.
-  if options[:database].nil? || options[:database].empty?
-    database( debug? ? :accounts_test : :accounts )
-  else
-    database options[:database]
-  end
-  adapter :postgresql
-  username options[:username].blank? ? 'accounts' : options[:username]
+host = ENV['PGHOST'] || 'localhost'
+$options ||= {}
+
+if respond_to?( :'jruby?' ) && jruby?
+  constring = "jdbc:postgresql://#{host}/accounts_test?user=#{$options[:username] || 'accounts'}&password=general"
+  puts "constring: #{constring.inspect}"
+  Sequel.connect( constring )
+else
+  Sequel.connect( "postgres://#{host}/accounts_test?user=#{$options[:username] || 'accounts'}&password=general" )
 end
 
-class Entry < ActiveRecord::Base
+class Entry < Sequel::Model
   belongs_to :debit, :class_name => 'Account', :foreign_key => 'debit_id'
   belongs_to :credit, :class_name => 'Account', :foreign_key => 'credit_id'
   
@@ -33,6 +32,7 @@ class Entry < ActiveRecord::Base
         end
       end
     end
+    distinct :supplier
     relational  :debit, :display => 'name', :conditions => 'active = true', :order => 'lower(name)', :sample => 'Leilani Member Loan'
     relational  :credit, :display => 'name', :conditions => 'active = true', :order => 'lower(name)', :sample => 'Leilani Member Loan'
     plain       :amount, :sample => 999999.99
@@ -49,7 +49,7 @@ class Entry < ActiveRecord::Base
   def self.update_from_description( current_index )
     return if current_index.attribute_value.nil?
     # most recent entry, ordered in reverse
-    similar = self.find(
+    similar = self.adaptor.find(
       :first,
       :conditions => ["#{current_index.attribute} = ?", current_index.attribute_value],
       :order => 'date desc'
@@ -69,7 +69,7 @@ class Entry < ActiveRecord::Base
   end
 end
 
-class Account < ActiveRecord::Base
+class Account < Sequel::Model
   has_many :debits, :class_name => 'Entry', :foreign_key => 'debit_id'
   has_many :credits, :class_name => 'Entry', :foreign_key => 'credit_id'