thinking-sphinx 3.0.0.rc → 3.0.0

data/Gemfile

@@ -2,10 +2,6 @@ source :rubygems
 
 gemspec
 
-gem 'combustion',
-  :git => 'git://github.com/pat/combustion.git',
-  :ref => '45f50e64c3'
-
 gem 'mysql2', '~> 0.3.12b4', :platform => :ruby
 gem 'pg',     '~> 0.11.0',   :platform => :ruby
 

data/HISTORY

@@ -1,3 +1,12 @@
+2013-01-02: 3.0.0
+* [CHANGE] Updating Riddle dependency to 1.5.4.
+* [FIX] Respect source options as well as underlying settings via the set_property method in index definitions.
+* [FIX] Load real-time index definitions when listing fields, attributes, and/or conditions.
+* [CHANGE] UTF-8 is now the default charset again (as it was in earlier Thinking Sphinx versions).
+* [FEATURE] Initial realtime index support, including the ts:generate task for building index datasets. Sphinx 2.0.6 is required.
+* [CHANGE] Removing ts:version rake task.
+* [FEATURE] SphinxQL connection pooling via the Innertube gem.
+
 2012-12-22: 3.0.0.rc
 * [FEATURE] Source type support (query and ranged query) for both attributes and fields. Custom SQL strings can be supplied as well.
 * [FEATURE] Wordcount attributes and fields now supported.

data/lib/thinking_sphinx.rb

@@ -8,6 +8,7 @@ end
 require 'riddle'
 require 'middleware'
 require 'active_record'
+require 'innertube'
 
 module ThinkingSphinx
   def self.count(query = '', options = {})

data/lib/thinking_sphinx/active_record/index.rb

@@ -24,6 +24,11 @@ class ThinkingSphinx::ActiveRecord::Index < Riddle::Configuration::Index
     @facets ||= sources.collect(&:facets).flatten
   end
 
+  def sources
+    interpret_definition!
+    super
+  end
+
   def unique_attribute_names
     attributes.collect(&:name)
   end

data/lib/thinking_sphinx/active_record/interpreter.rb

@@ -36,6 +36,7 @@ class ThinkingSphinx::ActiveRecord::Interpreter <
     properties.each do |key, value|
       @index.send("#{key}=", value)   if @index.class.settings.include?(key)
       __source.send("#{key}=", value) if __source.class.settings.include?(key)
+      __source.options[key] = value   if source_option?(key)
     end
   end
 
@@ -53,4 +54,8 @@ class ThinkingSphinx::ActiveRecord::Interpreter <
     options = columns.extract_options!
     columns.collect { |column| klass.new(__source.model, column, options) }
   end
+
+  def source_option?(key)
+    ::ThinkingSphinx::ActiveRecord::SQLSource::OPTIONS.include?(key)
+  end
 end

data/lib/thinking_sphinx/active_record/property.rb

@@ -1,4 +1,6 @@
 class ThinkingSphinx::ActiveRecord::Property
+  include ThinkingSphinx::Core::Property
+
   attr_reader :columns, :options
 
   def initialize(model, columns, options = {})
@@ -10,14 +12,6 @@ class ThinkingSphinx::ActiveRecord::Property
     }
   end
 
-  def facet?
-    options[:facet]
-  end
-
-  def multi?
-    false
-  end
-
   def name
     (options[:as] || columns.first.__name).to_s
   end
@@ -25,8 +19,4 @@ class ThinkingSphinx::ActiveRecord::Property
   def source_type
     options[:source]
   end
-
-  def type
-    nil
-  end
 end

data/lib/thinking_sphinx/active_record/sql_source.rb

@@ -2,16 +2,9 @@ class ThinkingSphinx::ActiveRecord::SQLSource < Riddle::Configuration::SQLSource
   attr_reader :model, :database_settings, :options
   attr_accessor :fields, :attributes, :associations, :conditions, :groupings
 
