ultrasphinx 1 → 1.5

data/tasks/ultrasphinx.rake

@@ -4,12 +4,12 @@ ENV['RAILS_ENV'] ||= "development"
 namespace :ultrasphinx do  
   
   desc "Bootstrap a full Sphinx environment"
-  task :bootstrap => [:environment, :configure, :index, :start] do
+  task :bootstrap => [:environment, :configure, :index, :"daemon:restart"] do
   end
   
   desc "Rebuild the configuration file for this particular environment."
   task :configure => :environment do
-    Ultrasphinx::configure
+    Ultrasphinx::Configure.run
   end
   
   desc "Reindex the database and send an update signal to the search daemon."
@@ -22,12 +22,12 @@ namespace :ultrasphinx do
     system cmd
   end
   
+  
   namespace :daemon do
     desc "Start the search daemon"
     task :start => :environment do
+      FileUtils.mkdir_p File.dirname(Ultrasphinx::DAEMON_SETTINGS["log"]) rescue nil
       raise Ultrasphinx::DaemonError, "Already running" if ultrasphinx_daemon_running?
-      # remove lockfiles
-      Dir[Ultrasphinx::PLUGIN_SETTINGS["path"] + "*spl"].each {|file| File.delete(file)}
       system "searchd --config #{Ultrasphinx::CONF_PATH}"
       sleep(2) # give daemon a chance to write the pid file
       if ultrasphinx_daemon_running?
@@ -45,23 +45,10 @@ namespace :ultrasphinx do
     end
 
     desc "Restart the search daemon"
-    task :restart => [:environment, :stop, :start] do
-    end
-    
-    desc "Tail queries in the log"
-    task :tail => :environment do
-      require 'file/tail'
-      puts "Tailing #{filename = Ultrasphinx::DAEMON_SETTINGS['query_log']}"
-      File.open(filename) do |log|
-        log.extend(File::Tail)
-        log.interval = 1
-        log.backward(10)
-        last = nil
-        log.tail do |line| 
-          current = line[/\[\*\](.*)$/, 1]
-          last = current and puts current unless current == last
-        end
-      end 
+    task :restart => [:environment] do
+      Rake::Task["ultrasphinx:daemon:stop"].invoke if ultrasphinx_daemon_running?
+      sleep(3)
+      Rake::Task["ultrasphinx:daemon:start"].invoke
     end
     
     desc "Check if the search daemon is running"
@@ -73,11 +60,10 @@ namespace :ultrasphinx do
       end
     end      
   end
-    
-    
+          
     
   namespace :spelling do
-    desc "Rebuild custom spelling dictionary"
+    desc "Rebuild the custom spelling dictionary. You may need to use 'sudo' if your Aspell folder is not writable by the app user."
     task :build => :environment do    
       ENV['OPTS'] = "--buildstops #{Ultrasphinx::STOPWORDS_PATH} #{Ultrasphinx::MAX_WORDS} --buildfreqs"
       Rake::Task["ultrasphinx:index"].invoke
@@ -106,6 +92,7 @@ namespace :us do
   task :start => ["ultrasphinx:daemon:start"]
   task :restart => ["ultrasphinx:daemon:restart"]
   task :stop => ["ultrasphinx:daemon:stop"]
+  task :stat => ["ultrasphinx:daemon:status"]
   task :in => ["ultrasphinx:index"]
   task :spell => ["ultrasphinx:spelling:build"]
   task :conf => ["ultrasphinx:configure"]  
@@ -121,5 +108,11 @@ def ultrasphinx_daemon_pid
 end
 
 def ultrasphinx_daemon_running?
-  ultrasphinx_daemon_pid and `ps #{ultrasphinx_daemon_pid} | wc`.to_i > 1 
+  if ultrasphinx_daemon_pid and `ps #{ultrasphinx_daemon_pid} | wc`.to_i > 1 
+    true
+  else
+    # remove bogus lockfiles
+    Dir[Ultrasphinx::INDEX_SETTINGS["path"] + "*spl"].each {|file| File.delete(file)}
+    false
+  end  
 end

data/test/config/ultrasphinx/test.base

@@ -0,0 +1,56 @@
+
+#
+# Sphinx/Ultrasphinx user-configurable options.
+#
+# Copy this file to RAILS_ROOT/config/ultrasphinx.
+# You can use individual namespaces if you want (e.g. "development.base").
+#
+
+indexer
+{
+  # Indexer running options
+  mem_limit = 256M 
+}
+
+searchd
+{
+  # Daemon options
+  # What interface the search daemon should listen on and where to store its logs
+  address = 0.0.0.0
+  port = 3312
+  log = /opt/local/var/db/sphinx/log/searchd.log
+  query_log = /opt/local/var/db/sphinx/log/query.log
+  read_timeout = 5
+  max_children = 300
+  pid_file = /opt/local/var/db/sphinx/log/searchd.pid
+  max_matches = 100000
+}
+
+client
+{
+  # Client options
+  # How your application connects to the search daemon (not necessarily the same as above)
+  server_host = localhost
+  server_port = 3312
+}
+
+source
+{
+  # Individual SQL source options
+  sql_range_step = 20000   
+  strip_html = 0
+  index_html_attrs =
+  sql_query_post =
+}
+
+index
+{
+  # Index building options
+  path = /opt/local/var/db/sphinx/
+  docinfo = extern # just leave this alone
+  morphology = stem_en
+  stopwords = # /path/to/stopwords.txt
+  min_word_len = 1
+  charset_type = utf-8 # or sbcs (Single Byte Character Set)
+  charset_table = 0..9, A..Z->a..z, -, _, ., &, a..z,
+}

data/test/test_helper.rb

@@ -0,0 +1,32 @@
+
+def silently
+  old_stdout, $stdout = $stdout, StringIO.new
+  yield
+  $stdout = old_stdout
+end 
+
+RAILS_ROOT = File.dirname(__FILE__)
+$LOAD_PATH << "#{RAILS_ROOT}/../lib" << RAILS_ROOT
+
+RAILS_ENV = "test"
+
+require 'rubygems'
+require 'initializer'
+require 'active_support'
+require 'sqlite3'
+require 'active_record'
+require 'test/spec'
+require 'ruby-debug'
+
+ActiveRecord::Base.establish_connection(
+  config = {
+    :adapter => 'sqlite3',
+    :database => ':memory:'
+  })
+ActiveRecord::Base.connection.instance_variable_set('@config', config)
+
+silently { require 'schema' }
+require 'models'
+require 'ultrasphinx'
+
+Debugger.start

data/test/unit/parser_test.rb

@@ -0,0 +1,93 @@
+
+require "#{File.dirname(__FILE__)}/../test_helper.rb"
+
+describe "parser" do
+
+  def setup
+    @s = Ultrasphinx::Search.new
+  end
+
+  [
+  'artichokes', 
+  'artichokes',
+    
+    '  artichokes  ', 
+    'artichokes',
+    
+    'artichoke heart', 
+    'artichoke heart',
+    
+    '"artichoke hearts"', 
+    '"artichoke hearts"',
+    
+    '  "artichoke hearts  " ', 
+    '"artichoke hearts"',
+    
+    'artichoke AND hearts', 
+    'artichoke hearts',
+    
+    'artichoke OR hearts', 
+    'artichoke | hearts',
+    
+    'artichoke NOT heart', 
+    'artichoke - heart',
+
+    'artichoke and hearts', 
+    'artichoke hearts',
+    
+    'artichoke or hearts', 
+    'artichoke | hearts',
+    
+    'artichoke not heart', 
+    'artichoke - heart',
+    
+    'title:artichoke', 
+    '@title artichoke',
+    
+    'user:"john mose"', 
+    '@user "john mose"',
+    
+    'artichoke OR rhubarb NOT heart user:"john mose"', 
+    'artichoke | rhubarb - heart @user "john mose"',
+    
+    'title:artichoke hearts', 
+    'hearts @title artichoke',
+
+    'title:artichoke AND hearts', 
+    'hearts @title artichoke',
+    
+    'title:artichoke NOT hearts', 
+    'hearts - @title artichoke',
+
+    'title:artichoke OR hearts', 
+    'hearts | @title artichoke',
+
+    'title:artichoke title:hearts', 
+    '@title ( artichoke hearts )',
+
+    'title:artichoke OR title:hearts', 
+    '@title ( artichoke | hearts )',
+
+    'title:artichoke NOT title:hearts "john mose" ', 
+    '"john mose" @title ( artichoke - hearts )',
+
+    '"john mose" AND title:artichoke dogs OR title:hearts cats', 
+    '"john mose" dogs cats @title ( artichoke | hearts )',
+    
+    'board:england OR board:tristate',
+    '@board ( england | tristate )',
+    
+    '(800) 555-LOVE',
+    '(800) 555-LOVE',
+    
+    'Bend, OR',
+    'Bend, OR'
+    
+  ].in_groups_of(2).each do |query, result|
+    it "should parse" do
+      @s.send(:parse, query).should.equal(result)
+    end
+  end
+
+end
+

