weft-qda 0.9.6 → 0.9.8

data/test/009b-backend_sqlite_complex.rb

@@ -1,35 +1,22 @@
-require 'english'
-$:.push('../lib/')
+require 'test-common'
 
 require 'weft'
+
 require 'test/unit'
 
 class TestSQLiteComplex < Test::Unit::TestCase
-  def sample_file(filename)
-    File.join( File.dirname( __FILE__), 'testdata', filename)
-  end
+  include QDA
 
   def setup
 	@dbfile = nil
 	@app = QDA::Application.new()
 	@app.extend(QDA::Backend::SQLite)
-  end
-
-  # delete any files hanging around
-  def teardown()
-	if @app.started?
-      # p @app
-	  # @app.end()
-      if @app.dbfile and File.exist?(@app.dbfile)
-        File.delete(@app.dbfile)
-      end
-	end
+	@app.start(:memory => true)
+	@app.install_clean()
   end
 
   # this tests an old search
   def test_search_document_scan()
-	@app.start(:dbfile => @dbfile)
-	@app.install_clean()
 	doc = QDA::Document.new('About Something')
 	doc.append("This is various text that'll be used for testing")
 	doc.append("Some more text with different letters?")
@@ -71,8 +58,6 @@ class TestSQLiteComplex < Test::Unit::TestCase
   end
 
   def test_preferences
-	@app.start(:dbfile => @dbfile)
-	@app.install_clean()
     @app.save_preference('Foo', 5)
     pref = @app.get_preference('Foo')
     assert_equal(5, pref, "Integer preference restored")
@@ -90,15 +75,12 @@ class TestSQLiteComplex < Test::Unit::TestCase
 
   # this test assumes search filters are working correctly
   def test_search_fragments_pdf()
-	@app.start(:dbfile => @dbfile)
-	@app.install_clean()
-
-    filter = QDA::PDFFilter.new()
+    doc = Filters::import_file( Document, sample_file('simple.pdf') )
     windxr = QDA::WordIndexer.new()
-    filter.add_indexer(windxr)
-    doc = filter.read('testdata/emacs-refcard-a4.pdf', 'i')
-    doc.title = 'jumble'
+    windxr.feed(doc)
 
+    doc.title = 'xxx'
+    
     @app.save_document(doc)
     @app.save_reverse_index(doc.dbid, windxr.words)
     windxr.words.each_key do | word |
@@ -115,42 +97,40 @@ class TestSQLiteComplex < Test::Unit::TestCase
     end
   end
 
-  # this test assumes search filters are working correctly
-  def test_search_fragments_latin1()
-	@app.start(:dbfile => @dbfile)
-	@app.install_clean()
-
-    filter = QDA::TextFilter.new()
-    windxr = QDA::WordIndexer.new()
-    filter.add_indexer(windxr)
-    doc = filter.read(sample_file('iso-8859-1.txt'), 'iso-8859-1')
-
-    @app.save_document(doc)
-    @app.save_reverse_index(doc.dbid, windxr.words)
-    windxr.words.each_key do | word |
-      results = @app.get_search_fragments(word, 
-                                          :whole_word => true,
-                                          :case_sensitive => false,
-                                          :wrap_both => 0)
-      assert_not_equal( 0, results[doc.title].length,
-                        "Some results returned for known word #{word}")
-      results[doc.title].each_with_index do | result, i |
-        assert_equal(word.downcase, result.to_s.downcase )
-        assert_equal(windxr.words[word][i], result.offset )
-      end
-    end
+  def test_get_all_categories()
+	cat1 = QDA::Category.new("Parent", nil, 'the "memo"')
+	@app.save_category(cat1)
+	cat2 = QDA::Category.new("Ego", cat1)
+	@app.save_category(cat2)
+	
+	# this is to test for a bug when saving a category 
+	cat3 = QDA::Category.new("Child", cat2)
+	cat3.code(0, 10, 20)
+    assert_equal(1, cat3.codes.num_of_codes)
+	@app.save_category(cat3)
+    
+    all = @app.get_all_categories()
+    assert_equal(cat1, all[0])
+    assert_equal(cat2, all[0][0])
+    assert_equal(cat2, all[0]['Ego'])
+    child = all[0]['Ego']['Child']
+    child.parent = all[0]
+    # saving a category loaded from all..() deleted its coding 
+    @app.save_category(child)
+    
+    restored = @app.get_category(cat3.dbid)
+    assert_equal('Child', restored.name)
+    assert_equal(cat1, restored.parent)
+    # test bug fix
+    assert_equal(1, restored.codes.num_of_codes)
+    
   end
-
+  
   def test_search_fragments_txt()
