ultrasphinx 1.6.7 → 1.7

data/test/integration/app/db/migrate/009_create_countries.rb

@@ -0,0 +1,11 @@
+class CreateCountries < ActiveRecord::Migration
+  def self.up
+    create_table "countries", :force => true do |t|
+      t.string "name",         :default => "", :null => false
+    end
+  end
+
+  def self.down
+    drop_table "countries"
+  end
+end

data/test/integration/app/test/fixtures/countries.yml

@@ -0,0 +1 @@
+# Intentionally left blank

data/test/integration/configure_test.rb

@@ -5,18 +5,21 @@ class ConfigureTest < Test::Unit::TestCase
   
   CONF = "#{RAILS_ROOT}/config/ultrasphinx/development.conf"
   
-  def test_configuration_hasnt_changed
+  def test_configuration_hasnt_changed  
+    unless ENV['DB'] =~ /postgresql/i
+      # MySQL only right now... not really a big deal
 
-    File.delete CONF if File.exist? CONF
-    Dir.chdir RAILS_ROOT do
-      Ultrasphinx::Configure.run
-    end
-
-    @offset = 4
-    @current = open(CONF).readlines[@offset..-1]
-    @canonical = open(CONF + ".canonical").readlines[@offset..-1] 
-    @canonical.each_with_index do |line, index|
-       assert_equal line, @current[index], "line #{index}:#{line.inspect} is incorrect"
+      File.delete CONF if File.exist? CONF
+      Dir.chdir RAILS_ROOT do
+        Ultrasphinx::Configure.run
+      end
+  
+      @offset = 4
+      @current = open(CONF).readlines[@offset..-1]
+      @canonical = open(CONF + ".canonical").readlines[@offset..-1] 
+      @canonical.each_with_index do |line, index|
+         assert_equal line, @current[index], "line #{index}:#{line.inspect} is incorrect"
+      end      
     end
   end
 

data/test/integration/search_test.rb

@@ -205,6 +205,7 @@ class SearchTest < Test::Unit::TestCase
   end
   
   def test_text_facet
+    # XXX Still broken on Postgres
     @s = Ultrasphinx::Search.new(:facets => ['company_name']).run
     assert_equal 21, @s.facets['company_name'].size
   end

data/test/integration/server_test.rb

@@ -12,7 +12,7 @@ class ServerTest < Test::Unit::TestCase
   def setup
     @pid = Process.fork do
        Dir.chdir RAILS_ROOT do
-         print "S"
+         # print "S"
          exec("script/server -p #{PORT} &> /dev/null")
        end
      end
@@ -23,7 +23,7 @@ class ServerTest < Test::Unit::TestCase
     # Process.kill(9, @pid) doesn't work because Mongrel has double-forked itself away
     `ps awx | grep #{PORT} | grep -v grep | awk '{print $1}'`.split("\n").each do |pid|
       system("kill -9 #{pid}")
-      print "K"
+      # print "K"
     end
     sleep(2)
     @pid = nil

data/test/setup.rb

@@ -1,9 +1,6 @@
 
 # Setup integration system for the integration suite
 
-puts ["Please make sure that test/integration/app/vendor/rails is symlinked",
-  "to a Rails trunk checkout in order for the rake tasks to run properly."]
-
 Dir.chdir "#{File.dirname(__FILE__)}/integration/app/" do
   system("killall searchd")
   system("rm -rf /tmp/sphinx")

data/test/test_helper.rb

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'test/unit'
 require 'ruby-debug'
+require 'multi_rails_init'
 
 HERE = File.dirname(__FILE__)
 $LOAD_PATH << HERE
@@ -11,9 +12,3 @@ require 'integration/app/config/environment'
 Dir.chdir "#{HERE}/integration/app" do
   system("rake us:start")
 end
-
-def silently
-  stderr, $stderr = $stderr, StringIO.new
-  yield
-  $stderr = stderr
-end

data/ultrasphinx.gemspec

@@ -1,24 +1,24 @@
 
-# Gem::Specification for Ultrasphinx-1.6.7
+# Gem::Specification for Ultrasphinx-1.7
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{ultrasphinx}
-  s.version = "1.6.7"
+  s.version = "1.7"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [""]
-  s.date = %q{2007-12-13}
+  s.date = %q{2008-01-12}
   s.description = %q{Ruby on Rails configurator and client to the Sphinx fulltext search engine.}
   s.email = %q{}
-  s.files = ["CHANGELOG", "examples/ap.multi", "examples/default.base", "init.rb", "lib/ultrasphinx/autoload.rb", "lib/ultrasphinx/configure.rb", "lib/ultrasphinx/core_extensions.rb", "lib/ultrasphinx/fields.rb", "lib/ultrasphinx/is_indexed.rb", "lib/ultrasphinx/postgresql/concat_ws.sql", "lib/ultrasphinx/postgresql/crc32.sql", "lib/ultrasphinx/postgresql/group_concat.sql", "lib/ultrasphinx/postgresql/hex_to_int.sql", "lib/ultrasphinx/postgresql/language.sql", "lib/ultrasphinx/postgresql/unix_timestamp.sql", "lib/ultrasphinx/search/internals.rb", "lib/ultrasphinx/search/parser.rb", "lib/ultrasphinx/search.rb", "lib/ultrasphinx/spell.rb", "lib/ultrasphinx/ultrasphinx.rb", "lib/ultrasphinx.rb", "LICENSE", "Manifest", "README", "tasks/ultrasphinx.rake", "test/config/ultrasphinx/test.base", "test/integration/app/app/controllers/addresses_controller.rb", "test/integration/app/app/controllers/application.rb", "test/integration/app/app/controllers/sellers_controller.rb", "test/integration/app/app/controllers/states_controller.rb", "test/integration/app/app/controllers/users_controller.rb", "test/integration/app/app/helpers/addresses_helper.rb", "test/integration/app/app/helpers/application_helper.rb", "test/integration/app/app/helpers/sellers_helper.rb", "test/integration/app/app/helpers/states_helper.rb", "test/integration/app/app/helpers/users_helper.rb", "test/integration/app/app/models/geo/address.rb", "test/integration/app/app/models/geo/state.rb", "test/integration/app/app/models/person/user.rb", "test/integration/app/app/models/seller.rb", "test/integration/app/app/views/addresses/edit.html.erb", "test/integration/app/app/views/addresses/index.html.erb", "test/integration/app/app/views/addresses/new.html.erb", "test/integration/app/app/views/addresses/show.html.erb", "test/integration/app/app/views/layouts/addresses.html.erb", "test/integration/app/app/views/layouts/sellers.html.erb", "test/integration/app/app/views/layouts/states.html.erb", "test/integration/app/app/views/layouts/users.html.erb", "test/integration/app/app/views/sellers/edit.html.erb", "test/integration/app/app/views/sellers/index.html.erb", "test/integration/app/app/views/sellers/new.html.erb", "test/integration/app/app/views/sellers/show.html.erb", "test/integration/app/app/views/states/edit.html.erb", "test/integration/app/app/views/states/index.html.erb", "test/integration/app/app/views/states/new.html.erb", "test/integration/app/app/views/states/show.html.erb", "test/integration/app/app/views/users/edit.html.erb", "test/integration/app/app/views/users/index.html.erb", "test/integration/app/app/views/users/new.html.erb", "test/integration/app/app/views/users/show.html.erb", "test/integration/app/config/boot.rb", "test/integration/app/config/database.yml", "test/integration/app/config/environment.rb", "test/integration/app/config/environments/development.rb", "test/integration/app/config/environments/production.rb", "test/integration/app/config/environments/test.rb", "test/integration/app/config/locomotive.yml", "test/integration/app/config/routes.rb", "test/integration/app/config/ultrasphinx/default.base", "test/integration/app/config/ultrasphinx/development.conf", "test/integration/app/config/ultrasphinx/development.conf.canonical", "test/integration/app/db/migrate/001_create_users.rb", "test/integration/app/db/migrate/002_create_sellers.rb", "test/integration/app/db/migrate/003_create_addresses.rb", "test/integration/app/db/migrate/004_create_states.rb", "test/integration/app/db/migrate/005_add_capitalization_to_seller.rb", "test/integration/app/db/migrate/006_add_deleted_to_user.rb", "test/integration/app/db/migrate/007_add_lat_and_long_to_address.rb", "test/integration/app/db/migrate/008_add_mission_statement_to_seller.rb", "test/integration/app/db/schema.rb", "test/integration/app/doc/README_FOR_APP", "test/integration/app/public/404.html", "test/integration/app/public/500.html", "test/integration/app/public/dispatch.cgi", "test/integration/app/public/dispatch.fcgi", "test/integration/app/public/dispatch.rb", "test/integration/app/public/favicon.ico", "test/integration/app/public/images/rails.png", "test/integration/app/public/index.html", "test/integration/app/public/javascripts/application.js", "test/integration/app/public/javascripts/controls.js", "test/integration/app/public/javascripts/dragdrop.js", "test/integration/app/public/javascripts/effects.js", "test/integration/app/public/javascripts/prototype.js", "test/integration/app/public/robots.txt", "test/integration/app/public/stylesheets/scaffold.css", "test/integration/app/Rakefile", "test/integration/app/README", "test/integration/app/script/about", "test/integration/app/script/breakpointer", "test/integration/app/script/console", "test/integration/app/script/destroy", "test/integration/app/script/generate", "test/integration/app/script/performance/benchmarker", "test/integration/app/script/performance/profiler", "test/integration/app/script/plugin", "test/integration/app/script/process/inspector", "test/integration/app/script/process/reaper", "test/integration/app/script/process/spawner", "test/integration/app/script/runner", "test/integration/app/script/server", "test/integration/app/test/fixtures/addresses.yml", "test/integration/app/test/fixtures/sellers.yml", "test/integration/app/test/fixtures/states.yml", "test/integration/app/test/fixtures/users.yml", "test/integration/app/test/functional/addresses_controller_test.rb", "test/integration/app/test/functional/sellers_controller_test.rb", "test/integration/app/test/functional/states_controller_test.rb", "test/integration/app/test/functional/users_controller_test.rb", "test/integration/app/test/test_helper.rb", "test/integration/app/test/unit/address_test.rb", "test/integration/app/test/unit/seller_test.rb", "test/integration/app/test/unit/state_test.rb", "test/integration/app/test/unit/user_test.rb", "test/integration/configure_test.rb", "test/integration/search_test.rb", "test/integration/server_test.rb", "test/integration/spell_test.rb", "test/setup.rb", "test/test_all.rb", "test/test_helper.rb", "test/ts.multi", "test/unit/parser_test.rb", "TODO", "vendor/riddle/lib/riddle/client/filter.rb", "vendor/riddle/lib/riddle/client/message.rb", "vendor/riddle/lib/riddle/client/response.rb", "vendor/riddle/lib/riddle/client.rb", "vendor/riddle/lib/riddle.rb", "vendor/riddle/MIT-LICENCE", "vendor/riddle/Rakefile", "vendor/riddle/README", "vendor/riddle/spec/fixtures/data/anchor.bin", "vendor/riddle/spec/fixtures/data/any.bin", "vendor/riddle/spec/fixtures/data/boolean.bin", "vendor/riddle/spec/fixtures/data/distinct.bin", "vendor/riddle/spec/fixtures/data/filter.bin", "vendor/riddle/spec/fixtures/data/filter_array.bin", "vendor/riddle/spec/fixtures/data/filter_array_exclude.bin", "vendor/riddle/spec/fixtures/data/filter_floats.bin", "vendor/riddle/spec/fixtures/data/filter_floats_exclude.bin", "vendor/riddle/spec/fixtures/data/filter_floats_range.bin", "vendor/riddle/spec/fixtures/data/filter_range.bin", "vendor/riddle/spec/fixtures/data/filter_range_exclude.bin", "vendor/riddle/spec/fixtures/data/group.bin", "vendor/riddle/spec/fixtures/data/index.bin", "vendor/riddle/spec/fixtures/data/phrase.bin", "vendor/riddle/spec/fixtures/data/simple.bin", "vendor/riddle/spec/fixtures/data/sort.bin", "vendor/riddle/spec/fixtures/data/update_simple.bin", "vendor/riddle/spec/fixtures/data/weights.bin", "vendor/riddle/spec/fixtures/sphinx/configuration.erb", "vendor/riddle/spec/fixtures/sql/conf.example.yml", "vendor/riddle/spec/fixtures/sql/data.sql", "vendor/riddle/spec/fixtures/sql/structure.sql", "vendor/riddle/spec/functional/excerpt_spec.rb", "vendor/riddle/spec/functional/search_spec.rb", "vendor/riddle/spec/functional/update_spec.rb", "vendor/riddle/spec/spec_helper.rb", "vendor/riddle/spec/sphinx_helper.rb", "vendor/riddle/spec/unit/client_spec.rb", "vendor/riddle/spec/unit/filter_spec.rb", "vendor/riddle/spec/unit/message_spec.rb", "vendor/riddle/spec/unit/response_spec.rb", "vendor/will_paginate/LICENSE", "ultrasphinx.gemspec"]
+  s.files = ["CHANGELOG", "DEPLOYMENT_NOTES", "examples/ap.multi", "examples/default.base", "init.rb", "lib/ultrasphinx/associations.rb", "lib/ultrasphinx/autoload.rb", "lib/ultrasphinx/configure.rb", "lib/ultrasphinx/core_extensions.rb", "lib/ultrasphinx/fields.rb", "lib/ultrasphinx/is_indexed.rb", "lib/ultrasphinx/postgresql/concat_ws.sql", "lib/ultrasphinx/postgresql/crc32.sql", "lib/ultrasphinx/postgresql/group_concat.sql", "lib/ultrasphinx/postgresql/hex_to_int.sql", "lib/ultrasphinx/postgresql/language.sql", "lib/ultrasphinx/postgresql/unix_timestamp.sql", "lib/ultrasphinx/search/internals.rb", "lib/ultrasphinx/search/parser.rb", "lib/ultrasphinx/search.rb", "lib/ultrasphinx/spell.rb", "lib/ultrasphinx/ultrasphinx.rb", "lib/ultrasphinx.rb", "LICENSE", "Manifest", "RAKE_TASKS", "README", "tasks/ultrasphinx.rake", "test/config/ultrasphinx/test.base", "test/integration/app/app/controllers/addresses_controller.rb", "test/integration/app/app/controllers/application.rb", "test/integration/app/app/controllers/sellers_controller.rb", "test/integration/app/app/controllers/states_controller.rb", "test/integration/app/app/controllers/users_controller.rb", "test/integration/app/app/helpers/addresses_helper.rb", "test/integration/app/app/helpers/application_helper.rb", "test/integration/app/app/helpers/sellers_helper.rb", "test/integration/app/app/helpers/states_helper.rb", "test/integration/app/app/helpers/users_helper.rb", "test/integration/app/app/models/geo/address.rb", "test/integration/app/app/models/geo/country.rb", "test/integration/app/app/models/geo/state.rb", "test/integration/app/app/models/person/user.rb", "test/integration/app/app/models/seller.rb", "test/integration/app/app/views/addresses/edit.html.erb", "test/integration/app/app/views/addresses/index.html.erb", "test/integration/app/app/views/addresses/new.html.erb", "test/integration/app/app/views/addresses/show.html.erb", "test/integration/app/app/views/layouts/addresses.html.erb", "test/integration/app/app/views/layouts/sellers.html.erb", "test/integration/app/app/views/layouts/states.html.erb", "test/integration/app/app/views/layouts/users.html.erb", "test/integration/app/app/views/sellers/edit.html.erb", "test/integration/app/app/views/sellers/index.html.erb", "test/integration/app/app/views/sellers/new.html.erb", "test/integration/app/app/views/sellers/show.html.erb", "test/integration/app/app/views/states/edit.html.erb", "test/integration/app/app/views/states/index.html.erb", "test/integration/app/app/views/states/new.html.erb", "test/integration/app/app/views/states/show.html.erb", "test/integration/app/app/views/users/edit.html.erb", "test/integration/app/app/views/users/index.html.erb", "test/integration/app/app/views/users/new.html.erb", "test/integration/app/app/views/users/show.html.erb", "test/integration/app/config/boot.rb", "test/integration/app/config/database.yml", "test/integration/app/config/environment.rb", "test/integration/app/config/environments/development.rb", "test/integration/app/config/environments/production.rb", "test/integration/app/config/environments/test.rb", "test/integration/app/config/locomotive.yml", "test/integration/app/config/routes.rb", "test/integration/app/config/ultrasphinx/default.base", "test/integration/app/config/ultrasphinx/development.conf.canonical", "test/integration/app/db/migrate/001_create_users.rb", "test/integration/app/db/migrate/002_create_sellers.rb", "test/integration/app/db/migrate/003_create_addresses.rb", "test/integration/app/db/migrate/004_create_states.rb", "test/integration/app/db/migrate/005_add_capitalization_to_seller.rb", "test/integration/app/db/migrate/006_add_deleted_to_user.rb", "test/integration/app/db/migrate/007_add_lat_and_long_to_address.rb", "test/integration/app/db/migrate/008_add_mission_statement_to_seller.rb", "test/integration/app/db/migrate/009_create_countries.rb", "test/integration/app/doc/README_FOR_APP", "test/integration/app/public/404.html", "test/integration/app/public/500.html", "test/integration/app/public/dispatch.cgi", "test/integration/app/public/dispatch.fcgi", "test/integration/app/public/dispatch.rb", "test/integration/app/public/favicon.ico", "test/integration/app/public/images/rails.png", "test/integration/app/public/index.html", "test/integration/app/public/javascripts/application.js", "test/integration/app/public/javascripts/controls.js", "test/integration/app/public/javascripts/dragdrop.js", "test/integration/app/public/javascripts/effects.js", "test/integration/app/public/javascripts/prototype.js", "test/integration/app/public/robots.txt", "test/integration/app/public/stylesheets/scaffold.css", "test/integration/app/Rakefile", "test/integration/app/README", "test/integration/app/script/about", "test/integration/app/script/breakpointer", "test/integration/app/script/console", "test/integration/app/script/destroy", "test/integration/app/script/generate", "test/integration/app/script/performance/benchmarker", "test/integration/app/script/performance/profiler", "test/integration/app/script/plugin", "test/integration/app/script/process/inspector", "test/integration/app/script/process/reaper", "test/integration/app/script/process/spawner", "test/integration/app/script/runner", "test/integration/app/script/server", "test/integration/app/test/fixtures/addresses.yml", "test/integration/app/test/fixtures/countries.yml", "test/integration/app/test/fixtures/sellers.yml", "test/integration/app/test/fixtures/states.yml", "test/integration/app/test/fixtures/users.yml", "test/integration/app/test/functional/addresses_controller_test.rb", "test/integration/app/test/functional/sellers_controller_test.rb", "test/integration/app/test/functional/states_controller_test.rb", "test/integration/app/test/functional/users_controller_test.rb", "test/integration/app/test/test_helper.rb", "test/integration/app/test/unit/address_test.rb", "test/integration/app/test/unit/seller_test.rb", "test/integration/app/test/unit/state_test.rb", "test/integration/app/test/unit/user_test.rb", "test/integration/configure_test.rb", "test/integration/search_test.rb", "test/integration/server_test.rb", "test/integration/spell_test.rb", "test/setup.rb", "test/teardown.rb", "test/test_all.rb", "test/test_helper.rb", "test/ts.multi", "test/unit/parser_test.rb", "TODO", "vendor/riddle/lib/riddle/client/filter.rb", "vendor/riddle/lib/riddle/client/message.rb", "vendor/riddle/lib/riddle/client/response.rb", "vendor/riddle/lib/riddle/client.rb", "vendor/riddle/lib/riddle.rb", "vendor/riddle/MIT-LICENCE", "vendor/riddle/Rakefile", "vendor/riddle/README", "vendor/riddle/spec/fixtures/data/anchor.bin", "vendor/riddle/spec/fixtures/data/any.bin", "vendor/riddle/spec/fixtures/data/boolean.bin", "vendor/riddle/spec/fixtures/data/distinct.bin", "vendor/riddle/spec/fixtures/data/filter.bin", "vendor/riddle/spec/fixtures/data/filter_array.bin", "vendor/riddle/spec/fixtures/data/filter_array_exclude.bin", "vendor/riddle/spec/fixtures/data/filter_floats.bin", "vendor/riddle/spec/fixtures/data/filter_floats_exclude.bin", "vendor/riddle/spec/fixtures/data/filter_floats_range.bin", "vendor/riddle/spec/fixtures/data/filter_range.bin", "vendor/riddle/spec/fixtures/data/filter_range_exclude.bin", "vendor/riddle/spec/fixtures/data/group.bin", "vendor/riddle/spec/fixtures/data/index.bin", "vendor/riddle/spec/fixtures/data/phrase.bin", "vendor/riddle/spec/fixtures/data/simple.bin", "vendor/riddle/spec/fixtures/data/sort.bin", "vendor/riddle/spec/fixtures/data/update_simple.bin", "vendor/riddle/spec/fixtures/data/weights.bin", "vendor/riddle/spec/fixtures/sphinx/configuration.erb", "vendor/riddle/spec/fixtures/sql/conf.example.yml", "vendor/riddle/spec/fixtures/sql/data.sql", "vendor/riddle/spec/fixtures/sql/structure.sql", "vendor/riddle/spec/functional/excerpt_spec.rb", "vendor/riddle/spec/functional/search_spec.rb", "vendor/riddle/spec/functional/update_spec.rb", "vendor/riddle/spec/spec_helper.rb", "vendor/riddle/spec/sphinx_helper.rb", "vendor/riddle/spec/unit/client_spec.rb", "vendor/riddle/spec/unit/filter_spec.rb", "vendor/riddle/spec/unit/message_spec.rb", "vendor/riddle/spec/unit/response_spec.rb", "vendor/will_paginate/LICENSE", "ultrasphinx.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/ultrasphinx/}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{0.9.5}
+  s.rubygems_version = %q{1.0.1}
   s.summary = %q{Ruby on Rails configurator and client to the Sphinx fulltext search engine.}
   s.test_files = ["test/test_all.rb"]
 
@@ -36,8 +36,22 @@ end
 #   p.summary = "Ruby on Rails configurator and client to the Sphinx fulltext search engine."
 #   p.url = "http://blog.evanweaver.com/files/doc/fauna/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.rdoc_pattern = /is_indexed.rb|search.rb|spell.rb|ultrasphinx.rb|^README|TODO|DEPLOY|RAKE_TASKS|CHANGELOG|^LICENSE/
 #   p.dependencies = "chronic"
 #   p.test_pattern = ["test/integration/*.rb", "test/unit/*.rb"]
-#   p.rcov_options << '--include-file test\/integration\/app\/vendor\/plugins\/ultrasphinx\/lib\/.*\.rb'
+#   p.rcov_options << '--include-file test\/integration\/app\/vendor\/plugins\/ultrasphinx\/lib\/.*\.rb --include-file '
 # end
+# 
+# desc "Run all the tests for every database adapter" 
+# task "test_all" do
+#   ['mysql', 'postgresql'].each do |adapter|
+#     ENV['DB'] = adapter
+#     ENV['PRODUCTION'] = nil
+#     STDERR.puts "#{'='*80}\nDevelopment mode for #{adapter}\n#{'='*80}"
+#     system("rake test:multi_rails:all")
+#   
+#     ENV['PRODUCTION'] = '1'
+#     STDERR.puts "#{'='*80}\nProduction mode for #{adapter}\n#{'='*80}"
+#     system("rake test:multi_rails:all")    
+#   end
+# end

data/vendor/riddle/README

@@ -8,13 +8,13 @@ opting for a more Ruby-like structure.
 While it doesn't (yet) exist as a gem, you can obtain the sourcecode via subversion. If you
 are after a specific release, use the tag as follows:
 
-  svn co http://rails-oceania.googlecode.com/svn/patallan/riddle/tags/0.9.8-r871 riddle
+  svn co http://rails-oceania.googlecode.com/svn/patallan/riddle/tags/0.9.8-r985 riddle
 
 Or for the most current, just use trunk:
 
   svn co http://rails-oceania.googlecode.com/svn/patallan/riddle/trunk riddle
 
-Please note that at the time of writing, only 0.9.8r871 is supported.
+Please note that at the time of writing, only 0.9.8r871, 0.9.8r909 and 0.9.8r985 are supported.
 
 To get started, just instantiate a Client object:
 

data/vendor/riddle/Rakefile

@@ -1,12 +1,106 @@
 require 'rake'
 require 'rake/rdoctask'
 require 'spec/rake/spectask'
+require 'rdoc/rdoc'
+require 'rdoc/generators/html_generator'
+require 'rdoc/generators/template/html/html'
+
+module Generators
+  class HtmlFile < ContextUser
+    alias_method :core_attribute_values, :file_attribute_values
+    
+    def file_attribute_values
+      core_attribute_values
+      
+      @values["analytics"] = @options.analytics if @options.analytics
+    end
+  end
+  
+  class HtmlClass < ContextUser
+    alias_method :core_attribute_values, :class_attribute_values
+    
+    def class_attribute_values
+      core_attribute_values
+      
+      @values["analytics"] = @options.analytics if @options.analytics
+    end
+  end
+end
+
+class Options
+  attr_accessor :analytics
+  
+  module OptionList
+    OPTION_LIST << [
+      "--analytics", "-y", "code", "Google Analytics Code"
+    ]
+  end
+  
+  alias_method :core_parse, :parse
+  
+  def parse(argv, generators)
+    core_parse(argv, generators)
+    
+    old_args = ARGV.dup
+    ARGV.replace(argv)
+        
+    go = GetoptLong.new(*OptionList.options)
+    go.quiet = true
+    
+    go.each do |opt, arg|
+      case opt
+      when "--analytics"
+        @analytics = arg.strip
+      end
+    end
+    
+    ARGV.replace(old_args)
+  end
+    
+end
+
+module RDoc
+  module Page
+    remove_const :FOOTER
+    const_set :FOOTER, %{
+    <div id="validator-badges">
+      <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+    </div>
+    <script type="text/javascript">
+    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+    document.write("\\<script src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'>\\<\\/script>" );
+    </script>
+    <script type="text/javascript">
+    var pageTracker = _gat._getTracker("%analytics%");
+    pageTracker._initData();
+    pageTracker._trackPageview();
+    </script>
+    
+    </body>
+    </html>
+    }
+    
+    remove_const :BODY
+    const_set :BODY, HEADER + %{
+
+    !INCLUDE!  <!-- banner header -->
+
+      <div id="bodyContent">
+
+    } +  METHOD_LIST + %{
+
+      </div>
+
+    } + FOOTER
+  end
+end
 
 desc 'Generate documentation'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Riddle - Ruby Sphinx Client'
   rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.options << '-y US-2475317-6'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/vendor/riddle/lib/riddle.rb

@@ -11,7 +11,7 @@ module Riddle #:nodoc:
     Major = 0
     Minor = 9
     Tiny  = 8
-    Rev   = 871
+    Rev   = 985
     
     String = [Major, Minor, Tiny].join('.') + "r#{Rev}"
   end

data/vendor/riddle/lib/riddle/client.rb

@@ -45,11 +45,13 @@ module Riddle
     }
     
     MatchModes = {
-      :all      => 0, # SPH_MATCH_ALL
-      :any      => 1, # SPH_MATCH_ANY
-      :phrase   => 2, # SPH_MATCH_PHRASE
-      :boolean  => 3, # SPH_MATCH_BOOLEAN
-      :extended => 4  # SPH_MATCH_EXTENDED
+      :all        => 0, # SPH_MATCH_ALL
+      :any        => 1, # SPH_MATCH_ANY
+      :phrase     => 2, # SPH_MATCH_PHRASE
+      :boolean    => 3, # SPH_MATCH_BOOLEAN
+      :extended   => 4, # SPH_MATCH_EXTENDED
+      :fullsacn   => 5, # SPH_MATCH_FULLSCAN
+      :extended2  => 6  # SPH_MATCH_EXTENDED2
     }
     
     SortModes = {
@@ -272,6 +274,8 @@ module Riddle
     # * :chunk_separator (defaults to ' … ' - which is an HTML ellipsis)
     # * :limit (defaults to 256)
     # * :around (defaults to 5)
+    # * :exact_phrase (defaults to false)
+    # * :single_passage (defaults to false)
     #
     # The defaults differ from the official PHP client, as I've opted for
     # semantic HTML markup.
@@ -282,6 +286,8 @@ module Riddle
       options[:chunk_separator] ||= ' … ' # ellipsis
       options[:limit]           ||= 256
       options[:around]          ||= 5
+      options[:exact_phrase]    ||= false
+      options[:single_passage]  ||= false
       
       response = Response.new request(:excerpt, excerpts_message(options))
       
@@ -443,7 +449,13 @@ module Riddle
     def excerpts_message(options)
       message = Message.new
       
-      message.append [0, 1].pack('N2') # mode = 0, flags = 1
+      flags = 1
+      flags |= 2  if options[:exact_phrase]
+      flags |= 4  if options[:single_passage]
+      flags |= 8  if options[:use_boundaries]
+      flags |= 16 if options[:weight_order]
+      
+      message.append [0, flags].pack('N2') # 0 = mode
       message.append_string options[:index]
       message.append_string options[:words]
       

data/vendor/riddle/lib/riddle/client/filter.rb

@@ -31,7 +31,9 @@ module Riddle
         when Array
           message.append_int FilterTypes[:values]
           message.append_int self.values.length
-          message.append_ints *self.values
+          # using to_f is a hack from the php client - to workaround 32bit
+          # signed ints on x32 platforms
+          message.append_ints *self.values.collect { |val| val.to_f }
         end
         message.append_int self.exclude? ? 1 : 0
         

data/vendor/riddle/lib/riddle/client/message.rb

@@ -26,7 +26,7 @@ module Riddle
       
       # Append a float
       def append_float(float)
-        @message << [float].pack('f')
+        @message << [float].pack('f').unpack('L*').pack("N")
       end
       
       # Append multiple integers

data/vendor/riddle/lib/riddle/client/response.rb

@@ -30,7 +30,7 @@ module Riddle
       
       # Return the next float value from the stream
       def next_float
-        float = @str[@marker, 4].unpack('f*').first
+        float = @str[@marker, 4].unpack('N*').pack('L').unpack('f*').first
         @marker += 4
         
         return float

data/vendor/riddle/spec/sphinx_helper.rb

@@ -1,5 +1,6 @@
 require 'mysql'
 require 'erb'
+require 'yaml'
 
 class SphinxHelper
   attr_accessor :host, :username, :password

data/vendor/riddle/spec/unit/message_spec.rb

@@ -28,7 +28,7 @@ describe Riddle::Client::Message do
   it "should append floats correctly - packed with f" do
     message = Riddle::Client::Message.new
     message.append_float 1.4
-    message.to_s.should == [1.4].pack('f')
+    message.to_s.should == [1.4].pack('f').unpack('L*').pack('N')
   end
   
   it "should append a collection of integers correctly" do
@@ -40,7 +40,7 @@ describe Riddle::Client::Message do
   it "should append a collection of floats correctly" do
     message = Riddle::Client::Message.new
     message.append_floats 1.0, 1.1, 1.2, 1.3
-    message.to_s.should == [1.0, 1.1, 1.2, 1.3].pack('ffff')
+    message.to_s.should == [1.0, 1.1, 1.2, 1.3].pack('ffff').unpack('L*L*L*L*').pack('NNNN')
   end
   
   it "should append an array of strings correctly" do
@@ -58,6 +58,6 @@ describe Riddle::Client::Message do
     message.append_array ["one", "two"]
     message.append_floats 1.5, 1.7
     message.to_s.should == [4, 4].pack('NN') + "test" + [2, 3].pack('NN') +
-      "one" + [3].pack('N') + "two" + [1.5, 1.7].pack('ff')
+      "one" + [3].pack('N') + "two" + [1.5, 1.7].pack('ff').unpack('L*L*').pack('NN')
   end
 end

data/vendor/riddle/spec/unit/response_spec.rb

@@ -14,7 +14,7 @@ describe Riddle::Client::Response do
   
   # Comparing floats with decimal places doesn't seem to be exact
   it "should interpret a float correctly" do
-    Riddle::Client::Response.new([1.0].pack('f')).next_float.should == 1.0
+    Riddle::Client::Response.new([1.0].pack('f').unpack('L*').pack('N')).next_float.should == 1.0
   end
   
   it "should interpret an array of strings correctly" do
@@ -53,7 +53,7 @@ describe Riddle::Client::Response do
   
   it "should handle a combination of strings, ints, floats and string arrays correctly" do
     data = [1, 2, 2].pack('NNN') + 'aa' + [2].pack('N') + 'bb' + [4].pack('N') +
-      "word" + [7, 3, 2, 2, 2].pack('fNNNN')
+      "word" + [7].pack('f').unpack('L*').pack('N') + [3, 2, 2, 2].pack('NNNN')
     response = Riddle::Client::Response.new(data)
     response.next_int.should == 1
     response.next_array.should == ['aa', 'bb']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ultrasphinx
 version: !ruby/object:Gem::Version 
-  version: 1.6.7
+  version: "1.7"
 platform: ruby
 authors: 
 - ""
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2007-12-13 00:00:00 -05:00
+date: 2008-01-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,9 +52,11 @@ extra_rdoc_files: []
 
 files: 
 - CHANGELOG
+- DEPLOYMENT_NOTES
 - examples/ap.multi
 - examples/default.base
 - init.rb
+- lib/ultrasphinx/associations.rb
 - lib/ultrasphinx/autoload.rb
 - lib/ultrasphinx/configure.rb
 - lib/ultrasphinx/core_extensions.rb
@@ -74,6 +76,7 @@ files:
 - lib/ultrasphinx.rb
 - LICENSE
 - Manifest
+- RAKE_TASKS
 - README
 - tasks/ultrasphinx.rake
 - test/config/ultrasphinx/test.base
@@ -88,6 +91,7 @@ files:
 - test/integration/app/app/helpers/states_helper.rb
 - test/integration/app/app/helpers/users_helper.rb
 - test/integration/app/app/models/geo/address.rb
+- test/integration/app/app/models/geo/country.rb
 - test/integration/app/app/models/geo/state.rb
 - test/integration/app/app/models/person/user.rb
 - test/integration/app/app/models/seller.rb
@@ -120,7 +124,6 @@ files:
 - test/integration/app/config/locomotive.yml
 - test/integration/app/config/routes.rb
 - test/integration/app/config/ultrasphinx/default.base
-- test/integration/app/config/ultrasphinx/development.conf
 - test/integration/app/config/ultrasphinx/development.conf.canonical
 - test/integration/app/db/migrate/001_create_users.rb
 - test/integration/app/db/migrate/002_create_sellers.rb
@@ -130,7 +133,7 @@ files:
 - test/integration/app/db/migrate/006_add_deleted_to_user.rb
 - test/integration/app/db/migrate/007_add_lat_and_long_to_address.rb
 - test/integration/app/db/migrate/008_add_mission_statement_to_seller.rb
-- test/integration/app/db/schema.rb
+- test/integration/app/db/migrate/009_create_countries.rb
 - test/integration/app/doc/README_FOR_APP
 - test/integration/app/public/404.html
 - test/integration/app/public/500.html
@@ -163,6 +166,7 @@ files:
 - test/integration/app/script/runner
 - test/integration/app/script/server
 - test/integration/app/test/fixtures/addresses.yml
+- test/integration/app/test/fixtures/countries.yml
 - test/integration/app/test/fixtures/sellers.yml
 - test/integration/app/test/fixtures/states.yml
 - test/integration/app/test/fixtures/users.yml
@@ -180,6 +184,7 @@ files:
 - test/integration/server_test.rb
 - test/integration/spell_test.rb
 - test/setup.rb
+- test/teardown.rb
 - test/test_all.rb
 - test/test_helper.rb
 - test/ts.multi
@@ -249,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 0.9.5
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: Ruby on Rails configurator and client to the Sphinx fulltext search engine.