shanna-dm-sphinx-adapter 0.6.1 → 0.6.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.6.2 / 2008-12-16
+
+  * Fixed shallow .dup of riddle client errors. You need to upgrade if you are running 0.6.1.
+
 === 0.6.1 / 2008-12-16
 
   * The adapter returns the entire Riddle::Client#query response so document :weight and :attributes are usable.

data/Rakefile

@@ -3,7 +3,7 @@
 require 'rubygems'
 require 'hoe'
 
-Hoe.new('dm-sphinx-adapter', '0.6.1') do |p|
+Hoe.new('dm-sphinx-adapter', '0.6.2') do |p|
   p.developer('Shane Hanna', 'shane.hanna@gmail.com')
   p.extra_deps = [
     ['dm-core', '~> 0.9.7']

data/dm-sphinx-adapter.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-sphinx-adapter}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Hanna"]

data/lib/dm-sphinx-adapter/adapter.rb

@@ -37,10 +37,7 @@ module DataMapper
         #   DataMapper uri or options hash.
         def initialize(name, uri_or_options)
           super # Set up defaults.
-
-          options = normalize_options(uri_or_options)
-          @client = Riddle::Client.new(options.delete(:host), options.delete(:port))
-          options.each{|k, v| @client.method("#{k}=".to_sym).call(v) if @client.respond_to?("#{k}=".to_sym)}
+          @options = normalize_options(uri_or_options)
         end
 
         def create(resources) #:nodoc:
@@ -118,10 +115,15 @@ module DataMapper
           # Array<Hash>:: An array of document hashes. <tt>[{:id => 1, ...}, {:id => 2, ...}]</tt>
           # Array<>::     An empty array if no documents match.
           def read(query)
-            from    = indexes(query.model).map{|index| index.name}.join(', ')
-            search  = Sphinx::Query.new(query).to_s
+            from   = indexes(query.model).map{|index| index.name}.join(', ')
+            search = Sphinx::Query.new(query).to_s
+            client = Riddle::Client.new(@options[:host], @options[:port])
+
+            # You can set some options that aren't set by the adapter.
+            @options.except(:host, :port, :match_mode, :limit, :offset, :sort_mode, :sort_by).each do |k, v|
+              client.method("#{k}=".to_sym).call(v) if client.respond_to?("#{k}=".to_sym)
+            end
 
-            client            = @client.dup
             client.match_mode = :extended
             client.filters    = search_filters(query) # By attribute.
             client.limit      = query.limit.to_i  if query.limit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shanna-dm-sphinx-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Shane Hanna