-	@app.start(:dbfile => @dbfile)
-	@app.install_clean()
-
-    # try a
-    filter = QDA::TextFilter.new()
+    doc = Filters::import_file(Document, sample_file('autocoding-test.txt'))
     windxr = QDA::WordIndexer.new()
-    filter.add_indexer(windxr)
-    doc = filter.read(sample_file('autocoding-test.txt'), 'indexing test')
-
+    windxr.feed(doc)
+    doc.title = 'xxx'
     @app.save_document(doc)
     @app.save_reverse_index(doc.dbid, windxr.words)
 
@@ -171,5 +151,6 @@ class TestSQLiteComplex < Test::Unit::TestCase
         assert_equal(doc[f.offset, f.length].to_s, f.to_s)
       end
     end
-  end
-end
+   end
+   
+ end

data/test/009c_backend_sqlite_bench.rb

@@ -1,5 +1,4 @@
-require 'english'
-$:.push('../lib/')
+require 'test-common'
 
 require 'weft'
 require 'test/unit'
@@ -31,13 +30,9 @@ class TestSQLiteBenchmark < Test::Unit::TestCase
 
   # delete any files hanging around
   def teardown()
-	if @app.started?
-      # p @app
-	  # @app.end()
-      if @app.dbfile and File.exist?(@app.dbfile)
-        File.delete(@app.dbfile)
-      end
-	end
+    if @app.dbfile and File.exist?(@app.dbfile)
+      File.delete(@app.dbfile)
+    end
   end
 
   # this tests an old search
@@ -50,7 +45,7 @@ class TestSQLiteBenchmark < Test::Unit::TestCase
 
     measure('Save Document', 25) do 
       doc.dbid = nil
-      @app.save_document(doc)
+      @app.save_document(doc, true)
     end
   end
 

data/test/053-doc_inspector.rb

@@ -0,0 +1,46 @@
+WEFT_MULTIFRAME_MODE = true
+
+require 'test-common'
+require 'weft'
+require 'weft/wxgui'
+
+class FakeWorkArea
+  attr_accessor :active_child
+  def proportional_size(*args)
+    Wx::Size.new(300, 500)
+  end
+end
+
+class FakeClient < Wx::App
+  include QDA::Subscriber
+  include QDA::Broadcaster
+  SUBSCRIBABLE_EVENTS = QDA::GUI::WeftClient::SUBSCRIBABLE_EVENTS
+  attr_reader :app
+  
+  def on_init()
+    app = QDA::Application.new( QDA::Backend::SQLite )
+    app.start(:dbfile => sample_file('empty.qdp') )
+  end
+  
+  def display_font
+    QDA::GUI::DEFAULT_FONT  
+  end
+  
+  def fetch_icon(icon)
+    Wx::Icon.new( File.join(WEFT_SHAREDIR, 'icons', "#{icon}.xpm") )
+  end
+  def current_category
+    nil
+  end
+end
+
+doc = QDA::Document.new('foo')
+doc.dbid = 1
+doc.append('This is nice')
+doc.append("Let's add a whole bunch of text to give a bit more to search")
+
+doc.memo = 'licky'
+client = FakeClient.new()
+win = QDA::GUI::DocumentWindow.new(doc, client, FakeWorkArea.new(), nil)
+win.show()
+client.main_loop()    

data/test/055-query_window.rb

@@ -0,0 +1,50 @@
+WEFT_MULTIFRAME_MODE = true
+
+require 'test-common'
+require 'weft'
+require 'weft/wxgui'
+
+class FakeWorkArea
+  attr_accessor :active_child
+  def proportional_size(*args)
+    Wx::Size.new(300, 500)
+  end
+end
+
+class FakeClient < Wx::App
+  include QDA::Subscriber
+  include QDA::Broadcaster
+  SUBSCRIBABLE_EVENTS = QDA::GUI::WeftClient::SUBSCRIBABLE_EVENTS
+  attr_reader :app
+  
+  def initialize(*args)
+    super
+    @app = QDA::Application.new( QDA::Backend::SQLite )
+    @app.start(:dbfile => sample_file('empty.qdp') )
+    def @app.get_category(arg, maybe = nil)
+      return QDA::Category.new(arg, nil)
+    end
+  end
+  
+  def display_font
+    QDA::GUI::DEFAULT_FONT  
+  end
+  
+  def fetch_icon(icon)
+    Wx::Icon.new( File.join(WEFT_SHAREDIR, 'icons', "#{icon}.xpm") )
+  end
+  def current_category
+    nil
+  end
+end
+
+client = FakeClient.new()
+
+query = QDA::Query.new( QDA::Query::CodedByFunction.new(client.app, 'category') )
+query.add_expression( 'AND NOT', 
+                      QDA::Query::WordSearchFunction.new(client.app, 'foo'))
+query.dbid = 1
+
+win = QDA::GUI::QueryWindow.new(query, client, FakeWorkArea.new(), nil)
+win.show()
+client.main_loop()    

