shanna-dm-sphinx-adapter 0.7.1 → 0.8.0

data/Rakefile

@@ -0,0 +1,49 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name        = "dm-sphinx-adapter"
+    gem.summary     = %q{A DataMapper Sphinx adapter.}
+    gem.email       = "shane.hanna@gmail.com"
+    gem.homepage    = "http://github.com/shanna/dm-sphinx-adapter"
+    gem.authors     = ["Shane Hanna"]
+    gem.add_dependency 'dm-core', ['~> 0.9']
+    gem.files.reject!{|f| f=~ %r{test/files/tmp/.*}}
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = 'dm-sphinx-adapter'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
+task :default => :test

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 7
-:patch: 1
+:minor: 8
+:patch: 0

data/lib/dm-sphinx-adapter.rb

@@ -17,6 +17,7 @@ require 'riddle'
 # TODO: Require farms suck. Do something about it.
 require dir / 'adapter'
 require dir / 'attribute'
+require dir / 'collection'
 require dir / 'index'
 require dir / 'query'
 require dir / 'resource'

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

@@ -140,7 +140,9 @@ 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| doc[:id] = doc[:doc]; doc}
+            # TODO: Confusing, call it something other than collection?
+            Collection.new(result)
+            # result[:matches].map{|doc| doc[:id] = doc[:doc]; doc}
           end
 
 

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

@@ -0,0 +1,19 @@
+module DataMapper
+  module Adapters
+    module Sphinx
+      class Collection < Array
+        attr_accessor :error, :time, :total, :words
+
+        def initialize(result)
+          # TODO: One liner that works in Ruby 1.x now #indexes is #keys?
+          @error   = result[:error]
+          @time    = result[:time]
+          @total   = result[:total]
+          @words   = result[:words]
+          super result[:matches].map{|doc| doc[:id] = doc[:doc]; doc}
+        end
+
+      end
+    end # Sphinx
+  end # Adapters
+end # DataMapper

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

@@ -1,8 +1,8 @@
-require 'builder'
-
 module DataMapper
   module Adapters
     module Sphinx
+      require 'builder'
+
 
       # Sphinx xmlpipe2.
       #

data/test/helper.rb

@@ -3,8 +3,8 @@ require 'rubygems'
 require 'extlib'
 require 'extlib/hook'
 require 'pathname'
-require 'shoulda'
 require 'test/unit'
+require 'shoulda'
 
 base  = Pathname.new(__FILE__).dirname + '..'
 files = base + 'test' + 'files'

data/test/test_collection.rb

@@ -0,0 +1,26 @@
+require File.join(File.dirname(__FILE__), 'helper')
+
+class TestAdapter < Test::Unit::TestCase
+  context 'DM::A::Sphinx::Collection instance' do
+    setup do
+      load File.join(File.dirname(__FILE__), 'files', 'model.rb')
+      @it       = repository(:search)
+      @resource = Item
+    end
+
+    should 'have total' do
+      assert_equal 3, @it.read_many(query).total
+      assert_equal 1, @it.read_many(query(:t_string => 'two')).total
+    end
+
+    should 'have words' do
+      words = {'two' => {:docs => 1, :hits => 2}}
+      assert_equal words, @it.read_many(query(:t_string => 'two')).words
+    end
+  end
+
+  protected
+    def query(conditions = {})
+      DataMapper::Query.new(repository(:search), @resource, conditions)
+    end
+end

data/test/test_xmlpipe2.rb

@@ -3,6 +3,13 @@ require 'dm-sphinx-adapter/xmlpipe2'
 
 class TestResource < Test::Unit::TestCase
   context 'DM::A::Sphinx::Resource module' do
+    begin
+      require 'nokogiri'
+    rescue LoadError
+      warn '  * WARNING: Nokogiri not found, skipping xmlpipe2 tests.'
+      return nil
+    end
+
     setup do
       load File.join(File.dirname(__FILE__), 'files', 'model.rb')
     end
@@ -12,7 +19,7 @@ class TestResource < Test::Unit::TestCase
     end
 
     context '#xmlpipe2' do
-      should 'stream to stdout' do
+      setup do
         $stdout = StringIO.new
         Item.create(
           :id         => 1,
@@ -24,14 +31,45 @@ class TestResource < Test::Unit::TestCase
           :t_datetime => Time.at(1235914716)
         )
         Item.xmlpipe2(:default, :search)
-        xml = $stdout.rewind && $stdout.read
+        @xml = $stdout.rewind && $stdout.read
+        @doc = Nokogiri::XML.parse(@xml) rescue nil
+        @ns  = {'s' => 'sphinx'}
         $stdout = STDOUT
