clevic 0.13.0.b3 → 0.13.0.b5

data/lib/clevic/qt/ui/search_dialog_ui.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'search_dialog.ui'
 **
-** Created: Mon Jan 24 21:13:34 2011
+** Created: Mon Jan 31 16:10:23 2011
 **      by: Qt User Interface Compiler version 4.5.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/clevic/rails_models_loaders.rb

@@ -1,5 +1,18 @@
 require 'active_support'
 
+def subclasses( base )
+  classes = []
+  ObjectSpace.each_object( Class ) do |x|
+    if x.ancestors.include?( base )
+      case
+        when x == Clevic.base_entity_class; # don't include this
+        else; classes << x
+      end
+    end
+  end
+  classes.sort{|a,b| a.name <=> b.name}
+end
+
 def load_rails_models( root, config, models )
   # initialize Rails
   load config / 'environment.rb'

data/lib/clevic/record.rb

@@ -30,11 +30,11 @@ module Clevic
         # keep track of the order in which views are
         # defined, so that can be used as the default ordering
         # of the views.
-        Clevic::View.order << default_view_class_name.constantize
+        Clevic::View.order << eval( default_view_class_name )
       end
       
       def default_view_class
-        @default_view_class ||= eval default_view_class_name
+        @default_view_class ||= eval( default_view_class_name )
       end
       
       # Need to defer the execution of the view definition block

data/lib/clevic/sampler.rb

@@ -3,65 +3,98 @@ require 'andand'
 
 module Clevic
 
-# Calculate a string sample for a particular Field
+# This is used as part of the process of calculating the width
+# of a field in the UI. Since the font is important, this computes
+# a string value for a field that can be given to the font metrics
+# for a framework. Uses various heuristics to compute the string
+# values for different kinds of fields.
 class Sampler
-  def initialize( entity_class, field_name, display, &block )
-    @entity_class = entity_class
-    @field_name = field_name
-    @display = display
-    @format_block = block
+  # display is only used for relational fields
+  def initialize( field, &format_block )
+    @field = field
+    @format_block = format_block
   end
-  
-  attr_reader :entity_class, :field_name, :display
-  
+  attr_reader :field
+
+  def entity_class
+    field.entity_class
+  end
+
+  def field_name
+    field.attribute
+  end
+
+  def display
+    field.display
+  end
+
   def meta
-    @meta ||= entity_class.meta[field_name]
+    field.meta
   end
-  
+
   # return a string which is representative of the width of the field
   def compute
-    case meta.type
-    when :string, :text
-      string_sample
-    
-    when :date, :time, :datetime, :timestamp
-      date_time_sample
-    
-    when :numeric, :decimal, :integer, :float
-      numeric_sample
-    
-    # TODO return a width, or something like that
-    when :boolean; 'W'
-    
-    when :many_to_one
-      related_sample
-    
+    if field.set
+      # choose the longest value in the set
+      set = field.set_for( entity_class.first )
+      if set.is_a?( Hash )
+        set.values
+      else
+        set
+      end. \
+      max{|a,b| a.to_s.length <=> b.to_s.length }.upcase
     else
-      if meta.type != NilClass
-        raise "Sampler#compute can't figure out sample for #{entity_class.name}.#{field_name} because it's a #{meta.type.inspect}"
+      # choose samples based on the type of the field
+      case meta.type
+      when :boolean
+        field.label
+
+      when :string, :text
+        string_sample
+
+      when :date, :time, :datetime, :timestamp
+        date_time_sample
+
+      when :numeric, :decimal, :integer, :float
+        numeric_sample
+
+      # TODO return a width, or something like that
+      when :boolean; 'W'
+
+      when :many_to_one
+        related_sample
+
+      else
+        if meta.type != NilClass
+          raise "Sampler#compute can't figure out sample for #{entity_class.name}.#{field_name} because it's a #{meta.type.inspect}"
+        end
       end
-    
     end
   end
-  
+
   def do_format( value )
     @format_block.call( value )
   end
-  
+
   # default to max length of 20
   def string_sample
     'N' * ( entity_class.max( :length.sql_function( field_name ) ).andand.to_i || 20 )
   end
   
-  def date_time_sample
-    sample_date = entity_class \
+  def sample_date_time
+    ds = entity_class \
       .filter( ~{ field_name => nil } ) \
       .select( field_name ) \
-      .limit(1) \
-      .single_value
-    ;
+      .limit(1)
+    # can't use single-value here because the typecast_on_load
+    # isn't called unless we access the value via the entity object
+    ds.first.send( field_name )
+  end
+  
+  def date_time_sample
     # replace all letters with 'N'
-    do_format( sample_date || Date.today ).gsub( /[[:alpha:]]/, 'N' )
+    # and numbers with 8
+    do_format( sample_date_time || Date.today ).andand.gsub( /[[:alpha:]]/, 'N' ).gsub( /\d/, '8' )
   end
   
   def numeric_sample
@@ -71,9 +104,22 @@ class Sampler
     '9' * ( max_length || 5 )
   end
   
+  # Hmm. The first reified exemplar of a relational nested Field
+  class VirtualField
+    def initialize( entity_class, display )
+      @entity_class, @display = entity_class, display
+    end
+    
+    def entity_class; @entity_class; end
+    def attribute; @display; end
+    def display; nil; end
+    def meta; @entity_class.meta[attribute]; end
+    def set; nil; end
+  end
+  
   def related_sample
     if display.respond_to?( :to_sym )
-      Sampler.new( eval( meta.class_name ), display.to_sym, nil, &@format_block ).compute
+      Sampler.new( VirtualField.new( eval( meta.class_name ), display.to_sym ), &@format_block ).compute
     end
   end
 end

data/lib/clevic/sequel_ar_adapter.rb

@@ -123,6 +123,7 @@ end
 module Sequel
   class Model
     class << self
+      # for translating class methods for relations
       def translate_options( options )
         options[:key] = options[:foreign_key].andand.to_sym
         options.delete( :foreign_key )
@@ -150,18 +151,6 @@ module Sequel
         end
       end
       
-      def table_exists?
-        db.table_exists?( implicit_table_name )
-      end
-      
-      def column_names
-        columns
-      end
-      
-      def reflections
-        association_reflections 
-      end
-      
       def has_attribute?( attribute )
         column_names.include?( attribute )
       end
@@ -182,22 +171,6 @@ module Sequel
       end
     end
     
-    def readonly?
-      false
-    end
-    
-    def changed?
-      modified?
-    end
-    
-    def new_record?; new?; end
-    
-    class Errors
-      def invalid?( field_name )
-        self.has_key?( field_name )
-      end
-    end
-    
     module Associations
       class ManyToOneAssociationReflection
         # return class for this side of the association

data/lib/clevic/sequel_clevic.rb

@@ -0,0 +1,68 @@
+require 'sequel'
+
+module Sequel
+  module Plugins
+    # This is used by Clevic to talk to models. It's here because
+    # I'd rather keep some kind of layer in case it's necessary
+    # to become more pluggable in relation to ORM frameworks.
+    module Clevic
+      def self.configure(model, options = {})
+        model.instance_eval do
+          # store model-related stuff here
+        end
+      end
+      
+      module ClassMethods
+        # Copy the necessary class instance variables to the subclass.
+        def inherited(subclass)
+          super
+        end
+        
+        # This doesn't really belong here, but I don't want to make 
+        # a whole new plugin.
+        def table_exists?
+          db.table_exists?( implicit_table_name )
+        end
+        
+        # Hmm, maybe these need to go in a different plugin
+        def column_names
+          columns
+        end
+        
+        # Getting heavy enough, yet?
+        def reflections
+          association_reflections 
+        end
+        
+      end
+      
+      module InstanceMethods
+        # This should also go in another plugin
+        def changed?
+          modified?
+        end
+        
+        def readonly?
+          false
+        end
+      
+        def new_record?
+          new?
+        end
+      end
+    end
+  end
+end
+
+Sequel::Model.plugin :clevic
+
+# This doesn't seem to work inside the plugin
+module Sequel
+  class Model
+    class Errors
+      def invalid?( field_name )
+        self.has_key?( field_name )
+      end
+    end
+  end
+end

data/lib/clevic/sequel_meta.rb

@@ -15,19 +15,6 @@ module Sequel
       end
       
       module ClassMethods
-        # Copy the necessary class instance variables to the subclass.
-        def inherited(subclass)
-          super
-          #~ store = @cache_store
-          #~ ttl = @cache_ttl
-          #~ cache_ignore_exceptions = @cache_ignore_exceptions
-          #~ subclass.instance_eval do
-            #~ @cache_store = store
-            #~ @cache_ttl = ttl
-            #~ @cache_ignore_exceptions = cache_ignore_exceptions
-          #~ end
-        end
-        
         def meta
           if @meta.nil?
             @meta = {}