data/test/all-tests.rb

@@ -1 +1,2 @@
+Dir.chdir( File.dirname(__FILE__) )
 Dir.glob('[0-9][0-9][0-9]*.rb') { | test | load test }

data/test/test-common.rb

@@ -0,0 +1,19 @@
+require 'English'
+require 'test/unit'
+if not defined? WEFT_SHAREDIR
+  WEFT_SHAREDIR = File.join( File.dirname( __FILE__), '..', 'share')
+end
+
+if not defined? WEFT_LIBDIR
+  WEFT_LIBDIR = File.join( File.dirname( __FILE__ ), '..', 'lib' )
+end
+
+def sample_file(filename)
+  File.join( File.dirname( __FILE__), 'testdata', filename)
+end
+  
+def lib_path()
+  WEFT_LIBDIR
+end
+
+$LOAD_PATH.push(WEFT_LIBDIR)

data/weft-qda.rb

@@ -1,28 +1,61 @@
 #!/usr/bin/env ruby
 
+# force alternative layouts
+# WEFT_MULTIFRAME_MODE = true
+# or ...
+# WEFT_MDI_MODE = true
+
+# if there is a command line argument, assume it's a project file and should
+# be opened
 if dbfile = ARGV.shift
   dbfile = File.expand_path(dbfile)
 end
 
-Dir.chdir( File.dirname( __FILE__ ) )
+# find install directory if running as a rs2exe, use that as a source for icons
+if defined? RUBYSCRIPT2EXE_APPEXE
+  WEFT_SHAREDIR = File.join( File.dirname(RUBYSCRIPT2EXE_APPEXE),
+                             'share' )
+  # WEFT_LIBDIR = File.join( File.dirname(RUBYSCRIPT2EXE_APPEXE),
+  #                         'lib' )
+  # switched on for compiled builds only
+  WEFT_CRASH_REPORTING = true
+# otherwise assume we're running from a tarball / CVS-ish directory layout
+else
+  maybe_lib = File.join( File.dirname( __FILE__ ), 'lib', 'weft.rb' )
+  if File.exist?(maybe_lib)
+    Dir.chdir( File.dirname( __FILE__ ) )
+    WEFT_LIBDIR = File.join( Dir.pwd, 'lib' )  
+    WEFT_SHAREDIR = File.join( Dir.pwd, 'share' )
+    $:.unshift(WEFT_LIBDIR)
+  else
+    require 'rubygems'
+  end
+end
+
+# load up the weft libraries, from various possible locations
+# 1) By rubyscript2exe
+# 2) From the lib dir relative to the location of this script
+# 3) From rubygems
+# 4) From ruby's standard lib install directories (not tested)
+$:.unshift(WEFT_LIBDIR) if defined?(WEFT_LIBDIR)
 
-$:.push('lib')
 require 'weft'
 require 'weft/wxgui'
 
 # Create a new application
-
-gui = QDA::GUI::Instance.new()
+gui = QDA::GUI::WeftClient.new()
 
 # quick-start : open project from c.l. arg
 if dbfile
-  app = QDA::Application.new(gui)
-  app.extend( QDA::Backend::SQLite )
-  app.start(:dbfile => dbfile)
+  app = QDA::Application.new( QDA::Backend::SQLite )
   gui.app = app
+  app.start(:dbfile => dbfile)
   gui.populate()
 end
 
 # don't start the application if generating executable with rs2exe
 exit if defined?(REQUIRE2LIB)
+
+# and off we go ...
 gui.main_loop()
+

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.8.10
 specification_version: 1
 name: weft-qda
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
-date: 2005-07-07
+  version: 0.9.8
+date: 2006-01-04
 summary: GUI Qualitative Data Analysis Tool.
 require_paths: 
   - lib
-author: Alex Fenton
 email: alex@pressure.to
 homepage: http://www.pressure.to/qda/
 rubyforge_project: weft-qda
@@ -26,15 +25,21 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 1.8.1
   version: 
 platform: ruby
+authors: 
+  - Alex Fenton
 files: 
   - weft-qda.rb
   - lib/weft.rb
   - lib/weft/application.rb
   - lib/weft/backend.rb
+  - lib/weft/broadcaster.rb
   - lib/weft/category.rb
+  - lib/weft/codereview.rb
   - lib/weft/coding.rb
   - lib/weft/document.rb
+  - lib/weft/exceptions.rb
   - lib/weft/filters.rb
+  - lib/weft/query.rb
   - lib/weft/WEFT-VERSION-STRING.rb
   - lib/weft/wxgui.rb
   - lib/weft/backend/marshal.rb
@@ -42,46 +47,81 @@ files:
   - lib/weft/backend/n6.rb
   - lib/weft/backend/sqlite.rb
   - lib/weft/backend/sqlite/category_tree.rb
+  - lib/weft/backend/sqlite/database.rb
   - lib/weft/backend/sqlite/schema.rb
   - lib/weft/backend/sqlite/upgradeable.rb
+  - lib/weft/filters/indexers.rb
+  - lib/weft/filters/input.rb
+  - lib/weft/filters/output.rb
+  - lib/weft/filters/templates.rb
+  - lib/weft/filters/win32backtick.rb
+  - lib/weft/wxgui/constants.rb
+  - lib/weft/wxgui/controls.rb
   - lib/weft/wxgui/dialogs.rb
   - lib/weft/wxgui/error_handler.rb
+  - lib/weft/wxgui/exceptions.rb
   - lib/weft/wxgui/inspectors.rb
   - lib/weft/wxgui/lang.rb
   - lib/weft/wxgui/sidebar.rb
   - lib/weft/wxgui/utilities.rb
   - lib/weft/wxgui/workarea.rb
+  - lib/weft/wxgui/controls/category_dropdown.rb
+  - lib/weft/wxgui/controls/category_tree.rb
+  - lib/weft/wxgui/controls/document_list.rb
+  - lib/weft/wxgui/controls/multitype_control.rb
+  - lib/weft/wxgui/controls/textcontrols.rb
   - lib/weft/wxgui/inspectors/category.rb
   - lib/weft/wxgui/inspectors/codereview.rb
   - lib/weft/wxgui/inspectors/document.rb
   - lib/weft/wxgui/inspectors/imagedocument.rb
+  - lib/weft/wxgui/inspectors/query.rb
   - lib/weft/wxgui/inspectors/script.rb
-  - lib/weft/wxgui/inspectors/search.rb
-  - lib/weft/wxgui/inspectors/textcontrols.rb
   - lib/weft/wxgui/lang/en.rb
-  - lib/weft/wxgui/category.xpm
-  - lib/weft/wxgui/document.xpm
-  - lib/weft/wxgui/mondrian.xpm
-  - lib/weft/wxgui/search.xpm
-  - lib/weft/wxgui/weft16.xpm
   - test/001-document.rb
   - test/002-category.rb
   - test/003-code.rb
   - test/004-application.rb
+  - test/005-query_review.rb
   - test/006-filters.rb
+  - test/007-output_filters.rb
   - test/009a-backend_sqlite_basic.rb
   - test/009b-backend_sqlite_complex.rb
   - test/009c_backend_sqlite_bench.rb
   - test/010-backend_nudist.rb
+  - test/053-doc_inspector.rb
+  - test/055-query_window.rb
   - test/all-tests.rb
   - test/manual-gui-script.txt
+  - test/test-common.rb
   - test/testdata
   - test/testdata/autocoding-test.txt
+  - test/testdata/empty.qdp
   - test/testdata/iso-8859-1.txt
   - test/testdata/sample_doc.txt
   - test/testdata/search_results.txt
+  - test/testdata/simple with space.pdf
+  - test/testdata/simple.pdf
   - test/testdata/text1-dos-ascii.txt
   - test/testdata/text1-unix-utf8.txt
+  - share/templates/category_plain.html
+  - share/templates/codereview_plain.html
+  - share/templates/document_plain.html
+  - share/templates/document_plain.txt
+  - share/icons/category.xpm
+  - share/icons/codereview.xpm
+  - share/icons/document.xpm
+  - share/icons/d_and_c.xpm
+  - share/icons/query.xpm
+  - share/icons/search.xpm
+  - share/icons/weft.xpm
+  - share/icons/category.ico
+  - share/icons/codereview.ico
+  - share/icons/document.ico
+  - share/icons/project.ico
+  - share/icons/query.ico
+  - share/icons/weft.ico
+  - share/icons/weft16.ico
+  - share/icons/weft32.ico
 test_files: 
   - test/001-document.rb
 rdoc_options: []
@@ -90,7 +130,27 @@ executables:
   - weft-qda.rb
 extensions: []
 requirements: 
-  - WxWidgets 2.4+ (not needed if using wxruby binary)
-  - libsqlite library v2
+  - WxRuby 0.6.0
+  - WxWidgets 2.4.2 (not needed if using wxruby binary)
   - pdftotext (if importing PDFs)
-dependencies: []
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: sqlite-ruby
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.2.0
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: PageTemplate
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.0.0
+      version: