thinking-sphinx 1.3.10 → 1.3.11

data/VERSION

@@ -1 +1 @@
-1.3.10
+1.3.11

data/features/abstract_inheritance.feature

@@ -0,0 +1,10 @@
+Feature: Abstract inheritance
+  In order to use Thinking Sphinx in complex situations
+  As a developer
+  I want to define indexes on subclasses of abstract models
+
+  Scenario: Searching on subclasses of abstract models
+    Given Sphinx is running
+    And I am searching on music
+    When I search
+    Then I should get 3 results

data/features/support/db/fixtures/music.rb

@@ -0,0 +1,4 @@
+pop = Genre.create(:name => "Pop")
+Music.create :artist => "Gotye", :album => "Like Drawing Blood", :track => "Heart's A Mess", :genre => pop
+Music.create :artist => "The Whitlams", :album => "Eternal Nightcap", :track => "Melbourne", :genre => pop
+Music.create :artist => "Ben Folds", :album => "Ben Folds Live", :track => "Not The Same", :genre => pop

data/features/support/db/migrations/create_genres.rb

@@ -0,0 +1,3 @@
+ActiveRecord::Base.connection.create_table :genres, :force => true do |t|
+  t.column :name, :string
+end

data/features/support/db/migrations/create_music.rb

@@ -0,0 +1,6 @@
+ActiveRecord::Base.connection.create_table :music, :force => true do |t|
+  t.column :artist,   :string
+  t.column :album,    :string
+  t.column :track,    :string
+  t.column :genre_id, :integer
+end

data/features/support/models/genre.rb

@@ -0,0 +1,3 @@
+class Genre < ActiveRecord::Base
+  #
+end

data/features/support/models/medium.rb

@@ -0,0 +1,5 @@
+class Medium < ActiveRecord::Base
+  self.abstract_class = true
+  
+  belongs_to :genre
+end

data/features/support/models/music.rb

@@ -0,0 +1,8 @@
+class Music < Medium
+  set_table_name 'music'
+  
+  define_index do
+    indexes artist, track, album
+    indexes genre(:name), :as => :genre
+  end
+end

data/lib/thinking_sphinx/active_record.rb

@@ -164,6 +164,8 @@ module ThinkingSphinx
       end
       
       def define_indexes
+        superclass.define_indexes unless superclass == ::ActiveRecord::Base
+        
         return if sphinx_index_blocks.nil? ||
           defined_indexes?                 ||
           !ThinkingSphinx.define_indexes?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.10
+  version: 1.3.11
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 +11:00
+date: 2009-12-12 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,6 +129,7 @@ signing_key:
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
 test_files: 
+- features/abstract_inheritance.feature
 - features/alternate_primary_key.feature
 - features/attribute_transformation.feature
 - features/attribute_updates.feature
@@ -171,6 +172,7 @@ test_files:
 - features/support/db/fixtures/extensible_betas.rb
 - features/support/db/fixtures/foxes.rb
 - features/support/db/fixtures/gammas.rb
+- features/support/db/fixtures/music.rb
 - features/support/db/fixtures/people.rb
 - features/support/db/fixtures/posts.rb
 - features/support/db/fixtures/robots.rb
@@ -186,6 +188,8 @@ test_files:
 - features/support/db/migrations/create_developers.rb
 - features/support/db/migrations/create_extensible_betas.rb
 - features/support/db/migrations/create_gammas.rb
+- features/support/db/migrations/create_genres.rb
+- features/support/db/migrations/create_music.rb
 - features/support/db/migrations/create_people.rb
 - features/support/db/migrations/create_posts.rb
 - features/support/db/migrations/create_robots.rb
@@ -206,6 +210,9 @@ test_files:
 - features/support/models/extensible_beta.rb
 - features/support/models/fox.rb
 - features/support/models/gamma.rb
+- features/support/models/genre.rb
+- features/support/models/medium.rb
+- features/support/models/music.rb
 - features/support/models/person.rb
 - features/support/models/post.rb
 - features/support/models/robot.rb