pixeltrix-thinking-sphinx 1.1.5 → 1.2.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pixeltrix-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  version: 1.2.1
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-17 00:00:00 -08:00
+date: 2009-07-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,16 +22,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- rails/init.rb
+- lib/thinking_sphinx/active_record/attribute_updates.rb
 - lib/thinking_sphinx/active_record/delta.rb
 - lib/thinking_sphinx/active_record/has_many_association.rb
-- lib/thinking_sphinx/active_record/search.rb
+- lib/thinking_sphinx/active_record/scopes.rb
 - lib/thinking_sphinx/active_record.rb
 - lib/thinking_sphinx/adapters/abstract_adapter.rb
 - lib/thinking_sphinx/adapters/mysql_adapter.rb
 - lib/thinking_sphinx/adapters/postgresql_adapter.rb
 - lib/thinking_sphinx/association.rb
 - lib/thinking_sphinx/attribute.rb
-- lib/thinking_sphinx/collection.rb
+- lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.rb
 - lib/thinking_sphinx/core/string.rb
 - lib/thinking_sphinx/deltas/datetime_delta.rb
@@ -41,21 +43,28 @@ files:
 - lib/thinking_sphinx/deltas/delayed_delta/job.rb
 - lib/thinking_sphinx/deltas/delayed_delta.rb
 - lib/thinking_sphinx/deltas.rb
+- lib/thinking_sphinx/deploy/capistrano.rb
+- lib/thinking_sphinx/excerpter.rb
 - lib/thinking_sphinx/facet.rb
-- lib/thinking_sphinx/facet_collection.rb
+- lib/thinking_sphinx/facet_search.rb
 - lib/thinking_sphinx/field.rb
 - lib/thinking_sphinx/index/builder.rb
 - lib/thinking_sphinx/index/faux_column.rb
 - lib/thinking_sphinx/index.rb
+- lib/thinking_sphinx/property.rb
 - lib/thinking_sphinx/rails_additions.rb
 - lib/thinking_sphinx/search.rb
+- lib/thinking_sphinx/search_methods.rb
+- lib/thinking_sphinx/source/internal_properties.rb
+- lib/thinking_sphinx/source/sql.rb
+- lib/thinking_sphinx/source.rb
 - lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx.rb
 - LICENCE
-- README
+- README.textile
 - tasks/distribution.rb
-- tasks/rails.rake
 - tasks/testing.rb
+- tasks/rails.rake
 - vendor/after_commit
 - vendor/after_commit/init.rb
 - vendor/after_commit/lib
@@ -96,24 +105,46 @@ files:
 - vendor/riddle/lib/riddle/configuration.rb
 - vendor/riddle/lib/riddle/controller.rb
 - vendor/riddle/lib/riddle.rb
-- spec/unit/thinking_sphinx/active_record/delta_spec.rb
-- spec/unit/thinking_sphinx/active_record/has_many_association_spec.rb
-- spec/unit/thinking_sphinx/active_record/search_spec.rb
-- spec/unit/thinking_sphinx/active_record_spec.rb
-- spec/unit/thinking_sphinx/association_spec.rb
-- spec/unit/thinking_sphinx/attribute_spec.rb
-- spec/unit/thinking_sphinx/collection_spec.rb
-- spec/unit/thinking_sphinx/configuration_spec.rb
-- spec/unit/thinking_sphinx/core/string_spec.rb
-- spec/unit/thinking_sphinx/field_spec.rb
-- spec/unit/thinking_sphinx/index/builder_spec.rb
-- spec/unit/thinking_sphinx/index/faux_column_spec.rb
-- spec/unit/thinking_sphinx/index_spec.rb
-- spec/unit/thinking_sphinx/search_spec.rb
-- spec/unit/thinking_sphinx_spec.rb
+- spec/lib/thinking_sphinx/active_record/delta_spec.rb
+- spec/lib/thinking_sphinx/active_record/has_many_association_spec.rb
+- spec/lib/thinking_sphinx/active_record/scopes_spec.rb
+- spec/lib/thinking_sphinx/active_record_spec.rb
+- spec/lib/thinking_sphinx/association_spec.rb
+- spec/lib/thinking_sphinx/attribute_spec.rb
+- spec/lib/thinking_sphinx/configuration_spec.rb
+- spec/lib/thinking_sphinx/core/string_spec.rb
+- spec/lib/thinking_sphinx/excerpter_spec.rb
+- spec/lib/thinking_sphinx/facet_search_spec.rb
+- spec/lib/thinking_sphinx/facet_spec.rb
+- spec/lib/thinking_sphinx/field_spec.rb
+- spec/lib/thinking_sphinx/index/builder_spec.rb
+- spec/lib/thinking_sphinx/index/faux_column_spec.rb
+- spec/lib/thinking_sphinx/index_spec.rb
+- spec/lib/thinking_sphinx/rails_additions_spec.rb
+- spec/lib/thinking_sphinx/search_methods_spec.rb
+- spec/lib/thinking_sphinx/search_spec.rb
+- spec/lib/thinking_sphinx/source_spec.rb
+- spec/lib/thinking_sphinx_spec.rb
 has_rdoc: true
 homepage: http://ts.freelancing-gods.com