-  # Options:
-  # - :name
-  # - :offset
-  # - :delta_processor
-  # - :delta?
-  # - :disable_range?
-  # - :group_concat_max_len
-  # - :utf8?
-  # - :position
-  #
+  OPTIONS = [:name, :offset, :delta_processor, :delta?, :disable_range?,
+    :group_concat_max_len, :utf8?, :position]
+
   def initialize(model, options = {})
     @model             = model
     @database_settings = model.connection.instance_variable_get(:@config).clone

data/lib/thinking_sphinx/active_record/sql_source/template.rb

@@ -6,10 +6,11 @@ class ThinkingSphinx::ActiveRecord::SQLSource::Template
   end
 
   def apply
-    add_field class_column, :sphinx_internal_class, :facet => true
+    add_field class_column, :sphinx_internal_class_name
 
-    add_attribute :id, :sphinx_internal_id, nil
-    add_attribute '0', :sphinx_deleted,     :integer
+    add_attribute :id,          :sphinx_internal_id,    nil
+    add_attribute class_column, :sphinx_internal_class, :string, :facet => true
+    add_attribute '0',          :sphinx_deleted,        :integer
   end
 
   private

data/lib/thinking_sphinx/configuration.rb

@@ -25,7 +25,7 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
     searchd.address   = Defaults::ADDRESS unless searchd.address.present?
     searchd.mysql41   = settings['mysql41'] || settings['port'] ||
       Defaults::PORT
-    # searchd.workers   = 'threads'
+    searchd.workers   = 'threads'
 
     @offsets = {}
   end

data/lib/thinking_sphinx/configuration/consistent_ids.rb

@@ -26,6 +26,8 @@ class ThinkingSphinx::Configuration::ConsistentIds
   end
 
   def sources
-    @sources ||= @indices.collect(&:sources).flatten
+    @sources ||= @indices.select { |index|
+      index.respond_to?(:sources)
+    }.collect(&:sources).flatten
   end
 end

data/lib/thinking_sphinx/connection.rb

@@ -21,6 +21,13 @@ module ThinkingSphinx::Connection
     ThinkingSphinx::Connection::MRI
   end
 
+  def self.pool
+    @pool ||= Innertube::Pool.new(
+      Proc.new { ThinkingSphinx::Connection.new },
+      Proc.new { |connection| connection.close }
+    )
+  end
+
   class MRI
     attr_reader :client
 
@@ -32,8 +39,15 @@ module ThinkingSphinx::Connection
       }.merge(options))
     end
 
+    def close
+      client.close
+    end
+
     def execute(statement)
       client.query statement
+    rescue
+      puts "Error with statement: #{statement}"
+      raise
     end
 
     def query(statement)

data/lib/thinking_sphinx/core.rb

@@ -5,3 +5,4 @@ end
 require 'thinking_sphinx/core/field'
 require 'thinking_sphinx/core/index'
 require 'thinking_sphinx/core/interpreter'
+require 'thinking_sphinx/core/property'

data/lib/thinking_sphinx/core/index.rb

@@ -7,10 +7,11 @@ module ThinkingSphinx::Core::Index
   end
 
   def initialize(reference, options = {})
-    @reference  = reference.to_sym
-    @docinfo    = :extern
-    @options    = options
-    @offset     = config.next_offset(reference)
+    @reference    = reference.to_sym
+    @docinfo      = :extern
+    @charset_type = 'utf-8'
+    @options      = options
+    @offset       = config.next_offset(reference)
 
     super "#{options[:name] || reference.to_s.gsub('/', '_')}_#{name_suffix}"
   end
@@ -47,11 +48,6 @@ module ThinkingSphinx::Core::Index
     super
   end
 
-  def sources
-    interpret_definition!
-    super
-  end
-
   private
 
   def config

data/lib/thinking_sphinx/core/property.rb

