model_set 1.0.0 → 1.1.0

data/vendor/sphinx_client/lib/sphinx/client.rb

@@ -57,9 +57,9 @@ module Sphinx
     # Current client-side command implementation versions
     
     # search command version
-    VER_COMMAND_SEARCH   = 0x116
+    VER_COMMAND_SEARCH   = 0x119
     # excerpt command version
-    VER_COMMAND_EXCERPT  = 0x100
+    VER_COMMAND_EXCERPT  = 0x102
     # update command version
     VER_COMMAND_UPDATE   = 0x102
     # keywords command version
@@ -107,7 +107,12 @@ module Sphinx
     SPH_RANK_WORDCOUNT      = 3
     # phrase proximity
     SPH_RANK_PROXIMITY      = 4
-    
+    SPH_RANK_MATCHANY       = 5
+    SPH_RANK_FIELDMASK      = 6
+    SPH_RANK_SPH04          = 7
+    SPH_RANK_EXPR           = 8
+    SPH_RANK_TOTAL          = 9
+
     # Known sort modes
   
     # sort by document relevance desc, then by date
@@ -147,8 +152,11 @@ module Sphinx
     SPH_ATTR_FLOAT     = 5
     # signed 64-bit integer
     SPH_ATTR_BIGINT    = 6
+	# string
+	SPH_ATTR_STRING		= 7
     # this attr has multiple values (0 or more)
-    SPH_ATTR_MULTI     = 0x40000000
+	SPH_ATTR_MULTI			= 0x40000001
+	SPH_ATTR_MULTI64		= 0x40000002
     
     # Known grouping functions
   
@@ -169,7 +177,7 @@ module Sphinx
     def initialize
       # per-client-object settings
       @host          = 'localhost'             # searchd host (default is "localhost")
-      @port          = 3312                    # searchd port (default is 3312)
+      @port          = 9312                    # searchd port (default is 9312)
       
       # per-query settings
       @offset        = 0                       # how many records to seek from result-set start (default is 0)
@@ -192,6 +200,7 @@ module Sphinx
       @anchor        = []                      # geographical anchor point
       @indexweights  = []                      # per-index weights
       @ranker        = SPH_RANK_PROXIMITY_BM25 # ranking mode (default is SPH_RANK_PROXIMITY_BM25)
+      @rankexpr	     = ''                      # ranker expression for SPH_RANK_EXPR
       @maxquerytime  = 0                       # max query time, milliseconds (default is 0, do not limit) 
       @fieldweights  = {}                      # per-field-name weights
       @overrides     = []                      # per-query attribute values overrides
@@ -262,14 +271,19 @@ module Sphinx
     end
     
     # Set ranking mode.
-    def SetRankingMode(ranker)
+    def SetRankingMode(ranker, rankexpr = '')
       assert { ranker == SPH_RANK_PROXIMITY_BM25 \
             || ranker == SPH_RANK_BM25 \
             || ranker == SPH_RANK_NONE \
             || ranker == SPH_RANK_WORDCOUNT \
-            || ranker == SPH_RANK_PROXIMITY }
+            || ranker == SPH_RANK_PROXIMITY \
+            || ranker == SPH_RANK_MATCHANY \
+            || ranker == SPH_RANK_FIELDMASK \
+            || ranker == SPH_RANK_SPH04 \
+            || ranker == SPH_RANK_EXPR }
 
       @ranker = ranker
+      @rankexpr = rankexpr
     end
     
     # Set matches sorting mode.
@@ -349,7 +363,7 @@ module Sphinx
 
       if values.instance_of?(Array) && values.size > 0
         values.each do |value|
-          assert { value.instance_of? Fixnum or value.instance_of? Bignum }
+          assert { value.instance_of? Fixnum }
         end
       
         @filters << { 'type' => SPH_FILTER_VALUES, 'attr' => attribute, 'exclude' => exclude, 'values' => values }
@@ -564,7 +578,14 @@ module Sphinx
   
       # mode and limits
       request = Request.new
-      request.put_int @offset, @limit, @mode, @ranker, @sort
+      request.put_int @offset, @limit, @mode, @ranker
+      # process the 'expr' ranker
+      if @ranker == SPH_RANK_EXPR
+        request.put_string @rankexpr
+      end
+
+      request.put_int @sort
+
       request.put_string @sortby
       # query itself
       request.put_string query
@@ -758,14 +779,23 @@ module Sphinx
                 when SPH_ATTR_FLOAT
                   # handle floats
                   r['attrs'][a] = response.get_float
+				when SPH_ATTR_STRING
+				  # handle string
+				  r['attrs'][a] = response.get_string
                 else
                   # handle everything else as unsigned ints
                   val = response.get_int
-                  if (attrs[a] & SPH_ATTR_MULTI) != 0
+                  if attrs[a]==SPH_ATTR_MULTI
                     r['attrs'][a] = []
                     1.upto(val) do
                       r['attrs'][a] << response.get_int
                     end
+                  elsif attrs[a]==SPH_ATTR_MULTI64
+                    r['attrs'][a] = []
+					val = val/2
+                    1.upto(val) do
+                      r['attrs'][a] << response.get_int64
+                    end
                   else
                     r['attrs'][a] = val
                   end
@@ -825,12 +855,18 @@ module Sphinx
       opts['before_match'] ||= '<b>';
       opts['after_match'] ||= '</b>';
       opts['chunk_separator'] ||= ' ... ';
+	  opts['html_strip_mode'] ||= 'index';
       opts['limit'] ||= 256;
+	  opts['limit_passages'] ||= 0;
+	  opts['limit_words'] ||= 0;
       opts['around'] ||= 5;
+	  opts['start_passage_id'] ||= 1;
       opts['exact_phrase'] ||= false
       opts['single_passage'] ||= false
       opts['use_boundaries'] ||= false
       opts['weight_order'] ||= false
+	  opts['load_files'] ||= false
+	  opts['allow_empty'] ||= false
       
       # build request
       
@@ -840,6 +876,10 @@ module Sphinx
       flags |= 4  if opts['single_passage']
       flags |= 8  if opts['use_boundaries']
       flags |= 16 if opts['weight_order']
+	  flags |= 32 if opts['query_mode']
+	  flags |= 64 if opts['force_all_words']
+	  flags |= 128 if opts['load_files']
+	  flags |= 256 if opts['allow_empty']
       
       request = Request.new
       request.put_int 0, flags # mode=0, flags=1 (remove spaces)
@@ -853,6 +893,12 @@ module Sphinx
       request.put_string opts['after_match']
       request.put_string opts['chunk_separator']
       request.put_int opts['limit'].to_i, opts['around'].to_i
+	  
+	  # options v1.2
+	  request.put_int opts['limit_passages'].to_i
+	  request.put_int opts['limit_words'].to_i
+	  request.put_int opts['start_passage_id'].to_i
+	  request.put_string opts['html_strip_mode']
       
       # documents
       request.put_int docs.size
@@ -989,9 +1035,13 @@ module Sphinx
       # Connect to searchd server.
       def Connect
         begin
-          sock = TCPSocket.new(@host, @port)
-        rescue
-          @error = "connection to #{@host}:#{@port} failed"
+          if @host[0,1]=='/'
+            sock = UNIXSocket.new(@host)
+          else
+            sock = TCPSocket.new(@host, @port)
+          end
+        rescue => err
+          @error = "connection to #{@host}:#{@port} failed (error=#{err})"
           raise SphinxConnectError, @error
         end
         
@@ -1032,9 +1082,9 @@ module Sphinx
         # check response
         read = response.length
         if response.empty? or read != len.to_i
-          @error = len \
-            ? "failed to read searchd response (status=#{status}, ver=#{ver}, len=#{len}, read=#{read})" \
-            : 'received zero-sized searchd response'
+          @error = response.empty? \
+            ? 'received zero-sized searchd response' \
+            : "failed to read searchd response (status=#{status}, ver=#{ver}, len=#{len}, read=#{read})"
           raise SphinxResponseError, @error
         end
         
@@ -1076,9 +1126,9 @@ module Sphinx
         command_ver = Sphinx::Client.const_get('VER_COMMAND_' + cmd)
         
         sock = self.Connect
-        len = request.to_s.length + (additional != nil ? 4 : 0)
+        len = request.to_s.length + (additional != nil ? 8 : 0)
         header = [command_id, command_ver, len].pack('nnN')
-        header << [additional].pack('N') if additional != nil
+        header << [0, additional].pack('NN') if additional != nil
         sock.send(header + request.to_s, 0)
         response = self.GetResponse(sock, command_ver)
         return Response.new(response)

data/vendor/sphinx_client/lib/sphinx/response.rb