-post_install_message: 
+licenses: 
+post_install_message: |+
+  With the release of Thinking Sphinx 1.1.18, there is one important change to
+  note: previously, the default morphology for indexing was 'stem_en'. The new
+  default is nil, to avoid any unexpected behavior. If you wish to keep the old
+  value though, you will need to add the following settings to your
+  config/sphinx.yml file:
+  
+  development:
+    morphology: stem_en
+  test:
+    morphology: stem_en
+  production:
+    morphology: stem_en
+  
+  To understand morphologies/stemmers better, visit the following link:
+  http://www.sphinxsearch.com/docs/manual-0.9.8.html#conf-morphology
+  
 rdoc_options: 
 - --title
 - Thinking Sphinx -- Rails/Merb Sphinx Plugin
@@ -135,23 +166,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: thinking-sphinx
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
 test_files: 
-- spec/unit/thinking_sphinx/active_record/delta_spec.rb
-- spec/unit/thinking_sphinx/active_record/has_many_association_spec.rb
-- spec/unit/thinking_sphinx/active_record/search_spec.rb
-- spec/unit/thinking_sphinx/active_record_spec.rb
-- spec/unit/thinking_sphinx/association_spec.rb
-- spec/unit/thinking_sphinx/attribute_spec.rb
-- spec/unit/thinking_sphinx/collection_spec.rb
-- spec/unit/thinking_sphinx/configuration_spec.rb
-- spec/unit/thinking_sphinx/core/string_spec.rb
-- spec/unit/thinking_sphinx/field_spec.rb
-- spec/unit/thinking_sphinx/index/builder_spec.rb
-- spec/unit/thinking_sphinx/index/faux_column_spec.rb
-- spec/unit/thinking_sphinx/index_spec.rb
-- spec/unit/thinking_sphinx/search_spec.rb
-- spec/unit/thinking_sphinx_spec.rb
+- spec/lib/thinking_sphinx/active_record/delta_spec.rb
+- spec/lib/thinking_sphinx/active_record/has_many_association_spec.rb
+- spec/lib/thinking_sphinx/active_record/scopes_spec.rb
+- spec/lib/thinking_sphinx/active_record_spec.rb
+- spec/lib/thinking_sphinx/association_spec.rb
+- spec/lib/thinking_sphinx/attribute_spec.rb
+- spec/lib/thinking_sphinx/configuration_spec.rb
+- spec/lib/thinking_sphinx/core/string_spec.rb
+- spec/lib/thinking_sphinx/excerpter_spec.rb
+- spec/lib/thinking_sphinx/facet_search_spec.rb
+- spec/lib/thinking_sphinx/facet_spec.rb
+- spec/lib/thinking_sphinx/field_spec.rb
+- spec/lib/thinking_sphinx/index/builder_spec.rb
+- spec/lib/thinking_sphinx/index/faux_column_spec.rb
+- spec/lib/thinking_sphinx/index_spec.rb
+- spec/lib/thinking_sphinx/rails_additions_spec.rb
+- spec/lib/thinking_sphinx/search_methods_spec.rb
+- spec/lib/thinking_sphinx/search_spec.rb
+- spec/lib/thinking_sphinx/source_spec.rb
+- spec/lib/thinking_sphinx_spec.rb

data/README

@@ -1,107 +0,0 @@
-= Thinking Sphinx
-
-== Usage
-
-First, if you haven't done so already, check out the main usage[http://ts.freelancing-gods.com/usage.html] page. Once you've done that, the next place to look for information is the specific method docs - ThinkingSphinx::Search and ThinkingSphinx::Index::Builder in particular.
-
-Keep in mind that while Thinking Sphinx works for ActiveRecord with Merb, it doesn't yet support DataMapper (although that is planned).
-
-== Contributing
-
-Fork on GitHub and after you've committed tested patches, send a pull request.
-
-To get the spec suite running, you will need to install the not-a-mock gem if you don't already have it:
-
-  git clone git://github.com/freelancing-god/not-a-mock.git
-  cd not-a-mock
-  rake gem
-  gem install pkg/not_a_mock-1.1.0.gem
-  
-Then install the ginger gem. The steps are the same, except that you might need to sudo the gem install:
-
-  git clone git://github.com/freelancing-god/ginger.git
-  cd ginger
-  rake gem
-  sudo gem install pkg/ginger-1.1.0.gem
-
-Then set up your database:
-
-  cp spec/fixtures/database.yml.default spec/fixtures/database.yml
-  mysqladmin -u root create thinking_sphinx
-  
-Make sure you don't have another Sphinx daemon (searchd) running. If you do, quit it with "rake ts:stop"
-in the app root.
-
-You should now have a passing test suite from which to build your patch on.
-
-  rake spec
-  
-If you get the message "Failed to start searchd daemon", run the spec with sudo:
-
-  sudo rake spec
-  
-If you quit the spec suite before it's completed, you may be left with data in the test
-database, causing the next run to have failures. Let that run complete and then try again.
-
-== Contributors
-
-Since I first released this library, there's been quite a few people who have submitted patches, to my immense gratitude. Others have suggested syntax changes and general improvements. So my thanks to the following people:
-
-- Joost Hietbrink
-- Jonathan Conway
-- Gregory Mirzayantz
-- Tung Nguyen
-- Sean Cribbs
-- Benoit Caccinolo
-- John Barton
-- Oliver Beddows
-- Arthur Zapparoli
-- Dusty Doris
-- Marcus Crafter
-- Patrick Lenz
-- Björn Andreasson
-- James Healy
-- Jae-Jun Hwang
-- Xavier Shay
-- Jason Rust
-- Gopal Patel
-- Chris Heald
-- Peter Vandenberk
-- Josh French
-- Andrew Bennett
-- Jordan Fowler
-- Seth Walker
-- Joe Noon
-- Wolfgang Postler
-- Rick Olson
-- Killian Murphy
-- Morten Primdahl
-- Ryan Bates
-- David Eisinger
-- Shay Arnett
-- Minh Tran
-- Jeremy Durham
-- Piotr Sarnacki
-- Matt Johnson
-- Nicolas Blanco
-- Max Lapshin
-- Josh Natanson
-- Philip Hallstrom
-- Christian Rishøj
-- Mike Flester
-- Jim Remsik
-- Kennon Ballou
-- Henrik Nyh
-- Emil Tin
-- Doug Cole
-- Ed Hickey
-- Evan Weaver
-- Thibaut Barrere
-- Kristopher Chambers
-- Dmitrij Smalko
-- Aleksey Yeschenko
-- Lachie Cox
-- Lourens Naude
-- Tom Davies
-- Dan Pickett
-- Alex Caudill

data/lib/thinking_sphinx/active_record/search.rb

@@ -1,57 +0,0 @@
-module ThinkingSphinx
-  module ActiveRecord
-    # This module covers the specific model searches - but the syntax is
-    # exactly the same as the core Search class - so use that as your refence
-    # point.
-    # 
-    module Search
-      def self.included(base)
-        base.class_eval do
-          class << self
-            # Searches for results that match the parameters provided. Will only
-            # return the ids for the matching objects. See
-            # ThinkingSphinx::Search#search for syntax examples.
-            #
-            def search_for_ids(*args)
-              options = args.extract_options!
-              options[:class] = self
-              args << options
-              ThinkingSphinx::Search.search_for_ids(*args)
-            end
-
-            # Searches for results limited to a single model. See
-            # ThinkingSphinx::Search#search for syntax examples.
-            #
-            def search(*args)
-              options = args.extract_options!
-              options[:class] = self
-              args << options
-              ThinkingSphinx::Search.search(*args)
-            end
-
-            def search_count(*args)
-              options = args.extract_options!
-              options[:class] = self
-              args << options
-              ThinkingSphinx::Search.count(*args)
-            end
-
-            def search_for_id(*args)
-              options = args.extract_options!
-              options[:class] = self
-              args << options
-              ThinkingSphinx::Search.search_for_id(*args)
-            end
-            
-            def facets(*args)
-              options = args.extract_options!
-              options[:class] = self
-              args << options
-              ThinkingSphinx::Search.facets(*args)
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/collection.rb

