clevic 0.13.0.b9 → 0.13.0.b10

data/History.txt

@@ -1,3 +1,6 @@
+== 0.13.0.b10
+* allow better separation between Field id and attribute
+
 == 0.13.0.b6
 * switch to MrBones
 * All dependencies are now gems. bsearch is a gem. So is qtbindings.

data/lib/clevic/action_builder.rb

@@ -7,7 +7,7 @@ collections of actions more rubyish. It must have
  - separator, which returns something which is_a? Separator
  - create_action( &block ), which creates an Action object
  - action_method_or_block( action, options, &block ) which handles events
-  
+
 Menus are generally made up of a collection of actions.
 
 Once included, it's intended to be called as follows:
@@ -27,14 +27,14 @@ Once included, it's intended to be called as follows:
         action :action_row, 'New Ro&w', :shortcut => 'Ctrl+N', :method => :row
         action :action_refresh, '&Refresh', :shortcut => 'Ctrl+R', :method => :refresh
         action :action_delete_rows, 'Delete Rows', :shortcut => 'Ctrl+Delete', :method => :delete_rows
-        
+
         if $options[:debug]
           action :action_dump, 'D&ump', :shortcut => 'Ctrl+Shift+D' do
             puts model.collection[current_index.row].inspect
           end
         end
       end
-      
+
       separator
     end
   end
@@ -66,7 +66,7 @@ module ActionBuilder
       raise NotImplementedError, "#{including_module.class.name} must have an add_action method"
     end
   end
-  
+
   # Outer block for the build process.
   def build_actions( &block )
     raise 'a block must be present' if block.nil?
@@ -76,11 +76,11 @@ module ActionBuilder
       yield self
     end
   end
-  
+
   def group_names
     @group_names ||= []
   end
-  
+
   # Create and return a list of actions. The actions are grouped together,
   # ie live together on the menu with a separator between groups.
   # A method called "#{group_name}_actions" will be added to self, which will return the
@@ -94,16 +94,16 @@ module ActionBuilder
       end
     end
     self.collect_actions = []
-    
+
     yield( self )
     # copy actions to the right instance variable
     eval "@#{group_name.to_s}_actions = collect_actions"
-    
+
     # reset these, just for cleanliness
     @group_name = nil
     self.collect_actions = []
   end
-  
+
   # Create a new Action and
   # 1. pass it to add_action
   # 1. add it to the collect_actions collection.
@@ -119,7 +119,7 @@ module ActionBuilder
       if options.has_key?( :method ) && !block.nil?
         raise "you can't specify both :method and a block"
       end
-      
+
       create_action do |action|
         action.name = name.to_s
         action.text = text
@@ -131,14 +131,14 @@ module ActionBuilder
             action.send( "#{k.to_s}=", v )
           end
         end
-        
+
         # add action
         add_action action
-        
+
         # add actions for list. Yes, it's a side-effect.
         # TODO is there a better way to do this?
         collect_actions << action
-        
+
         action_method_or_block( action, options, &block )
       end
     end
@@ -150,11 +150,11 @@ protected
   def collect_actions
     @collect_actions ||= []
   end
-  
+
   def collect_actions=( arr )
     @collect_actions = arr
   end
-  
+
   # If parent doesn't define this, add it so that 
   # our action_method_or_block will work.
   unless instance_methods.include?( :action_triggered )
@@ -165,7 +165,7 @@ protected
       puts $!.backtrace
     end
   end
-  
+
 end
 
 end # Clevic

data/lib/clevic/ar_methods.rb

@@ -16,23 +16,23 @@ module Sequel
             # workaround for Sequel's refusal to do offset without limit
             # not sure we need :all for >= 3.13.0
             dataset.limit( options[:limit] || :all, value )
-          
+
           when :order
             orders = value.split(/, */ ).map do |x|
               case x
               when /^(\w+) +(asc|desc)$/i
                 $1.to_sym.send( $2 )
-                
+
               when /^\w+$/i
                 x.to_sym
-              
+
               else
                 x.lit
-                
+
               end
             end
             dataset.order( *orders )
-          
+
           when :conditions
             # this translation is not adequate for all use cases of the AR api
             # specifically where value contains a SQL expression
@@ -43,10 +43,10 @@ module Sequel
               else
                 value
               end
-              
+
               dataset.filter( possible_literal ) 
             end
-          
+
           when :include
             # this is the class to join
             joined_class = eval( model.reflections[value][:class_name] )
@@ -55,18 +55,18 @@ module Sequel
               joined_class,
               joined_class.primary_key => model.reflections[value][:key]
             ).select( model.table_name.* )
-            
+
           else
             raise "#{key} not implemented"
         # make sure at least it's unchanged, in case options is empty
         end || dataset
       end
-      
+
       rescue Exception => e
         raise RuntimeError, "#{self} #{options.inspect} #{e.message}", caller(0)
     end
   end
-  
+
   module Plugins
     module ArMethods
       # plugin :ar_methods calls this.
@@ -78,33 +78,33 @@ module Sequel
           # store model-related stuff here
         end
       end
-      
+
       module ClassMethods
         # Copy the necessary class instance variables to the subclass.
         def inherited(subclass)
           super
         end
-        
+
         def translate( options )
           dataset.translate( options )
         end
-        
+
         def find_ar( *args )
           # copied from ActiveRecord::Base.find
           options = args.extract_options!
           #~ validate_find_options(options)
           #~ set_readonly_option!(options)
-          
+
           case args.first
             when :first
               dataset.translate(options).first
-              
+
             when :last
               dataset.translate(options).last
-              
+
             when :all
               dataset.translate(options).all
-              
+
             else
               if args.size == 1
                 dataset.translate(options).filter( :id.qualify( table_name ) => args.first ).first
@@ -113,21 +113,21 @@ module Sequel
               end
           end
         end
-        
+
         def count_ar( *args )
           options = args.extract_options!
           attribute = args.first
-          
+
           dataset = dataset.translate( options )
-          
+
           unless attribute.nil?
             dataset = dataset.select( attribute )
           end
           dataset.count
         end
-        
+
       end
-      
+
       module InstanceMethods
       end
     end

data/lib/clevic/attribute_list.rb

@@ -9,7 +9,7 @@ module Clevic
       @attribute, @attribute_value, @find_options = attribute, attribute_value, find_options
     end
     attr_reader :entity_class, :attribute, :attribute_value, :find_options
-    
+
     # because Sequel::Dataset won't .filter with {}
     def conditions( dataset )
       # make sure the current attribute value is included if there's a filter
@@ -17,7 +17,7 @@ module Clevic
       if find_options.has_key?( :conditions )
         find_options[:conditions].lit | { attribute => attribute_value }
       end
-      
+
       # filter if necessary
       unless rv.nil?
         dataset.filter( rv ) 
@@ -25,7 +25,7 @@ module Clevic
         dataset
       end
     end
-    
+
     # sorts by attribute
     def dataset_by_description
       # must have attribute equality test first, otherwise if find_options
@@ -37,7 +37,7 @@ module Clevic
         .distinct
       conditions( ds )
     end
-      
+
     # sorts by first letter then most frequent, instead of pure alphabetical
     def dataset_by_frequency
       ds = entity_class.naked \
@@ -46,7 +46,7 @@ module Clevic
         .order( :substr.sql_function( attribute,1,1 ), :count.sql_function( attribute ).desc )
       conditions( ds )
     end
-    
+
     # by_frequency is the default
     def dataset( by_description, by_frequency )
       case

data/lib/clevic/cache_table.rb

@@ -24,30 +24,30 @@ TODO figure out how to handle situations where the character set ordering
 in the db and in Ruby are different.
 =end
 class CacheTable < Array
-  
+
   include OrderedDataset
-  
+
   # the number of records loaded in one call to the db
   attr_accessor :preload_count
   attr_reader :entity_class
-  
+
   def initialize( entity_class, dataset = nil )
     @preload_count = 30
     @entity_class = entity_class
     # defined in OrderAttributes
     self.dataset = dataset || entity_class.dataset
-    
+
     # size the array and fill it with nils. They'll be filled
     # in by the [] operator
     super( sql_count )
   end
-  
+
   # The count of the records according to the db, which may be different to
   # the records in the cache
   def sql_count
     dataset.count
   end