@@ -1,69 +1,69 @@
-module Sphinx
-  # Unpack internal Sphinx representation of ints, floats, strings, and arrays.
-  # needed by Sphinx search engine.
-  class Response
-    # Initialize new request.
-    def initialize(response)
-      @response = response
-      @position = 0
-      @size = response.length
-    end
-    
-    # Gets current stream position.
-    def position
-      @position
-    end
-    
-    # Gets response size.
-    def size
-      @size
-    end
-    
-    # Returns <tt>true</tt> when response stream is out.
-    def eof?
-      @position >= @size
-    end
-
-    # Get int from stream.
-    def get_int
-      raise EOFError if @position + 4 > @size
-      value = @response[@position, 4].unpack('N*').first
-      @position += 4
-      return value
-    end
-
-    # Get 64-bit int from stream.
-    def get_int64
-      raise EOFError if @position + 8 > @size
-      hi, lo = @response[@position, 8].unpack('N*N*')
-      @position += 8
-      return (hi << 32) + lo
-    end
-
-    # Get array of <tt>count</tt> ints from stream.
-    def get_ints(count)
-      length = 4 * count
-      raise EOFError if @position + length > @size
-      values = @response[@position, length].unpack('N*' * count)
-      @position += length
-      return values
-    end
-    
-    # Get string from stream.
-    def get_string
-      length = get_int
-      raise EOFError if @position + length > @size
-      value = length > 0 ? @response[@position, length] : ''
-      @position += length
-      return value
-    end
-    
-    # Get float from stream.
-    def get_float
-      raise EOFError if @position + 4 > @size
-      uval = @response[@position, 4].unpack('N*').first;
-      @position += 4
-      return ([uval].pack('L')).unpack('f*').first
-    end
-  end
+module Sphinx
+  # Unpack internal Sphinx representation of ints, floats, strings, and arrays.
+  # needed by Sphinx search engine.
+  class Response
+    # Initialize new request.
+    def initialize(response)
+      @response = response
+      @position = 0
+      @size = response.length
+    end
+    
+    # Gets current stream position.
+    def position
+      @position
+    end
+    
+    # Gets response size.
+    def size
+      @size
+    end
+    
+    # Returns <tt>true</tt> when response stream is out.
+    def eof?
+      @position >= @size
+    end
+
+    # Get int from stream.
+    def get_int
+      raise EOFError if @position + 4 > @size
+      value = @response[@position, 4].unpack('N*').first
+      @position += 4
+      return value
+    end
+
+    # Get 64-bit int from stream.
+    def get_int64
+      raise EOFError if @position + 8 > @size
+      hi, lo = @response[@position, 8].unpack('N*N*')
+      @position += 8
+      return (hi << 32) + lo
+    end
+
+    # Get array of <tt>count</tt> ints from stream.
+    def get_ints(count)
+      length = 4 * count
+      raise EOFError if @position + length > @size
+      values = @response[@position, length].unpack('N*' * count)
+      @position += length
+      return values
+    end
+    
+    # Get string from stream.
+    def get_string
+      length = get_int
+      raise EOFError if @position + length > @size
+      value = length > 0 ? @response[@position, length] : ''
+      @position += length
+      return value
+    end
+    
+    # Get float from stream.
+    def get_float
+      raise EOFError if @position + 4 > @size
+      uval = @response[@position, 4].unpack('N*').first;
+      @position += 4
+      return ([uval].pack('L')).unpack('f*').first
+    end
+  end
 end

data/vendor/sphinx_client/spec/client_spec.rb

@@ -30,14 +30,14 @@ describe 'The Connect method of Sphinx::Client' do
   end
 
   it 'should establish TCP connection to the server and initialize session' do
-    TCPSocket.should_receive(:new).with('localhost', 3312).and_return(@sock)
+    TCPSocket.should_receive(:new).with('localhost', 9312).and_return(@sock)
     @sock.should_receive(:recv).with(4).and_return([1].pack('N'))
     @sock.should_receive(:send).with([1].pack('N'), 0)
     @sphinx.send(:Connect).should be(@sock)
   end
 
   it 'should raise exception when searchd protocol is not 1+' do
-    TCPSocket.should_receive(:new).with('localhost', 3312).and_return(@sock)
+    TCPSocket.should_receive(:new).with('localhost', 9312).and_return(@sock)
     @sock.should_receive(:recv).with(4).and_return([0].pack('N'))
     @sock.should_receive(:close)
     lambda { @sphinx.send(:Connect) }.should raise_error(Sphinx::SphinxConnectError)
@@ -45,9 +45,9 @@ describe 'The Connect method of Sphinx::Client' do
   end
 
   it 'should raise exception on connection error' do
-    TCPSocket.should_receive(:new).with('localhost', 3312).and_raise(Errno::EBADF)
+    TCPSocket.should_receive(:new).with('localhost', 9312).and_raise(Errno::EBADF)
     lambda { @sphinx.send(:Connect) }.should raise_error(Sphinx::SphinxConnectError)
-    @sphinx.GetLastError.should == 'connection to localhost:3312 failed'
+    @sphinx.GetLastError.should == 'connection to localhost:9312 failed'
   end
 
   it 'should use custom host and port' do

data/vendor/sphinx_client/spec/fixtures/keywords.php

@@ -1,8 +1,8 @@
-<?php
-
-require ("sphinxapi.php");
-
-$cl = new SphinxClient();
-$cl->BuildKeywords('test', 'index', true);
-
+<?php
+
+require ("sphinxapi.php");
+
+$cl = new SphinxClient();
+$cl->BuildKeywords('test', 'index', true);
+
 ?>

data/vendor/sphinx_client/spec/fixtures/sphinxapi.php

@@ -5,7 +5,9 @@
 //
 
 //
-// Copyright (c) 2001-2008, Andrew Aksyonoff. All rights reserved.
+// Copyright (c) 2001-2012, Andrew Aksyonoff
+// Copyright (c) 2008-2012, Sphinx Technologies Inc
+// All rights reserved
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License. You should have
@@ -177,7 +179,7 @@ function sphUnpack64 ( $v )
 class SphinxClient
 {
 	var $_host;			///< searchd host (default is "localhost")
-	var $_port;			///< searchd port (default is 3312)
+	var $_port;			///< searchd port (default is 9312)
 	var $_offset;		///< how many records to seek from result-set start (default is 0)
 	var $_limit;		///< how many records to return from result-set starting at offset (default is 20)
 	var $_mode;			///< query matching mode (default is SPH_MATCH_ALL)
@@ -219,7 +221,7 @@ class SphinxClient
 	{
 		// per-client-object settings
 		$this->_host		= "localhost";
-		$this->_port		= 3312;
+		$this->_port		= 9312;
 
 		// per-query settings
 		$this->_offset		= 0;

data/vendor/sphinx_client/spec/sphinx/sphinx-id64.conf

@@ -57,7 +57,7 @@ indexer
 
 searchd
 {
-    port                = 3312
+    port                = 9312
     log                 = /opt/sphinx-0.9.9-id64/var/log/searchd.log
     query_log           = /opt/sphinx-0.9.9-id64/var/log/query.log
     read_timeout        = 5

data/vendor/sphinx_client/spec/sphinx/sphinx.conf

@@ -57,7 +57,7 @@ indexer
 
 searchd
 {
-    port                = 3312
+    port                = 9312
     log                 = /opt/sphinx-0.9.9/var/log/searchd.log
     query_log           = /opt/sphinx-0.9.9/var/log/query.log
     read_timeout        = 5

data/vendor/sphinx_client/test.rb

@@ -0,0 +1,27 @@
+#
+# $Id$
+#
+
+require 'init.rb'
+
+q = ARGV.join(' ')
+@sphinx = Sphinx::Client.new
+# @sphinx.SetSortMode(Sphinx::Client::SPH_SORT_ATTR_ASC, 'created_at')
+results = @sphinx.Query(q)
+
+puts "Query '#{q}' retrieved #{results['total']} of #{results['total_found']} matches in #{results['time']} sec.";
+puts "Query stats:";
+results['words'].each do |word, info|
+	puts "    '#{word}' found #{info['hits']} times in #{info['docs']} documents\n"
+end
+puts
+
+n = 1
+results['matches'].each do |doc|
+	print "#{n}. doc_id=#{doc['id']}, weight=#{doc['weight']}"
+	doc['attrs'].each do |attr, value|
+		print ", #{attr}=#{value}"
+	end
+	puts
+	n = n+1
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: model_set
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -15,13 +15,113 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 -07:00
+date: 2013-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ordered_set
+  name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 0
+        - 1
+        version: 3.0.1
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rsolr
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: system_timer
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: activerecord-postgresql-adapter
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: ordered_set
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,11 +133,11 @@ dependencies:
         - 1
         version: 1.0.1
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: deep_clonable
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,33 +149,37 @@ dependencies:
         - 0
         version: 1.1.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 17
         segments: 
         - 2
-        - 0
-        - 0
-        version: 2.0.0
+        - 3
+        - 9
+        version: 2.3.9
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id010
 description: Easy manipulation of sets of ActiveRecord models
-email: code@justinbalthrop.com
+email: 
+- git@justinbalthrop.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .rbenv-gemsets
+- .rbenv-version
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -172,8 +276,9 @@ files:
 - vendor/sphinx_client/spec/sphinx/sphinx_test.sql
 - vendor/sphinx_client/sphinx.yml.tpl
 - vendor/sphinx_client/tasks/sphinx.rake
+- vendor/sphinx_client/test.rb
 has_rdoc: true
-homepage: http://github.com/ninjudd/model_set
+homepage: https://github.com/ninjudd/model_set
 licenses: []
 
 post_install_message: 
@@ -202,9 +307,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Easy manipulation of sets of ActiveRecord models
-test_files: []
-
+test_files: 
+- test/model_set_test.rb
+- test/multi_set_test.rb
+- test/test_helper.rb