@@ -1,142 +0,0 @@
-module ThinkingSphinx
-  class Collection < ::Array
-    attr_reader :total_entries, :total_pages, :current_page, :per_page
-    attr_accessor :results
-
-    # Compatibility with older versions of will_paginate
-    alias_method :page_count, :total_pages
-    
-    def initialize(page, per_page, entries, total_entries)
-      @current_page, @per_page, @total_entries = page, per_page, total_entries
-      
-      @total_pages = (entries / @per_page.to_f).ceil
-    end
-    
-    def self.ids_from_results(results, page, limit, options)
-      collection = self.new(page, limit,
-        results[:total] || 0, results[:total_found] || 0
-      )
-      collection.results = results
-      collection.replace results[:matches].collect { |match|
-        match[:attributes]["sphinx_internal_id"]
-      }
-      return collection
-    end
-    
-    def self.create_from_results(results, page, limit, options)
-      collection = self.new(page, limit,
-        results[:total] || 0, results[:total_found] || 0
-      )
-      collection.results = results
-      collection.replace instances_from_matches(results[:matches], options)
-      return collection
-    end
-    
-    def self.instances_from_matches(matches, options = {})
-      if klass = options[:class]
-        instances_from_class klass, matches, options
-      else
-        instances_from_classes matches, options
-      end
-    end
-    
-    def self.instances_from_class(klass, matches, options = {})
-      index_options = klass.sphinx_index_options
-
-      ids = matches.collect { |match| match[:attributes]["sphinx_internal_id"] }
-      instances = ids.length > 0 ? klass.find(
-        :all,
-        :conditions => {klass.primary_key.to_sym => ids},
-        :include    => (options[:include] || index_options[:include]),
-        :select     => (options[:select]  || index_options[:select])
-      ) : []
-
-      # Raise an exception if we find records in Sphinx but not in the DB, so
-      # the search method can retry without them. See 
-      # ThinkingSphinx::Search.retry_search_on_stale_index.
-      if options[:raise_on_stale] && instances.length < ids.length
-        stale_ids = ids - instances.map {|i| i.id }
-        raise StaleIdsException, stale_ids
-      end
-
-      ids.collect { |obj_id|
-        instances.detect { |obj| obj.id == obj_id }
-      }
-    end
-    
-    # Group results by class and call #find(:all) once for each group to reduce
-    # the number of #find's in multi-model searches.
-    # 
-    def self.instances_from_classes(matches, options = {})
-      groups = matches.group_by { |match| match[:attributes]["class_crc"] }
-      groups.each do |crc, group|
-        group.replace(
-          instances_from_class(class_from_crc(crc), group, options)
-        )
-      end
-      
-      matches.collect do |match|
-        groups.detect { |crc, group|
-          crc == match[:attributes]["class_crc"]
-        }[1].detect { |obj|
-          obj.id == match[:attributes]["sphinx_internal_id"]
-        }
-      end
-    end
-    
-    def self.class_from_crc(crc)
-      @@models_by_crc ||= ThinkingSphinx.indexed_models.inject({}) do |hash, model|
-        hash[model.constantize.to_crc32] = model
-        model.constantize.subclasses.each { |subclass|
-          hash[subclass.to_crc32] = subclass.name
-        }
-        hash
-      end
-      @@models_by_crc[crc].constantize
-    end
-    
-    def previous_page
-      current_page > 1 ? (current_page - 1) : nil
-    end
-    
-    def next_page
-      current_page < total_pages ? (current_page + 1): nil
-    end
-    
-    def offset
-      (current_page - 1) * @per_page
-    end
-    
-    def method_missing(method, *args, &block)
-      super unless method.to_s[/^each_with_.*/]
-      
-      each_with_attribute method.to_s.gsub(/^each_with_/, ''), &block
-    end
-    
-    def each_with_groupby_and_count(&block)
-      results[:matches].each_with_index do |match, index|
-        yield self[index], match[:attributes]["@groupby"], match[:attributes]["@count"]
-      end
-    end
-    
-    def each_with_attribute(attribute, &block)
-      results[:matches].each_with_index do |match, index|
-        yield self[index], (match[:attributes][attribute] || match[:attributes]["@#{attribute}"])
-      end
-    end
-    
-    def each_with_weighting(&block)
-      results[:matches].each_with_index do |match, index|
-        yield self[index], match[:weight]
-      end
-    end
-    
-    def inject_with_groupby_and_count(initial = nil, &block)
-      index = -1
-      results[:matches].inject(initial) do |memo, match|
-        index += 1
-        yield memo, self[index], match[:attributes]["@groupby"], match[:attributes]["@count"]
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/facet_collection.rb