+      end
 
-        # TODO: Nokogiri or something and test some xpaths instead of a big eq match.
-        assert_equal(
-          File.open(File.join(File.dirname(__FILE__), 'files', 'test_xmlpipe2.xml')).read.chomp,
-          xml
-        )
+      should 'stream xml to stdout' do
+        assert_not_nil @xml
+        assert_not_nil @doc
+      end
+
+      context 'schema' do
+        should 'have id field' do
+          assert_not_nil @doc.xpath(%q{//s:field[@name='id']}, @ns).first
+        end
+
+        should 'have t_string field' do
+          assert_not_nil @doc.xpath(%q{//s:field[@name='t_string']}, @ns).first
+        end
+
+        should 'have text attribute' do
+          assert_not_nil @doc.xpath(%q{//s:attr[@name='t_text' and @type='str2ordinal']}, @ns).first
+        end
+
+        should 'have decimal attribute' do
+          assert_not_nil @doc.xpath(%q{//s:attr[@name='t_decimal' and @type='float']}, @ns).first
+        end
+
+        should 'have float attribute' do
+          assert_not_nil @doc.xpath(%q{//s:attr[@name='t_float' and @type='float']}, @ns).first
+        end
+
+        should 'have int attribute' do
+          assert_not_nil @doc.xpath(%q{//s:attr[@name='t_integer' and @type='int']}, @ns).first
+        end
+
+        should 'have timestamp attribute' do
+          assert_not_nil @doc.xpath(%q{//s:attr[@name='t_datetime' and @type='timestamp']}, @ns).first
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shanna-dm-sphinx-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors: 
 - Shane Hanna
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 -07:00
+date: 2009-05-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,53 +32,29 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - README.rdoc
+- Rakefile
 - VERSION.yml
-- lib/dm-sphinx-adapter
+- lib/dm-sphinx-adapter.rb
 - lib/dm-sphinx-adapter/adapter.rb
 - lib/dm-sphinx-adapter/attribute.rb
+- lib/dm-sphinx-adapter/collection.rb
 - lib/dm-sphinx-adapter/index.rb
 - lib/dm-sphinx-adapter/query.rb
 - lib/dm-sphinx-adapter/resource.rb
 - lib/dm-sphinx-adapter/xmlpipe2.rb
-- lib/dm-sphinx-adapter.rb
-- lib/riddle
-- lib/riddle/client
+- lib/riddle.rb
+- lib/riddle/client.rb
 - lib/riddle/client/filter.rb
 - lib/riddle/client/message.rb
 - lib/riddle/client/response.rb
-- lib/riddle/client.rb
-- lib/riddle.rb
-- test/files
 - test/files/model.rb
 - test/files/source.xml
 - test/files/sphinx.conf
 - test/files/test_xmlpipe2.xml
-- test/files/tmp
-- test/files/tmp/items.spa
-- test/files/tmp/items.spd
-- test/files/tmp/items.sph
-- test/files/tmp/items.spi
-- test/files/tmp/items.spl
-- test/files/tmp/items.spm
-- test/files/tmp/items.spp
-- test/files/tmp/items_delta.spa
-- test/files/tmp/items_delta.spd
-- test/files/tmp/items_delta.sph
-- test/files/tmp/items_delta.spi
-- test/files/tmp/items_delta.spm
-- test/files/tmp/items_delta.spp
-- test/files/tmp/items_main.spa
-- test/files/tmp/items_main.spd
-- test/files/tmp/items_main.sph
-- test/files/tmp/items_main.spi
-- test/files/tmp/items_main.spm
-- test/files/tmp/items_main.spp
-- test/files/tmp/sphinx.log
-- test/files/tmp/sphinx.pid
-- test/files/tmp/sphinx.query.log
 - test/helper.rb
 - test/test_adapter.rb
 - test/test_attribute.rb
+- test/test_collection.rb
 - test/test_index.rb
 - test/test_query.rb
 - test/test_resource.rb
@@ -87,7 +63,6 @@ has_rdoc: true
 homepage: http://github.com/shanna/dm-sphinx-adapter
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -110,5 +85,13 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A DataMapper Sphinx adapter.
-test_files: []
-
+test_files: 
+- test/files/model.rb
+- test/helper.rb
+- test/test_adapter.rb
+- test/test_attribute.rb
+- test/test_collection.rb
+- test/test_index.rb
+- test/test_query.rb
+- test/test_resource.rb
+- test/test_xmlpipe2.rb