@@ -0,0 +1,13 @@
+module ThinkingSphinx::Core::Property
+  def facet?
+    options[:facet]
+  end
+
+  def multi?
+    false
+  end
+
+  def type
+    nil
+  end
+end

data/lib/thinking_sphinx/middlewares/sphinxql.rb

@@ -69,7 +69,7 @@ class ThinkingSphinx::Middlewares::SphinxQL <
 
     def extended_query
       conditions = options[:conditions] || {}
-      conditions[:sphinx_internal_class] = class_condition if classes.any?
+      conditions[:sphinx_internal_class_name] = class_condition if classes.any?
       @extended_query ||= begin
         ThinkingSphinx::Search::Query.new(context.search.query, conditions,
           options[:star]).to_s

data/lib/thinking_sphinx/rake_interface.rb

@@ -1,12 +1,35 @@
 class ThinkingSphinx::RakeInterface
   def configure
-    puts "Generating configuration to #{config.configuration_file}"
-    config.render_to_file
+    puts "Generating configuration to #{configuration.configuration_file}"
+    configuration.render_to_file
+  end
+
+  def generate
+    configuration.preload_indices
+    configuration.render
+
+    FileUtils.mkdir_p configuration.indices_location
+
+    configuration.indices.each do |index|
+      next unless index.is_a?(ThinkingSphinx::RealTime::Index)
+
+      puts "Generating index files for #{index.name}"
+      transcriber = ThinkingSphinx::RealTime::Transcriber.new index
+      Dir["#{index.path}*"].each { |file| FileUtils.rm file }
+
+      index.model.find_each do |instance|
+        transcriber.copy instance
+        print "."
+      end
+      print "\n"
+
+      controller.rotate
+    end
   end
 
   def index(reconfigure = true)
     configure if reconfigure
-    FileUtils.mkdir_p config.indices_location
+    FileUtils.mkdir_p configuration.indices_location
     controller.index :verbose => true
   end
 
@@ -37,11 +60,11 @@ class ThinkingSphinx::RakeInterface
 
   private
 
-  def config
+  def configuration
     ThinkingSphinx::Configuration.instance
   end
 
   def controller
-    config.controller
+    configuration.controller
   end
 end

data/lib/thinking_sphinx/real_time.rb

@@ -7,5 +7,6 @@ require 'thinking_sphinx/real_time/attribute'
 require 'thinking_sphinx/real_time/field'
 require 'thinking_sphinx/real_time/index'
 require 'thinking_sphinx/real_time/interpreter'
+require 'thinking_sphinx/real_time/transcriber'
 
 require 'thinking_sphinx/real_time/callbacks/real_time_callbacks'

data/lib/thinking_sphinx/real_time/attribute.rb

@@ -2,4 +2,14 @@ class ThinkingSphinx::RealTime::Attribute < ThinkingSphinx::RealTime::Property
   def type
     @options[:type]
   end
+
+  def translate(object)
+    super || default_value
+  end
+
+  private
+
+  def default_value
+    type == :string ? '' : 0
+  end
 end

data/lib/thinking_sphinx/real_time/callbacks/real_time_callbacks.rb

@@ -7,29 +7,18 @@ class ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks <
     return unless real_time_indices?
 
     real_time_indices.each do |index|
-      columns, values = ['id'], [index.document_id_for_key(instance.id)]
-      (index.fields + index.attributes).each do |property|
-        columns << property.name
-        values  << property.translate(instance)
-      end
-
-      sphinxql = Riddle::Query::Insert.new(index.name, columns, values).replace!
-      connection.execute sphinxql.to_sql
+      ThinkingSphinx::RealTime::Transcriber.new(index).copy instance
     end
   end
 
   private
 
-  def config
+  def configuration
     ThinkingSphinx::Configuration.instance
   end
 
-  def connection
-    connection = ThinkingSphinx::Connection.new
-  end
-
   def indices
-    @indices ||= config.indices_for_references reference
+    @indices ||= configuration.indices_for_references reference
   end
 
   def real_time_indices?