@@ -1,44 +0,0 @@
-module ThinkingSphinx
-  class FacetCollection < Hash
-    attr_accessor :arguments
-    
-    def initialize(arguments)
-      @arguments        = arguments.clone
-      @attribute_values = {}
-      @facets           = []
-    end
-    
-    def add_from_results(facet, results)
-      self[facet.name]              = {}
-      @attribute_values[facet.name] = {}
-      @facets << facet
-      
-      results.each_with_groupby_and_count { |result, group, count|
-        facet_value = facet.value(result, group)
-        
-        self[facet.name][facet_value]               = count
-        @attribute_values[facet.name][facet_value]  = group
-      }
-    end
-    
-    def for(hash = {})
-      arguments        = @arguments.clone
-      options          = arguments.extract_options!
-      options[:with] ||= {}
-      
-      hash.each do |key, value|
-        attrib = facet_for_key(key).attribute_name
-        options[:with][attrib] = @attribute_values[key][value]
-      end
-      
-      arguments << options
-      ThinkingSphinx::Search.search *arguments
-    end
-    
-    private
-    
-    def facet_for_key(key)
-      @facets.detect { |facet| facet.name == key }
-    end
-  end
-end

data/spec/unit/thinking_sphinx/active_record/search_spec.rb

@@ -1,107 +0,0 @@
-require 'spec/spec_helper'
-
-describe "ThinkingSphinx::ActiveRecord::Search" do
-  it "should add search_for_ids to ActiveRecord::Base" do
-    ActiveRecord::Base.methods.should include("search_for_ids")
-  end
-  
-  it "should add search_for_ids to ActiveRecord::Base" do
-    ActiveRecord::Base.methods.should include("search")
-  end
-  
-  it "should add search_count to ActiveRecord::Base" do
-    ActiveRecord::Base.methods.should include("search_count")
-  end
-
-  it "should add search_for_id to ActiveRecord::Base" do
-    ActiveRecord::Base.methods.should include("search_for_id")
-  end
-  
-  describe "search_for_ids method" do
-    before :each do
-      ThinkingSphinx::Search.stub_method(:search_for_ids => true)
-    end
-    
-    it "should call ThinkingSphinx::Search#search_for_ids with the class option set" do
-      Person.search_for_ids("search")
-      
-      ThinkingSphinx::Search.should have_received(:search_for_ids).with(
-        "search", :class => Person
-      )
-    end
-    
-    it "should override the class option" do
-      Person.search_for_ids("search", :class => Friendship)
-      
-      ThinkingSphinx::Search.should have_received(:search_for_ids).with(
-        "search", :class => Person
-      )
-    end
-  end
-  
-  describe "search method" do
-    before :each do
-      ThinkingSphinx::Search.stub_method(:search => true)
-    end
-    
-    it "should call ThinkingSphinx::Search#search with the class option set" do
-      Person.search("search")
-      
-      ThinkingSphinx::Search.should have_received(:search).with(
-        "search", :class => Person
-      )
-    end
-    
-    it "should override the class option" do
-      Person.search("search", :class => Friendship)
-      
-      ThinkingSphinx::Search.should have_received(:search).with(
-        "search", :class => Person
-      )
-    end
-  end
-  
-  describe "search_for_id method" do
-    before :each do
-      ThinkingSphinx::Search.stub_method(:search_for_id => true)
-    end
-    
-    it "should call ThinkingSphinx::Search#search with the class option set" do
-      Person.search_for_id(10)
-      
-      ThinkingSphinx::Search.should have_received(:search_for_id).with(
-        10, :class => Person
-      )
-    end
-    
-    it "should override the class option" do
-      Person.search_for_id(10, :class => Friendship)
-      
-      ThinkingSphinx::Search.should have_received(:search_for_id).with(
-        10, :class => Person
-      )
-    end
-  end
-
-  describe "search_count method" do
-    before :each do
-      ThinkingSphinx::Search.stub_method(:count => true)
-    end
-
-    it "should call ThinkingSphinx::Search#search with the class option set" do
-      Person.search_count("search")
-
-      ThinkingSphinx::Search.should have_received(:count).with(
-        "search", :class => Person
-      )
-    end
-
-    it "should override the class option" do
-      Person.search_count("search", :class => Friendship)
-
-      ThinkingSphinx::Search.should have_received(:count).with(
-        "search", :class => Person
-      )
-    end
-  end
-end