data/ultrasphinx.gemspec

@@ -0,0 +1,35 @@
+
+# Gem::Specification for Ultrasphinx-1.5
+# Originally generated by Echoe
+
+Gem::Specification.new do |s|
+  s.name = %q{ultrasphinx}
+  s.version = "1.5"
+  s.date = %q{2007-09-19}
+  s.summary = %q{Ruby on Rails configurator and client to the Sphinx fulltext search engine.}
+  s.email = %q{}
+  s.homepage = %q{http://blog.evanweaver.com/pages/code#ultrasphinx}
+  s.rubyforge_project = %q{fauna}
+  s.description = %q{Ruby on Rails configurator and client to the Sphinx fulltext search engine.}
+  s.has_rdoc = true
+  s.authors = [""]
+  s.files = ["vendor/will_paginate/LICENSE", "vendor/sphinx/README", "vendor/sphinx/Rakefile", "vendor/sphinx/LICENSE", "vendor/sphinx/lib/client.rb", "vendor/sphinx/init.rb", "TODO", "test/unit/parser_test.rb", "test/test_helper.rb", "test/config/ultrasphinx/test.base", "tasks/ultrasphinx.rake", "README", "Manifest", "LICENSE", "lib/ultrasphinx.rb", "lib/ultrasphinx/ultrasphinx.rb", "lib/ultrasphinx/spell.rb", "lib/ultrasphinx/search.rb", "lib/ultrasphinx/search/parser.rb", "lib/ultrasphinx/search/internals.rb", "lib/ultrasphinx/is_indexed.rb", "lib/ultrasphinx/fields.rb", "lib/ultrasphinx/core_extensions.rb", "lib/ultrasphinx/configure.rb", "lib/ultrasphinx/autoload.rb", "init.rb", "examples/default.base", "examples/app.multi", "CHANGELOG", "ultrasphinx.gemspec"]
+  s.test_files = ["test/test_helper.rb"]
+  s.add_dependency(%q<chronic>, ["> 0.0.0"])
+end
+
+
+# # Original Rakefile source (requires the Echoe gem):
+# 
+# 
+# require 'rubygems'
+# require 'echoe'
+# 
+# Echoe.new("ultrasphinx") do |p|
+#   p.project = "fauna"
+#   p.summary = "Ruby on Rails configurator and client to the Sphinx fulltext search engine."
+#   p.url = "http://blog.evanweaver.com/pages/code#ultrasphinx"  
+#   p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"  
+#   p.rdoc_pattern = /is_indexed.rb|search.rb|spell.rb|ultrasphinx.rb|^README|TODO|CHANGELOG|^LICENSE/
+#   p.dependencies = "chronic"
+# end

data/vendor/sphinx/LICENSE

@@ -0,0 +1,58 @@
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.co.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see COPYING.txt file), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) rename any non-standard executables so the names do not conflict
+	  with standard executables, which must also be provided.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+
+       a) distribute the executables and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under this terms.
+
+     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+     files under the ./missing directory.  See each file for the copying
+     condition.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
+

data/vendor/will_paginate/LICENSE

@@ -0,0 +1,18 @@
+Copyright (c) 2007 PJ Hyett and Mislav Marohnić
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of 
+the Software, and to permit persons to whom the Software is furnished to do so, 
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ultrasphinx
 version: !ruby/object:Gem::Version 
-  version: "1"
-date: 2007-08-01 00:00:00 -04:00
+  version: "1.5"
+date: 2007-09-19 00:00:00 -04:00
 summary: Ruby on Rails configurator and client to the Sphinx fulltext search engine.
 require_paths: 
 - lib
