shanna-dm-sphinx-adapter 0.6 → 0.6.1

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.6.1 / 2008-12-16
+
+  * The adapter returns the entire Riddle::Client#query response so document :weight and :attributes are usable.
+  * Fixed broken naming convention bug. The AbstractAdapter constructor was not being called.
+
+=== 0.6 / 2008-12-13
+
+  * Removed managed client and all related libs.
+  * Switched to Shoulda for tests in an effort to clean them up a bit.
+
 === 0.5 / 2008-12-01
 
   * Moved sphinx extended query string generator into a class of its own.

data/Rakefile

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

data/dm-sphinx-adapter.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-sphinx-adapter}
-  s.version = "0.6"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Shane Hanna"]
-  s.date = %q{2008-12-13}
+  s.date = %q{2008-12-16}
   s.description = %q{A DataMapper Sphinx adapter.}
   s.email = ["shane.hanna@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "LICENCE.txt", "Manifest.txt", "README.txt"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{dm-sphinx-adapter}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.0}
   s.summary = %q{A DataMapper Sphinx adapter.}
   s.test_files = ["test/test_adapter.rb", "test/test_attribute.rb", "test/test_index.rb", "test/test_query.rb", "test/test_resource.rb"]
 

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

@@ -1,5 +1,3 @@
-require 'benchmark'
-
 module DataMapper
   module Adapters
     module Sphinx
@@ -38,6 +36,8 @@ module DataMapper
         # uri_or_options<URI, DataObject::URI, Addressable::URI, String, Hash, Pathname>::
         #   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)}
@@ -58,11 +58,13 @@ module DataMapper
         # These methods are public but normally called indirectly through DataMapper::Resource#get,
         # DataMapper::Resource#first or DataMapper::Resource#all.
         #
+        # The document hashes returned are those from Riddle::Client.
+        #
         # ==== Parameters
         # query<DataMapper::Query>:: The query object.
         #
         # ==== Returns
-        # Array<Hash>:: An array of document hashes. <tt>[{:id => 1}, {:id => 2}]</tt>
+        # Array<Hash>:: An array of document hashes. <tt>[{:id => 1, ...}, {:id => 2, ...}]</tt>
         # Array<>::     An empty array if no documents match.
         def read_many(query)
           read(query)
@@ -79,7 +81,7 @@ module DataMapper
         # query<DataMapper::Query>:: The query object.
         #
         # ==== Returns
-        # Hash:: An document hash of the first document matched. <tt>{:id => 1}</tt>
+        # Hash:: An document hash of the first document matched. <tt>{:id => 1, ...}</tt>
         # Nil::  If no documents match.
         def read_one(query)
           read(query).first
@@ -113,7 +115,7 @@ module DataMapper
           # query<DataMapper::Query>:: The query object.
           #
           # ==== Returns
-          # Array<Hash>:: An array of document hashes. <tt>[{:id => 1}, {:id => 2}]</tt>
+          # 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(', ')
@@ -136,7 +138,7 @@ module DataMapper
             DataMapper.logger.info(
               %q{Sphinx (%.3f): search '%s' in '%s' found %d documents} % [result[:time], search, from, result[:total]]
             )
-            result[:matches].map{|doc| {:id => doc[:doc]}}
+            result[:matches].map{|doc| doc[:id] = doc[:doc]; doc}
           end
 
 

data/test/test_adapter.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestAdapter < Test::Unit::TestCase
-  context 'DM::A::Sphinx::Adapter class' do
+  context 'DM::A::Sphinx::Adapter' do
     setup do
       DataMapper.setup(:adapter, :adapter => 'sphinx')
       load File.join(File.dirname(__FILE__), 'files', 'model.rb')
@@ -9,14 +9,30 @@ class TestAdapter < Test::Unit::TestCase
       @resource = Item
     end
 
+    context 'class' do
+      should 'use default field naming convention' do
+        assert_equal(
+          DataMapper::NamingConventions::Field::Underscored,
+          @it.adapter.field_naming_convention
+        )
+      end
+
+      should 'use default resource naming convention' do
+        assert_equal(
+          DataMapper::NamingConventions::Resource::UnderscoredAndPluralized,
+          @it.adapter.resource_naming_convention
+        )
+      end
+    end
+
     context '#create' do
-      should 'should return zero records created' do
+      should 'return zero records created' do
         assert_equal 0, @it.create(create_resource)
       end
     end
 
     context '#delete' do
-      should 'should return zero records deleted' do
+      should 'return zero records deleted' do
         assert_equal 0, @it.delete(create_resource)
       end
     end
@@ -24,26 +40,26 @@ class TestAdapter < Test::Unit::TestCase
     context '#read_many' do
       context 'conditions' do
         should 'return all objects when nil' do
-          assert_equal [{:id => 1}, {:id => 2}, {:id => 3}], @it.read_many(query)
+          assert_equal [1, 2, 3], @it.read_many(query).map{|d| d[:id]}
         end
 
         should 'return subset of objects for conditions' do
-          assert_equal [{:id => 2}], @it.read_many(query(:t_string => 'two'))
+          assert_equal [2], @it.read_many(query(:t_string => 'two')).map{|d| d[:id]}
         end
       end
 
       context 'offsets' do
         should 'be able to offset the objects' do
-          assert_equal [{:id => 1}, {:id => 2}, {:id => 3}], @it.read_many(query(:offset => 0))
-          assert_equal [{:id => 2}, {:id => 3}], @it.read_many(query(:offset => 1))
+          assert_equal [1, 2, 3], @it.read_many(query(:offset => 0)).map{|d| d[:id]}
+          assert_equal [2, 3], @it.read_many(query(:offset => 1)).map{|d| d[:id]}
           assert_equal [], @it.read_many(query(:offset => 3))
         end
       end
 
       context 'limits' do
         should 'be able to limit the objects' do
-          assert_equal [{:id => 1}], @it.read_many(query(:limit => 1))
-          assert_equal [{:id => 1}, {:id => 2}], @it.read_many(query(:limit => 2))
+          assert_equal [1], @it.read_many(query(:limit => 1)).map{|d| d[:id]}
+          assert_equal [1, 2], @it.read_many(query(:limit => 2)).map{|d| d[:id]}
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shanna-dm-sphinx-adapter
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  version: 0.6.1
 platform: ruby
 authors: 
 - Shane Hanna
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-13 00:00:00 -08:00
+date: 2008-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency