clevic 0.5.1 → 0.5.2

data/Manifest.txt

@@ -27,4 +27,5 @@ lib/clevic/ui/search_dialog.ui
 lib/clevic/ui/search_dialog_ui.rb
 sql/accounts.sql
 sql/times.sql
+template/jamis.rb
 times_models.rb

data/README.txt

@@ -45,7 +45,7 @@ Right now, models must be defined in Ruby. The framework provides
 an easy Rails-migrations-like syntax for that.
 Start with account_models.rb and times_models.rb, with associated SQL
 schemas in the sql subdirectory. For implementation and more extensive
-comments, see Browser and EntryBuilder.
+comments, see Clevic::Browser and Clevic::ModelBuilder.
 
 == PROBLEMS:
 
@@ -57,10 +57,14 @@ See TODO file.
 
 == REQUIREMENTS:
 
+=== Gems
 * fastercsv
 * ruby-qt4
-* bsearch
 * active_record
+
+=== Other
+
+* bsearch (http://0xcc.net/ruby-bsearch)
 * active_record/dirty (included)
 * db driver (ie postgres-pr)
 * rdbms (ie postgres)

data/Rakefile

@@ -4,9 +4,16 @@ require 'hoe'
 require 'lib/clevic/version.rb'
 require 'pathname'
 
-Hoe.new( 'clevic', Clevic::VERSION ) do |s|
+$hoe = Hoe.new( 'clevic', Clevic::VERSION ) do |s|
 	s.author     = "John Anderson"
 	s.email      = "john at semiosix dot com"
+	s.rubyforge_name = 'clevic'
+	s.extra_deps = [
+    ['qtext', '>=0.2.0'],
+    ['activerecord', '>=2.0.2']
+    # This isn't always installed from gems
+    #~ ['qtruby4', '>=1.4.9']
+  ]
 end
 
 # generate a _ui.rb filename from a .ui filename
@@ -98,3 +105,20 @@ MODELS_LIST.each do |model_file|
 end
 
 task :package => :ui
+
+# redefine this from the Hoe-1.7.0 sources to use
+# the jamis template.
+Rake::RDocTask.new(:docs) do |rd|
+  rd.main = "README.txt"
+  rd.options << '-d' if RUBY_PLATFORM !~ /win32/ and `which dot` =~ /\/dot/ and not ENV['NODOT']
+  rd.rdoc_dir = 'doc'
+  rd.template = 'template/jamis.rb'
+  files = $hoe.spec.files.grep($hoe.rdoc_pattern)
+  files -= ['Manifest.txt']
+  rd.rdoc_files.push(*files)
+
+  title = "#{$hoe.name}-#{$hoe.version} Documentation"
+  title = "#{$hoe.rubyforge_name}'s " + title if $hoe.rubyforge_name != $hoe.name
+
+  rd.options << "-t #{title}"
+end

data/TODO

@@ -4,13 +4,13 @@ Times look up invoice for project leaves the wrong fields highlighted, and focus
 
 Using F4 to open list, and then selecting from the combo and exiting using Return (or tab?) doesn't set the correct value
 wrap description, and allow Access-style zooming
-Undo deletes and other commands. Possibly via ActiveRecord callbacks.
+Undo deletes and other commands. Possibly via ActiveRecord callbacks?
 
 Keep a history of changes, ie xy, new. xy, changed. x,y copied etc.
 
 OSX
 ---
-Check that qtruby4 runs on OSX and so does Clevic. It does. Very slowly on Leilani's Mini.
+Check that qtruby4 runs on OSX and so does Clevic. It does. Very slowly on Mac Mini with Motorola.
 
 windows
 -------
@@ -89,16 +89,16 @@ preferences
 -----------
 store previous searches, by model & app
 
-
 maybe
 -----
-use rubigen for creating apps
+use rubigen for creating model definition files
 allow moving of rows
 discontiguous copying of entities/csv
 multi-row copying
 pasting of csv, into rectangular regions
 collect a set of data requests to the model, and do them in one SQL query. See EntryTableView#moveCursor
 Use SQL cursors for find & find_next?
+Use roo to parse spreadsheets?
 
 Accounts
 --------
@@ -110,22 +110,3 @@ Times
 
 warnings on overlap times (in status bar)
 warnings on large intervals (in status bar)
-
-db
---
-
-times
-
-alter table invoices rename column type to billing;
-alter table entries add primary key (id);
-alter table entries alter column id set not null
-select max(id) from entries;
-create sequence entries_id_seq start with 11694;
-alter table entries alter column id set default nextval('entries_id_seq');
-update entries set module = null where module = '';
-update entries set module = 'admin' where module = 'Admin';
-
-alter table projects rename active to old_active;
-alter table projects add column active boolean;
-update projects set active = ( old_active = 1 );
-alter table projects drop column old_active;

data/bin/clevic

@@ -3,7 +3,6 @@
 require 'clevic/browser.rb'
 require 'ruby-debug'
 
-# fetch command line options
 require 'optparse'
 
 # find and require variations on file_path
@@ -13,6 +12,15 @@ end
   
 $options = {}
 oparser = OptionParser.new
+oparser.banner = <<BANNER
+Usage: #{File.basename($0)} [options] model_definition_file
+
+model_definition_file, \#{model_definition_file}_models.rb will be searched for.
+
+Options are:
+BANNER
+oparser.separator ''
+
 oparser.on( '-H', '--host HOST', 'RDBMS host', String ) { |o| $options[:host] = o }
 oparser.on( '-u', '--user USERNAME', String ) { |o| $options[:user] = o }
 oparser.on( '-p', '--pass PASSWORD', String ) { |o| $options[:password] = o }
@@ -37,21 +45,13 @@ end
 
 app = Qt::Application.new( args )
 
-if $options[:debug]
-  require 'pp'
-  #~ puts "$options: #{$options.inspect}"
-  #~ puts args.inspect
-end
-
-if !$options.has_key?( :database )
+unless $options.has_key? :database
   raise "Please define $options[:database]"
 end
 
 # connect to db
 require 'clevic/db_options.rb'
 
-puts "using database #{ActiveRecord::Base.connection.raw_connection.db}" if $options[:debug]
-
 # show UI
 main_window = Qt::MainWindow.new
 browser = Clevic::Browser.new( main_window )

data/lib/clevic/db_options.rb

@@ -1,17 +1,19 @@
-# set up defaults
-# $options[:database] to be defined with the models
 require 'active_record'
 
+# these will normally be defined fully in the model definition file
+# $options[:database] to be defined with the models
 $options ||= {}
 $options[:adapter]  ||= 'postgresql'
 $options[:host] ||= 'localhost'
-$options[:username] ||= 'panic'
+$options[:username] ||= ''
 $options[:password] ||= ''
 
 ActiveRecord::Base.establish_connection( $options )
 ActiveRecord::Base.logger = Logger.new(STDOUT) if $options[:verbose]
 #~ ActiveRecord.colorize_logging = false
 
+puts "using database #{ActiveRecord::Base.connection.raw_connection.db}" if $options[:debug]
+
 # workaround for the date freeze issue
 class Date
   def freeze

data/lib/clevic/model_builder.rb

@@ -1,3 +1,5 @@
+require 'activerecord'
+
 require 'clevic/table_model.rb'
 require 'clevic/delegates.rb'
 require 'clevic/cache_table.rb'

data/lib/clevic/ui/browser_ui.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'browser.ui'
 **
-** Created: Thu Jun 26 18:01:14 2008
+** Created: Fri Jul 4 22:17:08 2008
 **      by: Qt User Interface Compiler version 4.3.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/clevic/ui/search_dialog_ui.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'search_dialog.ui'
 **
-** Created: Thu Jun 26 18:01:14 2008
+** Created: Fri Jul 4 22:17:08 2008
 **      by: Qt User Interface Compiler version 4.3.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/template/jamis.rb

@@ -0,0 +1,589 @@
+module RDoc
+module Page
+
+FONTS = "\"Bitstream Vera Sans\", Verdana, Arial, Helvetica, sans-serif"
+
+STYLE = <<CSS
+a {
+  color: #00F;
+  text-decoration: none;
+}
+
+a:hover {
+  color: #77F;
+  text-decoration: underline;
+}
+
+body, td, p {
+  font-family: %fonts%;
+  background: #FFF;
+  color: #000;
+  margin: 0px;
+  font-size: small;
+}
+
+#content {
+  margin: 2em;
+}
+
+#description p {
+  margin-bottom: 0.5em;
+}
+
+.sectiontitle {
+  margin-top: 1em;
+  margin-bottom: 1em;
+  padding: 0.5em;
+  padding-left: 2em;
+  background: #005;
+  color: #FFF;
+  font-weight: bold;
+  border: 1px dotted black;
+}
+
+.attr-rw {
+  padding-left: 1em;
+  padding-right: 1em;
+  text-align: center;
+  color: #055;
+}
+
+.attr-name {
+  font-weight: bold;
+}
+
+.attr-desc {
+}
+
+.attr-value {
+  font-family: monospace;
+}
+
+.file-title-prefix {
+  font-size: large;
+}
+
+.file-title {
+  font-size: large;
+  font-weight: bold;
+  background: #005;
+  color: #FFF;
+}
+
+.banner {
+  background: #005;
+  color: #FFF;
+  border: 1px solid black;
+  padding: 1em;
+}
+
+.banner td {
+  background: transparent;
+  color: #FFF;
+}
+
+h1 a, h2 a, .sectiontitle a, .banner a {
+  color: #FF0;
+}
+
+h1 a:hover, h2 a:hover, .sectiontitle a:hover, .banner a:hover {
+  color: #FF7;
+}
+
+.dyn-source {
+  display: none;
+  background: #FFE;
+  color: #000;
+  border: 1px dotted black;
+  margin: 0.5em 2em 0.5em 2em;
+  padding: 0.5em;
+}
+
+.dyn-source .cmt {
+  color: #00F;
+  font-style: italic;
+}
+
+.dyn-source .kw {
+  color: #070;
+  font-weight: bold;
+}
+
+.method {
+  margin-left: 1em;
+  margin-right: 1em;
+  margin-bottom: 1em;
+}
+
+.description pre {
+  padding: 0.5em;
+  border: 1px dotted black;
+  background: #FFE;
+}
+
+.method .title {
+  font-family: monospace;
+  font-size: large;
+  border-bottom: 1px dashed black;
+  margin-bottom: 0.3em;
+  padding-bottom: 0.1em;
+}
+
+.method .description, .method .sourcecode {
+  margin-left: 1em;
+}
+
+.description p, .sourcecode p {
+  margin-bottom: 0.5em;
+}
+
+.method .sourcecode p.source-link {
+  text-indent: 0em;
+  margin-top: 0.5em;
+}
+
+.method .aka {
+  margin-top: 0.3em;
+  margin-left: 1em;
+  font-style: italic;
+  text-indent: 2em;
+}
+
+h1 {
+  padding: 1em;
+  border: 1px solid black;
+  font-size: x-large;
+  font-weight: bold;
+  color: #FFF;
+  background: #007;
+}
+
+h2 {
+  padding: 0.5em 1em 0.5em 1em;
+  border: 1px solid black;
+  font-size: large;
+  font-weight: bold;
+  color: #FFF;
+  background: #009;
+}
+
+h3, h4, h5, h6 {
+  padding: 0.2em 1em 0.2em 1em;
+  border: 1px dashed black;
+  color: #000;
+  background: #AAF;
+}
+
+.sourcecode > pre {
+  padding: 0.5em;
+  border: 1px dotted black;
+  background: #FFE;
+}
+
+CSS
+
+XHTML_PREAMBLE = %{<?xml version="1.0" encoding="%charset%"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+}
+
+XHTML_FRAMESET_PREAMBLE = %{
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">    
+}
+
+HEADER = XHTML_PREAMBLE + <<ENDHEADER
+<html>
+  <head>
+    <title>%title%</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+    <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
+
+    <script language="JavaScript" type="text/javascript">
+    // <![CDATA[
+
+        function toggleSource( id )
+        {
+          var elem
+          var link
+
+          if( document.getElementById )
+          {
+            elem = document.getElementById( id )
+            link = document.getElementById( "l_" + id )
+          }
+          else if ( document.all )
+          {
+            elem = eval( "document.all." + id )
+            link = eval( "document.all.l_" + id )
+          }
+          else
+            return false;
+
+          if( elem.style.display == "block" )
+          {
+            elem.style.display = "none"
+            link.innerHTML = "show source"
+          }
+          else
+          {
+            elem.style.display = "block"
+            link.innerHTML = "hide source"
+          }
+        }
+
+        function openCode( url )
+        {
+          window.open( url, "SOURCE_CODE", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=480,width=750" ).focus();
+        }
+      // ]]>
+    </script>
+  </head>
+
+  <body>
+ENDHEADER
+
+FILE_PAGE = <<HTML
+<table border='0' cellpadding='0' cellspacing='0' width="100%" class='banner'>
+  <tr><td>
+    <table width="100%" border='0' cellpadding='0' cellspacing='0'><tr>
+      <td class="file-title" colspan="2"><span class="file-title-prefix">File</span><br />%short_name%</td>
+      <td align="right">
+        <table border='0' cellspacing="0" cellpadding="2">
+          <tr>
+            <td>Path:</td>
+            <td>%full_path%
+IF:cvsurl
+				&nbsp;(<a href="%cvsurl%">CVS</a>)
+ENDIF:cvsurl
+            </td>
+          </tr>
+          <tr>
+            <td>Modified:</td>
+            <td>%dtm_modified%</td>
+          </tr>
+        </table>
+      </td></tr>
+    </table>
+  </td></tr>
+</table><br />
+HTML
+
+###################################################################
+
+CLASS_PAGE = <<HTML
+<table width="100%" border='0' cellpadding='0' cellspacing='0' class='banner'><tr>
+  <td class="file-title"><span class="file-title-prefix">%classmod%</span><br />%full_name%</td>
+  <td align="right">
+    <table cellspacing="0" cellpadding="2">
+      <tr valign="top">
+        <td>In:</td>
+        <td>
+START:infiles
+HREF:full_path_url:full_path:
+IF:cvsurl
+&nbsp;(<a href="%cvsurl%">CVS</a>)
+ENDIF:cvsurl
+END:infiles
+        </td>
+      </tr>
+IF:parent
+    <tr>
+      <td>Parent:</td>
+      <td>
+IF:par_url
+        <a href="%par_url%">
+ENDIF:par_url
+%parent%
+IF:par_url
+         </a>
+ENDIF:par_url
+     </td>
+   </tr>
+ENDIF:parent
+         </table>
+        </td>
+        </tr>
+      </table>
+HTML
+
+###################################################################
+
+METHOD_LIST = <<HTML
+  <div id="content">
+IF:diagram
+  <table cellpadding='0' cellspacing='0' border='0' width="100%"><tr><td align="center">
+    %diagram%
+  </td></tr></table>
+ENDIF:diagram
+
+IF:description
+  <div class="description">%description%</div>
+ENDIF:description
+
+IF:requires
+  <div class="sectiontitle">Required Files</div>
+  <ul>
+START:requires
+  <li>HREF:aref:name:</li>
+END:requires
+  </ul>
+ENDIF:requires
+
+IF:toc
+  <div class="sectiontitle">Contents</div>
+  <ul>
+START:toc
+  <li><a href="#%href%">%secname%</a></li>
+END:toc
+  </ul>
+ENDIF:toc
+
+IF:methods
+  <div class="sectiontitle">Methods</div>
+  <ul>
+START:methods
+  <li>HREF:aref:name:</li>
+END:methods
+  </ul>
+ENDIF:methods
+
+IF:includes
+<div class="sectiontitle">Included Modules</div>
+<ul>
+START:includes
+  <li>HREF:aref:name:</li>
+END:includes
+</ul>
+ENDIF:includes
+
+START:sections
+IF:sectitle
+<div class="sectiontitle"><a name="%secsequence%">%sectitle%</a></div>
+IF:seccomment
+<div class="description">
+%seccomment%
+</div>
+ENDIF:seccomment
+ENDIF:sectitle
+
+IF:classlist
+  <div class="sectiontitle">Classes and Modules</div>
+  %classlist%
+ENDIF:classlist
+
+IF:constants
+  <div class="sectiontitle">Constants</div>
+  <table border='0' cellpadding='5'>
+START:constants
+  <tr valign='top'>
+    <td class="attr-name">%name%</td>
+    <td>=</td>
+    <td class="attr-value">%value%</td>
+  </tr>
+IF:desc
+  <tr valign='top'>
+    <td>&nbsp;</td>
+    <td colspan="2" class="attr-desc">%desc%</td>
+  </tr>
+ENDIF:desc
+END:constants
+  </table>
+ENDIF:constants
+
+IF:attributes
+  <div class="sectiontitle">Attributes</div>
+  <table border='0' cellpadding='5'>
+START:attributes
+  <tr valign='top'>
+    <td class='attr-rw'>
+IF:rw
+[%rw%]
+ENDIF:rw
+    </td>
+    <td class='attr-name'>%name%</td>
+    <td class='attr-desc'>%a_desc%</td>
+  </tr>
+END:attributes
+  </table>
+ENDIF:attributes
+
+IF:method_list
+START:method_list
+IF:methods
+<div class="sectiontitle">%type% %category% methods</div>
+START:methods
+<div class="method">
+  <div class="title">
+IF:callseq
+    <a name="%aref%"></a><b>%callseq%</b>
+ENDIF:callseq
+IFNOT:callseq
+    <a name="%aref%"></a><b>%name%</b>%params%
+ENDIF:callseq
+IF:codeurl
+[&nbsp;<a href="%codeurl%" target="SOURCE_CODE" onclick="javascript:openCode('%codeurl%'); return false;">source</a>&nbsp;]
+ENDIF:codeurl
+  </div>
+IF:m_desc
+  <div class="description">
+  %m_desc%
+  </div>
+ENDIF:m_desc
+IF:aka
+<div class="aka">
+  This method is also aliased as
+START:aka
+  <a href="%aref%">%name%</a>
+END:aka
+</div>
+ENDIF:aka
+IF:sourcecode
+<div class="sourcecode">
+  <p class="source-link">[ <a href="javascript:toggleSource('%aref%_source')" id="l_%aref%_source">show source</a> ]</p>
+  <div id="%aref%_source" class="dyn-source">
+<pre>
+%sourcecode%
+</pre>
+  </div>
+</div>
+ENDIF:sourcecode
+</div>
+END:methods
+ENDIF:methods
+END:method_list
+ENDIF:method_list
+END:sections
+</div>
+HTML
+
+FOOTER = <<ENDFOOTER
+  </body>
+</html>
+ENDFOOTER
+
+BODY = HEADER + <<ENDBODY
+  !INCLUDE! <!-- banner header -->
+
+  <div id="bodyContent">
+    #{METHOD_LIST}
+  </div>
+
+  #{FOOTER}
+ENDBODY
+
+########################## Source code ##########################
+
+SRC_PAGE = XHTML_PREAMBLE + <<HTML
+<html>
+<head><title>%title%</title>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+<style type="text/css">
+.ruby-comment    { color: green; font-style: italic }
+.ruby-constant   { color: #4433aa; font-weight: bold; }
+.ruby-identifier { color: #222222;  }
+.ruby-ivar       { color: #2233dd; }
+.ruby-keyword    { color: #3333FF; font-weight: bold }
+.ruby-node       { color: #777777; }
+.ruby-operator   { color: #111111;  }
+.ruby-regexp     { color: #662222; }
+.ruby-value      { color: #662222; font-style: italic }
+  .kw { color: #3333FF; font-weight: bold }
+  .cmt { color: green; font-style: italic }
+  .str { color: #662222; font-style: italic }
+  .re  { color: #662222; }
+</style>
+</head>
+<body bgcolor="white">
+<pre>%code%</pre>
+</body>
+</html>
+HTML
+
+########################## Index ################################
+
+FR_INDEX_BODY = <<HTML
+!INCLUDE!
+HTML
+
+FILE_INDEX = XHTML_PREAMBLE + <<HTML
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+<title>Index</title>
+<style type="text/css">
+<!--
+  body {
+    background-color: #EEE;
+    font-family: #{FONTS}; 
+    color: #000;
+    margin: 0px;
+  }
+  .banner {
+    background: #005;
+    color: #FFF;
+    padding: 0.2em;
+    font-size: small;
+    font-weight: bold;
+    text-align: center;
+  }
+  .entries {
+    margin: 0.25em 1em 0 1em;
+    font-size: x-small;
+  }
+  a {
+    color: #00F;
+    text-decoration: none;
+    white-space: nowrap;
+  }
+  a:hover {
+    color: #77F;
+    text-decoration: underline;
+  }
+-->
+</style>
+<base target="docwin" />
+</head>
+<body>
+<div class="banner">%list_title%</div>
+<div class="entries">
+START:entries
+<a href="%href%">%name%</a><br />
+END:entries
+</div>
+</body></html>
+HTML
+
+CLASS_INDEX = FILE_INDEX
+METHOD_INDEX = FILE_INDEX
+
+INDEX = XHTML_FRAMESET_PREAMBLE + <<HTML
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>%title%</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
+</head>
+
+<frameset cols="20%,*">
+    <frameset rows="15%,35%,50%">
+        <frame src="fr_file_index.html"   title="Files" name="Files" />
+        <frame src="fr_class_index.html"  name="Classes" />
+        <frame src="fr_method_index.html" name="Methods" />
+    </frameset>
+    <frame  src="%initial_page%" name="docwin" />
+    <noframes>
+          <body bgcolor="white">
+            Click <a href="html/index.html">here</a> for a non-frames
+            version of this page.
+          </body>
+    </noframes>
+</frameset>
+
+</html>
+HTML
+
+end
+end
+