@@ -25,33 +25,64 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ0wCwYDVQQDDARldmFu
+  MRgwFgYKCZImiZPyLGQBGRYIY2xvdWRidXIxEjAQBgoJkiaJk/IsZAEZFgJzdDAe
+  Fw0wNzA5MTYxMDMzMDBaFw0wODA5MTUxMDMzMDBaMD0xDTALBgNVBAMMBGV2YW4x
+  GDAWBgoJkiaJk/IsZAEZFghjbG91ZGJ1cjESMBAGCgmSJomT8ixkARkWAnN0MIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5C0Io89nyApnr+PvbNFge9Vs
+  yRWAlGBUEMahpXp28VrrfXZT0rAW7JBo4PlCE3jl4nE4dzE6gAdItSycjTosrw7A
+  Ir5+xoyl4Vb35adv56TIQQXvNz+BzlqnkAY5JN0CSBRTQb6mxS3hFyD/h4qgDosj
+  R2RFVzHqSxCS8xq4Ny8uzOwOi+Xyu4w67fI5JvnPvMxqrlR1eaIQHmxnf76RzC46
+  QO5QhufjAYGGXd960XzbQsQyTDUYJzrvT7AdOfiyZzKQykKt8dEpDn+QPjFTnGnT
+  QmgJBX5WJN0lHF2l1sbv3gh4Kn1tZu+kTUqeXY6ShAoDTyvZRiFqQdwh8w2lTQID
+  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU+WqJz3xQ
+  XSea1hRvvHWcIMgeeC4wDQYJKoZIhvcNAQEFBQADggEBAGLZ75jfOEW8Nsl26CTt
+  JFrWxQTcQT/UljeefVE3xYr7lc9oQjbqO3FOyued3qW7TaNEtZfSHoYeUSMYbpw1
+  XAwocIPuSRFDGM4B+hgQGVDx8PMGiJKom4qLXjO40UZsR7QyN/u869Vj45LURm6h
+  MBcPeqCASI+WNprj9+uZa2kmHiitrFqqfMBNlm5IFbn9XeYSta9AHVvs5QQqV2m5
+  hIPfLqCyxsn/YgOGvo6iwyQTWyTswamaAC3HRWZxIS1sfn/Ssqa7E7oQMkv5FAXr
+  x5rKePfXINf8XTJczkl9OBEYdE9aNdJsJpXD0asLgGVwBICS5Bjohp6mizJcDC1+
+  yZ0=
+  -----END CERTIFICATE-----
+
 post_install_message: 
 authors: 
 - ""
 files: 
-- ./CHANGELOG
-- ./LICENSE
-- ./Manifest
-- ./README
-- ./Rakefile
-- ./examples/app.multi
-- ./examples/default.base
-- ./init.rb
-- ./lib/ultrasphinx/autoload.rb
-- ./lib/ultrasphinx/core_extensions.rb
-- ./lib/ultrasphinx/fields.rb
-- ./lib/ultrasphinx/is_indexed.rb
-- ./lib/ultrasphinx/search.rb
-- ./lib/ultrasphinx/spell.rb
-- ./lib/ultrasphinx/ultrasphinx.rb
-- ./lib/ultrasphinx.rb
-- ./tasks/ultrasphinx.rake
-- ./vendor/sphinx/README
-- ./vendor/sphinx/Rakefile
-- ./vendor/sphinx/init.rb
-- ./vendor/sphinx/lib/client.rb
-test_files: []
-
+- vendor/will_paginate/LICENSE
+- vendor/sphinx/README
+- vendor/sphinx/Rakefile
+- vendor/sphinx/LICENSE
+- vendor/sphinx/lib/client.rb
+- vendor/sphinx/init.rb
+- TODO
+- test/unit/parser_test.rb
+- test/test_helper.rb
+- test/config/ultrasphinx/test.base
+- tasks/ultrasphinx.rake
+- README
+- Manifest
+- LICENSE
+- lib/ultrasphinx.rb
+- lib/ultrasphinx/ultrasphinx.rb
+- lib/ultrasphinx/spell.rb
+- lib/ultrasphinx/search.rb
+- lib/ultrasphinx/search/parser.rb
+- lib/ultrasphinx/search/internals.rb
+- lib/ultrasphinx/is_indexed.rb
+- lib/ultrasphinx/fields.rb
+- lib/ultrasphinx/core_extensions.rb
+- lib/ultrasphinx/configure.rb
+- lib/ultrasphinx/autoload.rb
+- init.rb
+- examples/default.base
+- examples/app.multi
+- CHANGELOG
+- ultrasphinx.gemspec
+test_files: 
+- test/test_helper.rb
 rdoc_options: []
 
 extra_rdoc_files: []
@@ -62,5 +93,13 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: chronic
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: