refactor names and paths

lib/sphinx-integration.rb

@@ -1 +1 @@
-require 'sphinx_integration'
+require 'sphinx/integration'

lib/sphinx/integration.rb

@@ -0,0 +1,9 @@
+module Sphinx::Integration
+  autoload :SphinxHelper, 'sphinx/integration/sphinx_helper'
+  autoload :Mysql, 'sphinx/integration/mysql'
+  autoload :Transmitter, 'sphinx/integration/transmitter'
+end
+
+require 'sphinx/integration/version'
+require 'sphinx/integration/extensions'
+require 'sphinx/integration/railtie'

lib/sphinx/integration/extensions.rb

@@ -0,0 +1,13 @@
+module Sphinx::Integration::Extensions
+  autoload :ActiveRecord, 'sphinx/integration/extensions/active_record'
+  autoload :Attribute, 'sphinx/integration/extensions/attribute'
+  autoload :BundledSearch, 'sphinx/integration/extensions/bundled_search'
+  autoload :FastFacet, 'sphinx/integration/extensions/fast_facet'
+  autoload :Index, 'sphinx/integration/extensions/index'
+  autoload :PostgreSQLAdapter, 'sphinx/integration/extensions/postgresql_adapter'
+  autoload :Property, 'sphinx/integration/extensions/property'
+  autoload :Search, 'sphinx/integration/extensions/search'
+  autoload :Source, 'sphinx/integration/extensions/source'
+  autoload :ThinkingSphinx, 'sphinx/integration/extensions/thinking_sphinx'
+  autoload :Configuration, 'sphinx/integration/extensions/configuration'
+end

lib/sphinx_integration/extensions/active_record.rb → lib/sphinx/integration/extensions/active_record.rb

@@ -1,9 +1,9 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::ActiveRecord
+module Sphinx::Integration::Extensions::ActiveRecord
   extend ActiveSupport::Concern
 
   included do
-    include SphinxIntegration::Extensions::FastFacet
+    include Sphinx::Integration::Extensions::FastFacet
 
     delegate :create, :destroy, :update, :to => :transmitter, :prefix => true
 
@@ -15,7 +15,7 @@ module SphinxIntegration::Extensions::ActiveRecord
   module InstanceMethods
 
     def transmitter
-      @transmitter ||= SphinxIntegration::Transmitter.new(self)
+      @transmitter ||= Sphinx::Integration::Transmitter.new(self)
     end
 
   end

lib/sphinx_integration/extensions/attribute.rb → lib/sphinx/integration/extensions/attribute.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Attribute
+module Sphinx::Integration::Extensions::Attribute
   extend ActiveSupport::Concern
 
   included do

lib/sphinx_integration/extensions/bundled_search.rb → lib/sphinx/integration/extensions/bundled_search.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::BundledSearch
+module Sphinx::Integration::Extensions::BundledSearch
   extend ActiveSupport::Concern
 
   included do

lib/sphinx_integration/extensions/configuration.rb → lib/sphinx/integration/extensions/configuration.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Configuration
+module Sphinx::Integration::Extensions::Configuration
   extend ActiveSupport::Concern
 
   included do

lib/sphinx_integration/extensions/fast_facet.rb → lib/sphinx/integration/extensions/fast_facet.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::FastFacet
+module Sphinx::Integration::Extensions::FastFacet
   extend ActiveSupport::Concern
 
   module ClassMethods

lib/sphinx_integration/extensions/index.rb → lib/sphinx/integration/extensions/index.rb

@@ -1,8 +1,8 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Index
+module Sphinx::Integration::Extensions::Index
   extend ActiveSupport::Concern
 
-  autoload :Builder, 'sphinx_integration/extensions/index/builder'
+  autoload :Builder, 'sphinx/integration/extensions/index/builder'
 
   included do
     attr_accessor :merged_with_core, :is_core_index

lib/sphinx_integration/extensions/index/builder.rb → lib/sphinx/integration/extensions/index/builder.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Index::Builder
+module Sphinx::Integration::Extensions::Index::Builder
 
   def group_by!(*args)
     source.groupings = args

lib/sphinx_integration/extensions/postgresql_adapter.rb → lib/sphinx/integration/extensions/postgresql_adapter.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::PostgreSQLAdapter
+module Sphinx::Integration::Extensions::PostgreSQLAdapter
   extend ActiveSupport::Concern
 
   included do