data/lib/thinking_sphinx/real_time/field.rb

@@ -1,5 +1,7 @@
 class ThinkingSphinx::RealTime::Field < ThinkingSphinx::RealTime::Property
   include ThinkingSphinx::Core::Field
 
-  #
+  def translate(object)
+    Array(super || '').join(' ')
+  end
 end

data/lib/thinking_sphinx/real_time/index.rb

@@ -1,17 +1,40 @@
 class ThinkingSphinx::RealTime::Index < Riddle::Configuration::RealtimeIndex
   include ThinkingSphinx::Core::Index
 
-  attr_accessor :fields, :attributes
+  attr_writer :fields, :attributes, :conditions
 
   def initialize(reference, options = {})
     @fields     = []
     @attributes = []
+    @conditions = []
 
     Template.new(self).apply
 
     super reference, options
   end
 
+  def attributes
+    interpret_definition!
+
+    @attributes
+  end
+
+  def conditions
+    interpret_definition!
+
+    @conditions
+  end
+
+  def facets
+    properties.select(&:facet?)
+  end
+
+  def fields
+    interpret_definition!
+
+    @fields
+  end
+
   def unique_attribute_names
     attributes.collect(&:name)
   end
@@ -38,10 +61,14 @@ class ThinkingSphinx::RealTime::Index < Riddle::Configuration::RealtimeIndex
       when :float
         @rt_attr_float << attribute.name unless @rt_attr_float.include?(attribute.name)
       else
-        raise "Unknown attribute type '#{attribute.type(model)}'"
+        raise "Unknown attribute type '#{attribute.type}'"
       end
     end
   end
+
+  def properties
+    fields + attributes
+  end
 end
 
 require 'thinking_sphinx/real_time/index/template'

data/lib/thinking_sphinx/real_time/index/template.rb

@@ -6,18 +6,19 @@ class ThinkingSphinx::RealTime::Index::Template
   end
 
   def apply
-    add_field class_column, :sphinx_internal_class
+    add_field class_column, :sphinx_internal_class_name
 
-    add_attribute :id, :sphinx_internal_id, :integer
-    add_attribute 0,   :sphinx_deleted,     :integer
+    add_attribute :id,          :sphinx_internal_id,    :integer
+    add_attribute class_column, :sphinx_internal_class, :string, :facet => true
+    add_attribute 0,            :sphinx_deleted,        :integer
   end
 
   private
 
-  def add_attribute(column, name, type)
+  def add_attribute(column, name, type, options = {})
     index.attributes << ThinkingSphinx::RealTime::Attribute.new(
       ThinkingSphinx::ActiveRecord::Column.new(*column),
-      :as => name, :type => type
+      options.merge(:as => name, :type => type)
     )
   end
 

data/lib/thinking_sphinx/real_time/interpreter.rb

@@ -20,4 +20,8 @@ class ThinkingSphinx::RealTime::Interpreter <
       @index.send("#{key}=", value)   if @index.class.settings.include?(key)
     end
   end
+
+  def where(condition)
+    @index.conditions << condition
+  end
 end

data/lib/thinking_sphinx/real_time/property.rb

@@ -1,4 +1,6 @@
 class ThinkingSphinx::RealTime::Property
+  include ThinkingSphinx::Core::Property
+
   attr_reader :options
 
   def initialize(column, options = {})

data/lib/thinking_sphinx/real_time/transcriber.rb

@@ -0,0 +1,37 @@
+class ThinkingSphinx::RealTime::Transcriber
+  def initialize(index)
+    @index = index
+  end
+
+  def copy(instance)
+    return unless copy? instance
+
+    columns, values = ['id'], [index.document_id_for_key(instance.id)]
+    (index.fields + index.attributes).each do |property|
+      columns << property.name
+      values  << property.translate(instance)
+    end
+
+    sphinxql = Riddle::Query::Insert.new index.name, columns, values
+    ThinkingSphinx::Connection.pool.take do |connection|
+      connection.execute sphinxql.replace!.to_sql
+    end
+  end
+
+  private
+
+  attr_reader :index
+
+  def copy?(instance)
+    index.conditions.empty? || index.conditions.all? { |condition|
+      case condition
+      when Symbol
+        instance.send(condition)
+      when Proc
+        condition.call instance
+      else
+        "Unexpected condition: #{condition}. Expecting Symbol or Proc."
+      end
+    }
+  end
+end

data/lib/thinking_sphinx/tasks.rb

@@ -1,9 +1,4 @@
 namespace :ts do
-  desc 'The current version of Thinking Sphinx'
-  task :version do
-    puts "Thinking Sphinx v#{ThinkingSphinx::VERSION}"
-  end
-
   desc 'Generate the Sphinx configuration file'
   task :configure => :environment do
     interface.configure
@@ -14,8 +9,14 @@ namespace :ts do
     interface.index(ENV['INDEX_ONLY'] != 'true')
   end
 
+  desc 'Generate fresh index files for real-time indices'
+  task :generate => :environment do
+    interface.generate
+  end
+
   desc 'Stop Sphinx, index and then restart Sphinx'
   task :rebuild => [:stop, :index, :start]
+
   desc 'Restart the Sphinx daemon'
   task :restart => [:stop, :start]
 

data/spec/acceptance/facets_spec.rb

@@ -23,10 +23,11 @@ describe 'Faceted searching', :live => true do
     Tee.create!
     Tee.create!
     City.create!
+    Product.create!
     index
 
     ThinkingSphinx.facets.to_hash[:class].should == {
-      'Tee' => 2, 'City' => 1
+      'Tee' => 2, 'City' => 1, 'Product' => 1
     }
   end
 

data/spec/acceptance/index_options_spec.rb

@@ -84,4 +84,24 @@ describe 'Index options' do
       index.sources.first.sql_attr_str2wordcount.should == ['content']
     end
   end
+
+  context 'respecting source options' do
+    before :each do
+      index.definition_block = Proc.new {
+        indexes title
+
+        set_property :sql_range_step => 5
+        set_property :disable_range? => true
+      }
+      index.render
+    end
+
+    it "allows for core source settings" do
+      index.sources.first.sql_range_step.should == 5
+    end
+
+    it "allows for source options" do
+      index.sources.first.disable_range?.should be_true
+    end
+  end
 end

data/spec/acceptance/searching_within_a_model_spec.rb

@@ -51,7 +51,6 @@ end
 
 describe 'Searching within a model with a realtime index', :live => true do
   it "returns results" do
-    pending "Sphinx bug on OS X means I can't currently test this."
     product = Product.create! :name => 'Widget'
 
     Product.search.first.should == product

data/spec/acceptance/support/sphinx_helpers.rb

@@ -15,6 +15,9 @@ RSpec.configure do |config|
   config.include SphinxHelpers
 
   config.before :all do |group|
+    FileUtils.rm_rf ThinkingSphinx::Configuration.instance.indices_location
+    FileUtils.rm_rf ThinkingSphinx::Configuration.instance.searchd.binlog_path
+
     sphinx.setup && sphinx.start if group.class.metadata[:live]
   end
 

data/spec/internal/app/indices/product_index.rb

@@ -1,3 +1,3 @@
-# ThinkingSphinx::Index.define :product, :with => :real_time do
-#   indexes name
-# end
+ThinkingSphinx::Index.define :product, :with => :real_time do
+  indexes name
+end

data/spec/thinking_sphinx/active_record/sql_source_spec.rb

@@ -32,9 +32,19 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
       source.attributes.collect(&:name).should include('sphinx_internal_id')
     end
 
+    it "has the class name attribute by default" do
+      source.attributes.collect(&:name).should include('sphinx_internal_class')
+    end
+
     it "has the internal deleted attribute by default" do
       source.attributes.collect(&:name).should include('sphinx_deleted')
     end