-  
+
   # Execute the block with the specified preload_count,
   # and restore the existing one when done.
   # Return the value of the block
@@ -58,28 +58,28 @@ class CacheTable < Array
     self.preload_count = old_limit
     retval
   end
-  
+
   # Fetch the entity for the given index from the db, and store it
   # in the array. Also, preload preload_count records to avoid subsequent
   # hits on the db
   def fetch_entity( index )
     # calculate negative indices for the SQL offset
     offset = index < 0 ? index + sql_count : index
-    
+
     # fetch self.preload_count records
     records = dataset.limit( preload_count, offset )
     records.each_with_index {|x,i| self[i+index] = x if !cached_at?( i+index )}
-    
+
     # return the first one
     records.first
   end
-  
+
   # return the entity at the given index. Fetch it from the
   # db if it isn't in this array yet
   def []( index )
     super( index ) || fetch_entity( index )
   end
-  
+
   # Make a new instance based on the current dataset.
   # Unless new_dataset is specified, pass the dataset
   # to the block, and use the return
@@ -93,14 +93,14 @@ class CacheTable < Array
     if new_dataset && block_given?
       raise "Passing a new dataset and a modification block doesn't make sense."
     end
-    
+
     if block_given?
       self.class.new( entity_class, block.call( dataset ) )
     else
       self.class.new( entity_class, new_dataset || dataset )
     end
   end
-  
+
   # key is what we're searching for. candidate
   # is what the current candidate is. direction is 1
   # for sorted ascending, and -1 for sorted descending
@@ -124,14 +124,14 @@ class CacheTable < Array
     # reverse the result if we're searching a desc attribute,
     # where direction will be -1
   end
-  
+
   # find the index for the given entity, using a binary search algorithm (bsearch).
   # The order_by ActiveRecord style options are used to do the binary search.
   # nil is returned if the entity is nil
   # nil is returned if the array is empty
   def index_for_entity( entity )
     return nil if size == 0 || entity.nil?
-    
+
     # only load one record at a time, because mostly we only
     # need one for the binary seach. No point in pulling several out.
     preload_limit( 1 ) do
@@ -145,10 +145,10 @@ class CacheTable < Array
           if result == 0
             # compare taking ordering direction into account
             retval = compare( entity.send( key ), candidate.send( key ), direction )
-            
+
             # exit now because we have a difference
             next( retval ) if retval != 0
-            
+
             # otherwise try with the next order attribute
             retval
           else
@@ -170,7 +170,7 @@ class Array
   def cached_at?( index )
     !at(index).nil?
   end
-  
+
   def search
     raise "not implemented"
   end

data/lib/clevic/dataset_roller.rb

@@ -7,16 +7,16 @@ module Clevic
     def initialize( original_dataset )
       @rolling_dataset = original_dataset
     end
-    
+
     def dataset
       @rolling_dataset
     end
-    
+
     def method_missing(meth, *args, &block)
       @rolling_dataset = @rolling_dataset.send( meth, *args, &block )
       self
     end
   end
-  
+
 
 end

data/lib/clevic/default_view.rb

@@ -17,7 +17,7 @@ module Clevic
         super
       end
     end
-    
+
     def title
       @title ||= entity_class.name.demodulize.tableize.humanize
     end
@@ -32,7 +32,7 @@ module Clevic
         super
       end
     end
-    
+
     def notify_data_changed( table_view, top_left_model_index, bottom_right_model_index )
       if entity_class.respond_to?( :data_changed )
         puts "Deprecated: #{entity_class.name}.data_changed( top_left, bottom_right, table_view ). Use notify_data_changed( table_view, top_left_model_index, bottom_right_model_index ) instead."
@@ -43,7 +43,7 @@ module Clevic
         super
       end
     end
-    
+
     def notify_key_press( table_view, key_press_event, current_model_index )
       if entity_class.respond_to?( :key_press_event )
         puts "Deprecated: #{entity_class.name}.key_press_event( key_press_event, current_model_index, table_view ). Use notify_key_press( table_view, key_press_event, current_model_index ) instead."
@@ -55,5 +55,5 @@ module Clevic
       end
     end
   end
-  
+
 end