lib/sphinx_integration/extensions/property.rb → lib/sphinx/integration/extensions/property.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Property
+module Sphinx::Integration::Extensions::Property
   extend ActiveSupport::Concern
 
   included do

lib/sphinx_integration/extensions/search.rb → lib/sphinx/integration/extensions/search.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Search
+module Sphinx::Integration::Extensions::Search
   extend ActiveSupport::Concern
 
   included do

lib/sphinx_integration/extensions/source.rb → lib/sphinx/integration/extensions/source.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Source
-  autoload :SQL, 'sphinx_integration/extensions/source/sql'
+module Sphinx::Integration::Extensions::Source
+  autoload :SQL, 'sphinx/integration/extensions/source/sql'
   extend ActiveSupport::Concern
 
   included do

lib/sphinx_integration/extensions/source/sql.rb → lib/sphinx/integration/extensions/source/sql.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::Source::SQL
+module Sphinx::Integration::Extensions::Source::SQL
   extend ActiveSupport::Concern
 
   included do

lib/sphinx_integration/extensions/thinking_sphinx.rb → lib/sphinx/integration/extensions/thinking_sphinx.rb

@@ -1,10 +1,10 @@
 # coding: utf-8
-module SphinxIntegration::Extensions::ThinkingSphinx
+module Sphinx::Integration::Extensions::ThinkingSphinx
   extend ActiveSupport::Concern
 
   included do
     DEFAULT_MATCH = :extended2
-    include SphinxIntegration::Extensions::FastFacet
+    include Sphinx::Integration::Extensions::FastFacet
   end
 
   module ClassMethods
@@ -20,7 +20,7 @@ def reset_indexed_models
     end
 
     def take_connection
-      SphinxIntegration::Mysql::ConnectionPool.take do |connection|
+      Sphinx::Integration::Mysql::ConnectionPool.take do |connection|
         yield connection
       end
     end

lib/sphinx/integration/mysql.rb

@@ -0,0 +1,5 @@
+# coding: utf-8
+module Sphinx::Integration::Mysql
+  autoload :ConnectionPool, 'sphinx/integration/mysql/connection_pool'
+  autoload :Connection, 'sphinx/integration/mysql/connection'
+end

lib/sphinx_integration/mysql/connection.rb → lib/sphinx/integration/mysql/connection.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'mysql2'
 
-class SphinxIntegration::Mysql::Connection
+class Sphinx::Integration::Mysql::Connection
   attr_reader :client
 
   def initialize(address, port, options)

lib/sphinx_integration/mysql/connection_pool.rb → lib/sphinx/integration/mysql/connection_pool.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'innertube'
 
-module SphinxIntegration::Mysql::ConnectionPool
+module Sphinx::Integration::Mysql::ConnectionPool
   def self.new_connection
     configuration = ThinkingSphinx::Configuration.instance.configuration
     # If you use localhost, MySQL insists on a socket connection, but Sphinx
@@ -17,12 +17,12 @@ def self.new_connection
       :port  => port
     }
 
-    SphinxIntegration::Mysql::Connection.new address, options[:port], options
+    Sphinx::Integration::Mysql::Connection.new address, options[:port], options
   end
 
   def self.pool
     @pool ||= Innertube::Pool.new(
-      Proc.new { SphinxIntegration::Mysql::ConnectionPool.new_connection },
+      Proc.new { Sphinx::Integration::Mysql::ConnectionPool.new_connection },
       Proc.new { |connection| connection.close }
     )
   end

lib/sphinx/integration/railtie.rb

@@ -0,0 +1,30 @@
+require 'rails'
+require 'thinking-sphinx'
+require 'sphinx-integration'
+
+module Sphinx::Integration
+  class Railtie < Rails::Railtie
+
+    initializer 'sphinx_integration.extensions', :after => 'thinking_sphinx.set_app_root' do
+      ThinkingSphinx.send :include, Extensions::ThinkingSphinx
+      ThinkingSphinx::Attribute.send :include, Sphinx::Integration::Extensions::Attribute
+      ThinkingSphinx::Source.send :include, Sphinx::Integration::Extensions::Source
+      ThinkingSphinx::Source.send :include, Sphinx::Integration::Extensions::Source::SQL
+      ThinkingSphinx::BundledSearch.send :include, Sphinx::Integration::Extensions::BundledSearch
+      ThinkingSphinx::Index::Builder.send :include, Sphinx::Integration::Extensions::Index::Builder
+      ThinkingSphinx::Property.send :include, Sphinx::Integration::Extensions::Property
+      ThinkingSphinx::Search.send :include, Sphinx::Integration::Extensions::Search
+      ThinkingSphinx::Index.send :include, Sphinx::Integration::Extensions::Index
+      ThinkingSphinx::Configuration.send :include, Sphinx::Integration::Extensions::Configuration
+      ThinkingSphinx::PostgreSQLAdapter.send :include, Sphinx::Integration::Extensions::PostgreSQLAdapter
+
+      ActiveSupport.on_load :active_record do
+        include Sphinx::Integration::Extensions::ActiveRecord
+      end
+    end
+
+    rake_tasks do
+      load 'sphinx/integration/tasks'
+    end
+  end
+end

lib/sphinx_integration/spec/support/thinking_sphinx.rb → lib/sphinx/integration/spec/support/thinking_sphinx.rb

@@ -4,7 +4,7 @@
 require 'database_cleaner'
 require 'benchmark'
 
-class SphinxIntegration::Spec::Support::ThinkingSphinx
+class Sphinx::Integration::Spec::Support::ThinkingSphinx
   def reindex
     time = Benchmark.realtime do
       if remote?
@@ -24,7 +24,7 @@ def remote?
 end
 
 def with_sphinx(tables = nil)
-  sphinx  = SphinxIntegration::Spec::Support::ThinkingSphinx.new
+  sphinx  = Sphinx::Integration::Spec::Support::ThinkingSphinx.new
   context = self
 
   begin

lib/sphinx_integration/sphinx_helper.rb → lib/sphinx/integration/sphinx_helper.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration
+module Sphinx::Integration
   class SphinxHelper
     module ClassMethods
       def remote_sphinx?

lib/sphinx_integration/tasks.rb → lib/sphinx/integration/tasks.rb

@@ -12,26 +12,26 @@ def wrap_task(name, &block)
   end
 
   wrap_task :stop do |orig_block|
-    SphinxIntegration::Helper.stop
+    Sphinx::Integration::Helper.stop
   end
 
   wrap_task :start do |orig_block|
-    SphinxIntegration::Helper.start
+    Sphinx::Integration::Helper.start
   end
 
   wrap_task :running_start do |orig_block|
-    SphinxIntegration::Helper.running_start
+    Sphinx::Integration::Helper.running_start
   end
 
   wrap_task :index do |orig_block|
-    SphinxIntegration::Helper.index
+    Sphinx::Integration::Helper.index
   end
 
   wrap_task :reindex do |orig_block|
-    SphinxIntegration::Helper.reindex
+    Sphinx::Integration::Helper.reindex
   end
 
   wrap_task :rebuild do |orig_block|
-    SphinxIntegration::Helper.reindex
+    Sphinx::Integration::Helper.reindex
   end
 end

lib/sphinx_integration/transmitter.rb → lib/sphinx/integration/transmitter.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-module SphinxIntegration
+module Sphinx::Integration
   class Transmitter
     attr_reader :record
 

lib/sphinx/integration/version.rb

@@ -0,0 +1,3 @@
+module Sphinx::Integration
+  VERSION = "0.0.1"
+end

spec/spec_helper.rb

@@ -1,11 +1,11 @@
 require 'rubygems'
 require 'bundler'
 #require 'rspec'
-#require 'sphinx_integration'
+#require 'sphinx/integration'
 
 Bundler.require :default, :development
 
-require 'sphinx_integration/railtie'
+require 'sphinx/integration/railtie'
 
 Combustion.initialize! :active_record
 

spec/sphinx_integration/extensions/active_record_spec.rb → spec/sphinx/integration/extensions/active_record_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'ActiveRecord::Base extension' do
+describe ActiveRecord::Base do
 
   before(:all){ ThinkingSphinx.context.define_indexes }
 

spec/sphinx_integration/extensions/attribute_spec.rb → spec/sphinx/integration/extensions/attribute_spec.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'specifying SQL for attribute definition' do
+describe ThinkingSphinx::Attribute do
 
   describe '#source_value' do
     it 'generate custom sql' do