@@ -54,6 +41,7 @@ module Sequel
             meta.values.map( &:keys ).include?( [ column ] )
           end
         end
+
       end
       
       module InstanceMethods

data/lib/clevic/subclasses.rb

@@ -0,0 +1,18 @@
+# copied from http://snippets.dzone.com/posts/show/2992
+class Object
+  def self.subclasses(direct = false)
+    classes = []
+    if direct
+      ObjectSpace.each_object(Class) do |c|
+        next unless c.superclass == self
+        classes << c
+      end
+    else
+      ObjectSpace.each_object(Class) do |c|
+        next unless c.ancestors.include?(self) and (c != self)
+        classes << c
+      end
+    end
+    classes
+  end
+end

data/lib/clevic/swing.rb

@@ -2,7 +2,7 @@
   Require this file to do Clevic in Swing with JRuby
 =end
 
-require 'pathname'
+require 'clevic/framework'
 
 # This seems to be required for jruby-1.5.x (at least for 1.5.2)
 require 'java'
@@ -12,6 +12,7 @@ require 'clevic/swing/table_model.rb'
 require 'clevic/swing/table_view.rb'
 
 # all other files in the swing subdirectory
+require 'pathname'
 ( Pathname.new( __FILE__ ).parent + 'swing' ).children.grep( /.rb$/ ).each do |child|
   require child.to_s
 end

data/lib/clevic/swing/action.rb

@@ -4,10 +4,22 @@ module Clevic
 
 class Action
   include Gather
-  property :shortcut, :method, :handler, :tool_tip, :visible, :name, :text, :checkable
+  property :shortcut, :method, :handler, :tool_tip, :visible
+  property :name, :text, :checkable, :enabled
+  
+  # Needed to enable / disable accelerators on the fly.
+  def enabled=( bool )
+    # test for @menu_item instead of the method to
+    # work around Swing Stupidity. See comments in menu_item.
+    menu_item.enabled = bool unless @menu_item.nil?
+    @enabled = bool
+  end
   
   def initialize( parent, options = {}, &block )
     @parent = parent
+    @enabled = true
+    
+    # work around the Swing Stupidity detailed in enabled=
     gather( options, &block )
   end
   attr_reader :parent, :menu_item
@@ -16,6 +28,10 @@ class Action
     text.gsub( /&/, '' )
   end
   
+  def object_name
+    name.to_s
+  end
+  
   # find the java.awt.event.KeyEvent::VK constant
   # for the letter after the &. Then set it on the item's
   # mnemonic. Because JMenuItem.setMnemonic won't take a nil
@@ -41,6 +57,12 @@ class Action
         javax.swing.JMenuItem.new
       end
       
+      # Menu item always enabled, until later.
+      # Otherwise it prevents the assignment
+      # of an accelerator key. So we have to
+      # work around yet another Swing stupidity.
+      menu_item.enabled = true
+      
       menu_item.text = plain_text
       menu_item.mnemonic = mnemonic if mnemonic
       menu_item.accelerator = parse_shortcut( shortcut ) unless shortcut.nil?
@@ -48,6 +70,10 @@ class Action
       menu_item.add_action_listener do |event|
         handler.call( event )
       end
+      
+      # Put this at the end so it doesn't interfere with the
+      # keystroke assignment Swing Stupidity.
+      menu_item.enabled = enabled
     end
     @menu_item
   end
@@ -92,7 +118,6 @@ class Action
           
         else
           keystring = javax.swing.KeyStroke.getKeyStroke( java.lang.Character.new( last.to_char ), modifier_mask ).toString
-          puts "keystring: #{keystring.inspect}"
           # have to do this conversion for Mac OS X
           javax.swing.KeyStroke.getKeyStroke( keystring.gsub( /typed/, 'pressed' ) )
       end
@@ -103,7 +128,6 @@ class Action
       raise "too many options for #{sequence}: #{found.inspect}" if found.size != 1
       javax.swing.KeyStroke.getKeyStroke( eval( "java.awt.event.KeyEvent::#{found.first}" ), modifier_mask )
     end
-    puts "keystroke: #{keystroke.inspect}"
     keystroke || raise( "unknown keystroke #{sequence} => #{modifiers.inspect} #{last}" )
   end
 end