DrMark-thinking-sphinx 0.9.9 → 1.1.6

data/vendor/riddle/lib/riddle/configuration/indexer.rb

@@ -0,0 +1,19 @@
+module Riddle
+  class Configuration
+    class Indexer < Riddle::Configuration::Section
+      self.settings = [:mem_limit, :max_iops, :max_iosize]
+      
+      attr_accessor *self.settings
+            
+      def render
+        raise ConfigurationError unless valid?
+        
+        (
+          ["indexer", "{"] +
+          settings_body +
+          ["}", ""]
+        ).join("\n")
+      end
+    end
+  end
+end

data/vendor/riddle/lib/riddle/configuration/remote_index.rb

@@ -0,0 +1,17 @@
+module Riddle
+  class Configuration
+    class RemoteIndex
+      attr_accessor :address, :port, :name
+      
+      def initialize(address, port, name)
+        @address  = address
+        @port     = port
+        @name     = name
+      end
+      
+      def remote
+        "#{address}:#{port}"
+      end
+    end
+  end
+end

data/vendor/riddle/lib/riddle/configuration/searchd.rb

@@ -0,0 +1,25 @@
+module Riddle
+  class Configuration
+    class Searchd < Riddle::Configuration::Section
+      self.settings = [:address, :port, :log, :query_log, :read_timeout,
+        :max_children, :pid_file, :max_matches, :seamless_rotate,
+        :preopen_indexes, :unlink_old]
+      
+      attr_accessor *self.settings
+            
+      def render
+        raise ConfigurationError unless valid?
+        
+        (
+          ["searchd", "{"] +
+          settings_body +
+          ["}", ""]
+        ).join("\n")
+      end
+      
+      def valid?
+        !( @port.nil? || @pid_file.nil? )
+      end
+    end
+  end
+end

data/vendor/riddle/lib/riddle/configuration/section.rb

@@ -0,0 +1,37 @@
+module Riddle
+  class Configuration
+    class Section
+      class << self
+        attr_accessor :settings
+      end
+      
+      settings = []
+      
+      def valid?
+        true
+      end
+      
+      private
+      
+      def settings_body
+        self.class.settings.select { |setting|
+          !send(setting).nil?
+        }.collect { |setting|
+          if send(setting) == ""
+            conf = "  #{setting} = "
+          else
+            conf = setting_to_array(setting).collect { |set|
+              "  #{setting} = #{set}"  
+            }
+          end
+          conf.length == 0 ? nil : conf
+        }.flatten.compact
+      end
+      
+      def setting_to_array(setting)
+        value = send(setting)
+        value.is_a?(Array) ? value : [value]
+      end
+    end
+  end
+end

data/vendor/riddle/lib/riddle/configuration/source.rb

@@ -0,0 +1,23 @@
+module Riddle
+  class Configuration
+    class Source < Riddle::Configuration::Section
+      attr_accessor :name, :parent, :type
+            
+      def render
+        raise ConfigurationError unless valid?
+        
+        inherited_name = "#{name}"
+        inherited_name << " : #{parent}" if parent
+        (
+          ["source #{inherited_name}", "{"] +
+          settings_body +
+          ["}", ""]
+        ).join("\n")
+      end
+      
+      def valid?
+        !( @name.nil? || @type.nil? )
+      end
+    end
+  end
+end

data/vendor/riddle/lib/riddle/configuration/sql_source.rb

@@ -0,0 +1,34 @@
+module Riddle
+  class Configuration
+    class SQLSource < Riddle::Configuration::Source
+      self.settings = [:type, :sql_host, :sql_user, :sql_pass, :sql_db,
+        :sql_port, :sql_sock, :mysql_connect_flags, :sql_query_pre, :sql_query,
+        :sql_query_range, :sql_range_step, :sql_attr_uint, :sql_attr_bool,
+        :sql_attr_timestamp, :sql_attr_str2ordinal, :sql_attr_float,
+        :sql_attr_multi, :sql_query_post, :sql_query_post_index,
+        :sql_ranged_throttle, :sql_query_info]
+      
+      attr_accessor *self.settings
+      
+      def initialize(name, type)
+        @name = name
+        @type = type
+        
+        @sql_query_pre        = []
+        @sql_attr_uint        = []
+        @sql_attr_bool        = []
+        @sql_attr_timestamp   = []
+        @sql_attr_str2ordinal = []
+        @sql_attr_float       = []
+        @sql_attr_multi       = []
+        @sql_query_post       = []
+        @sql_query_post_index = []
+      end
+            
+      def valid?
+        super && (!( @sql_host.nil? || @sql_user.nil? || @sql_db.nil? ||
+          @sql_query.nil? ) || !@parent.nil?)
+      end
+    end
+  end
+end

data/vendor/riddle/lib/riddle/configuration/xml_source.rb

@@ -0,0 +1,28 @@
+module Riddle
+  class Configuration
+    class XMLSource < Riddle::Configuration::Source
+      self.settings = [:type, :xmlpipe_command, :xmlpipe_field,
+        :xmlpipe_attr_uint, :xmlpipe_attr_bool, :xmlpipe_attr_timestamp,
+        :xmlpipe_attr_str2ordinal, :xmlpipe_attr_float, :xmlpipe_attr_multi]
+      
+      attr_accessor *self.settings
+      
+      def initialize(name, type)
+        @name = name
+        @type = type
+        
+        @xmlpipe_field            = []
+        @xmlpipe_attr_uint        = []
+        @xmlpipe_attr_bool        = []
+        @xmlpipe_attr_timestamp   = []
+        @xmlpipe_attr_str2ordinal = []
+        @xmlpipe_attr_float       = []
+        @xmlpipe_attr_multi       = []
+      end
+            
+      def valid?
+        super && ( !@xmlpipe_command.nil? || !parent.nil? )
+      end
+    end
+  end
+end

data/vendor/riddle/lib/riddle/controller.rb

@@ -0,0 +1,44 @@
+module Riddle
+  class Controller
+    def initialize(configuration, path)
+      @configuration  = configuration
+      @path           = path
+    end
+    
+    def index
+      cmd = "indexer --config #{@path} --all"
+      cmd << " --rotate" if running?
+      `#{cmd}`
+    end
+    
+    def start
+      return if running?
+
+      cmd = "searchd --pidfile --config #{@path}"
+      `#{cmd}`    
+
+      sleep(1)
+
+      unless running?
+        puts "Failed to start searchd daemon. Check #{@configuration.searchd.log}."
+      end
+    end
+
+    def stop
+      return unless running?
+      `kill #{pid}`
+    end
+
+    def pid
+      if File.exists?("#{@configuration.searchd.pid_file}")
+        `cat #{@configuration.searchd.pid_file}`[/\d+/]
+      else
+        nil
+      end
+    end
+
+    def running?
+      pid && `ps #{pid} | wc -l`.to_i > 1
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: DrMark-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 1.1.6
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-22 00:00:00 -07:00
+date: 2009-03-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,38 +22,89 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/riddle/client/filter.rb
-- lib/riddle/client/message.rb
-- lib/riddle/client/response.rb
-- lib/riddle/client.rb
-- lib/riddle.rb
-- lib/test.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.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/configuration.rb
+- lib/thinking_sphinx/core/string.rb
+- lib/thinking_sphinx/deltas/datetime_delta.rb
+- lib/thinking_sphinx/deltas/default_delta.rb
+- lib/thinking_sphinx/deltas/delayed_delta/delta_job.rb
+- lib/thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job.rb
+- lib/thinking_sphinx/deltas/delayed_delta/job.rb
+- lib/thinking_sphinx/deltas/delayed_delta.rb
+- lib/thinking_sphinx/deltas.rb
+- lib/thinking_sphinx/facet.rb
+- lib/thinking_sphinx/facet_collection.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/rails_additions.rb
 - lib/thinking_sphinx/search.rb
+- lib/thinking_sphinx/tasks.rb
 - lib/thinking_sphinx.rb
 - LICENCE
 - README
-- tasks/thinking_sphinx_tasks.rb
-- tasks/thinking_sphinx_tasks.rake
+- tasks/distribution.rb
+- tasks/testing.rb
+- tasks/rails.rake
+- vendor/after_commit
+- vendor/after_commit/init.rb
+- vendor/after_commit/lib
+- vendor/after_commit/lib/after_commit
+- vendor/after_commit/lib/after_commit/active_record.rb
+- vendor/after_commit/lib/after_commit/connection_adapters.rb
+- vendor/after_commit/lib/after_commit.rb
+- vendor/after_commit/LICENSE
+- vendor/after_commit/Rakefile
+- vendor/after_commit/README
+- vendor/after_commit/test
+- vendor/after_commit/test/after_commit_test.rb
+- vendor/delayed_job
+- vendor/delayed_job/lib
+- vendor/delayed_job/lib/delayed
+- vendor/delayed_job/lib/delayed/job.rb
+- vendor/delayed_job/lib/delayed/message_sending.rb
+- vendor/delayed_job/lib/delayed/performable_method.rb
+- vendor/delayed_job/lib/delayed/worker.rb
+- vendor/riddle
+- vendor/riddle/lib
+- vendor/riddle/lib/riddle
+- vendor/riddle/lib/riddle/client
+- vendor/riddle/lib/riddle/client/filter.rb
+- vendor/riddle/lib/riddle/client/message.rb
+- vendor/riddle/lib/riddle/client/response.rb
+- vendor/riddle/lib/riddle/client.rb
+- vendor/riddle/lib/riddle/configuration
+- vendor/riddle/lib/riddle/configuration/distributed_index.rb
+- vendor/riddle/lib/riddle/configuration/index.rb
+- vendor/riddle/lib/riddle/configuration/indexer.rb
+- vendor/riddle/lib/riddle/configuration/remote_index.rb
+- vendor/riddle/lib/riddle/configuration/searchd.rb
+- vendor/riddle/lib/riddle/configuration/section.rb
+- vendor/riddle/lib/riddle/configuration/source.rb
+- vendor/riddle/lib/riddle/configuration/sql_source.rb
+- vendor/riddle/lib/riddle/configuration/xml_source.rb
+- 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
@@ -95,7 +146,9 @@ test_files:
 - 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

data/lib/test.rb

@@ -1,46 +0,0 @@
-require 'thinking_sphinx'
-
-ActiveRecord::Base.establish_connection(
-  :adapter  => 'mysql',
-  :database => 'nullus_development',
-  :username => 'nullus',
-  :password => 'wossname',
-  :host     => 'localhost'
-)
-ActiveRecord::Base.logger = Logger.new(STDERR)
-
-class User < ActiveRecord::Base
-  has_many :posts, :foreign_key => "created_by"
-end
-
-class Post < ActiveRecord::Base
-  belongs_to :creator, :foreign_key => "created_by", :class_name => "User"
-  belongs_to :updater, :foreign_key => "updated_by", :class_name => "User"
-  belongs_to :topic
-end
-
-class Topic < ActiveRecord::Base
-  belongs_to :creator, :foreign_key => "created_by", :class_name => "User"
-  belongs_to :forum
-  has_many :posts
-end
-
-class Forum < ActiveRecord::Base
-  belongs_to :creator, :foreign_key => "created_by", :class_name => "User"
-  has_many :topics
-end
-
-def index
-  @index ||= ThinkingSphinx::Index.new(Topic) do
-    indexes posts.content, :as => :posts
-    indexes posts.creator.login, :as => :authors
-    
-    has :created_at
-    has :id, :as => :topic_id
-    has :forum_id
-    has posts(:id), :as => :post_ids
-    has posts.creator(:id), :as => :user_ids
-    
-    where "posts.created_at < NOW()"
-  end
-end

data/tasks/thinking_sphinx_tasks.rake

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), 'thinking_sphinx_tasks')

data/tasks/thinking_sphinx_tasks.rb

@@ -1,86 +0,0 @@
-require 'fileutils'
-
-namespace :thinking_sphinx do
-  task :app_env do
-    Rake::Task[:environment].invoke if defined?(RAILS_ROOT)
-    Rake::Task[:merb_init].invoke    if defined?(Merb)
-  end
-  
-  desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"
-  task :start => :app_env do
-    config = ThinkingSphinx::Configuration.new
-    
-    FileUtils.mkdir_p config.searchd_file_path
-    raise RuntimeError, "searchd is already running." if sphinx_running?
-    
-    Dir["#{config.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
-    
-    cmd = "searchd --config #{config.config_file}"
-    puts cmd
-    system cmd
-    
-    sleep(2)
-    
-    if sphinx_running?
-      puts "Started successfully (pid #{sphinx_pid})."
-    else
-      puts "Failed to start searchd daemon. Check #{config.searchd_log_file}."
-    end
-  end
-  
-  desc "Stop Sphinx using Thinking Sphinx's settings"
-  task :stop => :app_env do
-    raise RuntimeError, "searchd is not running." unless sphinx_running?
-    pid = sphinx_pid
-    system "kill #{pid}"
-    puts "Stopped search daemon (pid #{pid})."
-  end
-  
-  desc "Restart Sphinx"
-  task :restart => [:app_env, :stop, :start]
-  
-  desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
-  task :configure => :app_env do
-    ThinkingSphinx::Configuration.new.build
-  end
-  
-  desc "Index data for Sphinx using Thinking Sphinx's settings"
-  task :index => [:app_env, :configure] do
-    config = ThinkingSphinx::Configuration.new
-    
-    FileUtils.mkdir_p config.searchd_file_path
-    cmd = "indexer --config #{config.config_file} --all"
-    cmd << " --rotate" if sphinx_running?
-    puts cmd
-    system cmd
-  end
-end
-
-namespace :ts do
-  desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"
-  task :start   => "thinking_sphinx:start"
-  desc "Stop Sphinx using Thinking Sphinx's settings"
-  task :stop    => "thinking_sphinx:stop"
-  desc "Index data for Sphinx using Thinking Sphinx's settings"
-  task :in      => "thinking_sphinx:index"
-  desc "Index data for Sphinx using Thinking Sphinx's settings"
-  task :index   => "thinking_sphinx:index"
-  desc "Restart Sphinx"
-  task :restart => "thinking_sphinx:restart"
-  desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
-  task :config  => "thinking_sphinx:configure"
-end
-
-def sphinx_pid
-  config = ThinkingSphinx::Configuration.new
-  
-  if File.exists?(config.pid_file)
-    `cat #{config.pid_file}`[/\d+/]
-  else
-    nil
-  end
-end
-
-def sphinx_running?
-  sphinx_pid && `ps -p #{sphinx_pid} | wc -l`.to_i > 1
-end