+
+    it "marks the internal class attribute as a facet" do
+      source.attributes.detect { |attribute|
+        attribute.name == 'sphinx_internal_class'
+      }.options[:facet].should be_true
+    end
   end
 
   describe '#delta_processor' do
@@ -77,12 +87,13 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
 
   describe '#fields' do
     it "has the internal class field by default" do
-      source.fields.collect(&:name).should include('sphinx_internal_class')
+      source.fields.collect(&:name).
+        should include('sphinx_internal_class_name')
     end
 
     it "sets the sphinx class field to use a string of the class name" do
       source.fields.detect { |field|
-        field.name == 'sphinx_internal_class'
+        field.name == 'sphinx_internal_class_name'
       }.columns.first.__name.should == "'User'"
     end
 
@@ -94,16 +105,10 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
       model.stub :column_names => ['type'], :sti_name => 'User'
 
       source.fields.detect { |field|
-        field.name == 'sphinx_internal_class'
+        field.name == 'sphinx_internal_class_name'
       }.columns.first.__name.
         should == "ifnull(\"users\".\"type\", 'User')"
     end
-
-    it "marks the internal class field as a facet" do
-      source.fields.detect { |field|
-        field.name == 'sphinx_internal_class'
-      }.options[:facet].should be_true
-    end
   end
 
   describe '#name' do

data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb

@@ -102,7 +102,7 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
       search.options[:classes] = [submodel]
 
       ThinkingSphinx::Search::Query.should_receive(:new).with(anything,
-        hash_including(:sphinx_internal_class => '(Lion)'), anything).
+        hash_including(:sphinx_internal_class_name => '(Lion)'), anything).
         and_return(query)
 
       middleware.call [context]

data/spec/thinking_sphinx/real_time/attribute_spec.rb

@@ -44,11 +44,11 @@ describe ThinkingSphinx::RealTime::Attribute do
       attribute.translate(object).should == 'the parent name'
     end
 
-    it "returns nil if any element in the object tree is nil" do
+    it "returns zero if any element in the object tree is nil" do
       column.stub :__name => :name, :__stack => [:parent]
       object.parent = nil
 
-      attribute.translate(object).should be_nil
+      attribute.translate(object).should be_zero
     end
   end
 

data/spec/thinking_sphinx/real_time/callbacks/real_time_callbacks_spec.rb

@@ -7,12 +7,13 @@ describe ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks do
   let(:instance)   { double('instance', :id => 12) }
   let(:config)     { double('config', :indices_for_references => [index]) }
   let(:index)      { double('index', :name => 'my_index', :is_a? => true,
-    :document_id_for_key => 123, :fields => [], :attributes => []) }
+    :document_id_for_key => 123, :fields => [], :attributes => [],
+    :conditions => []) }
   let(:connection) { double('connection', :execute => true) }
 
   before :each do
     ThinkingSphinx::Configuration.stub :instance => config
-    ThinkingSphinx::Connection.stub :new => connection
+    ThinkingSphinx::Connection.stub_chain(:pool, :take).and_yield connection
   end
 
   describe '.after_save' do

data/spec/thinking_sphinx/real_time/field_spec.rb

@@ -26,10 +26,10 @@ describe ThinkingSphinx::RealTime::Field do
       field.translate(object).should == 'value'
     end
 
-    it "returns the column's name if it's an integer" do
+    it "returns the column's name as a string if it's an integer" do
       column.stub :__name => 404
 
-      field.translate(object).should == 404
+      field.translate(object).should == '404'
     end
 
     it "returns the object's method matching the column's name" do
@@ -44,11 +44,11 @@ describe ThinkingSphinx::RealTime::Field do
       field.translate(object).should == 'the parent name'
     end
 
-    it "returns nil if any element in the object tree is nil" do
+    it "returns a blank string if any element in the object tree is nil" do
       column.stub :__name => :name, :__stack => [:parent]
       object.parent = nil
 
-      field.translate(object).should be_nil
+      field.translate(object).should == ''
     end
   end
 end

data/spec/thinking_sphinx/real_time/index_spec.rb

@@ -15,6 +15,10 @@ describe ThinkingSphinx::RealTime::Index do
       index.attributes.collect(&:name).should include('sphinx_internal_id')
     end
 
+    it "has the class name attribute by default" do
+      index.attributes.collect(&:name).should include('sphinx_internal_class')
+    end
+
     it "has the internal deleted attribute by default" do
       index.attributes.collect(&:name).should include('sphinx_deleted')
     end
@@ -37,7 +41,7 @@ describe ThinkingSphinx::RealTime::Index do
 
   describe '#fields' do
     it "has the internal class field by default" do
-      index.fields.collect(&:name).should include('sphinx_internal_class')
+      index.fields.collect(&:name).should include('sphinx_internal_class_name')
     end
   end
 
@@ -135,7 +139,7 @@ describe ThinkingSphinx::RealTime::Index do
 
   describe '#render' do
     it "interprets the provided definition" do
-      index.should_receive(:interpret_definition!)
+      index.should_receive(:interpret_definition!).at_least(:once)
 
       begin
         index.render
@@ -147,8 +151,9 @@ describe ThinkingSphinx::RealTime::Index do
 
   describe '#unique_attribute_names' do
     it "returns all attribute names" do
-      index.unique_attribute_names.
-        should == ['sphinx_internal_id', 'sphinx_deleted']
+      index.unique_attribute_names.should == [
+        'sphinx_internal_id', 'sphinx_internal_class', 'sphinx_deleted'
+      ]
     end
   end
 end

data/thinking-sphinx.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '3.0.0.rc'
+  s.version     = '3.0.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
@@ -23,10 +23,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activerecord', '>= 3.1.0'
   s.add_runtime_dependency 'builder',      '>= 2.1.2'
   s.add_runtime_dependency 'middleware',   '>= 0.1.0'
-  s.add_runtime_dependency 'riddle',       '>= 1.5.3'
+  s.add_runtime_dependency 'innertube',    '>= 1.0.2'
+  s.add_runtime_dependency 'riddle',       '>= 1.5.4'
 
   s.add_development_dependency 'appraisal',        '~> 0.4.0'
-  # s.add_development_dependency 'combustion',       '~> 0.3.1'
+  s.add_development_dependency 'combustion',       '~> 0.3.3'
   s.add_development_dependency 'database_cleaner', '~> 0.7.1'
   s.add_development_dependency 'rspec',            '~> 2.11.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc
-  prerelease: 6
+  version: 3.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-22 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: innertube
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: riddle
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +107,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +213,7 @@ files:
 - lib/thinking_sphinx/core/field.rb
 - lib/thinking_sphinx/core/index.rb
 - lib/thinking_sphinx/core/interpreter.rb
+- lib/thinking_sphinx/core/property.rb
 - lib/thinking_sphinx/deltas.rb
 - lib/thinking_sphinx/deltas/default_delta.rb
 - lib/thinking_sphinx/excerpter.rb
@@ -221,6 +254,7 @@ files:
 - lib/thinking_sphinx/real_time/index/template.rb
 - lib/thinking_sphinx/real_time/interpreter.rb
 - lib/thinking_sphinx/real_time/property.rb
+- lib/thinking_sphinx/real_time/transcriber.rb
 - lib/thinking_sphinx/scopes.rb
 - lib/thinking_sphinx/search.rb
 - lib/thinking_sphinx/search/batch_inquirer.rb
@@ -358,9 +392,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: thinking-sphinx
 rubygems_version: 1.8.23
@@ -476,3 +510,4 @@ test_files:
 - spec/thinking_sphinx/search/query_spec.rb
 - spec/thinking_sphinx/search_spec.rb
 - spec/thinking_sphinx_spec.rb
+has_rdoc: