ebeigarts-thinking-sphinx 1.1.22 → 1.2.10

data/spec/{unit → lib}/thinking_sphinx/source_spec.rb

@@ -72,6 +72,16 @@ describe ThinkingSphinx::Source do
       @riddle.sql_sock.should == config[:socket]
     end
     
+    it "should use a default username of root if nothing else is provided" do
+      Person.connection.stub!(:instance_variable_get => {
+        :user     => nil,
+        :username => nil
+      })
+      
+      riddle = @source.to_riddle_for_core(1, 0)
+      riddle.sql_user.should == 'root'
+    end
+    
     it "should assign attributes" do
       # 3 internal attributes plus the one requested
       @riddle.sql_attr_uint.length.should == 4

data/spec/{unit → lib}/thinking_sphinx_spec.rb

@@ -67,6 +67,16 @@ describe ThinkingSphinx do
     ThinkingSphinx.sphinx_running?.should be_true
   end
   
+  describe '.version' do
+    it "should return the version from the stored YAML file" do
+      version = Jeweler::VersionHelper.new(
+        File.join(File.dirname(__FILE__), '../..')
+      ).to_s
+      
+      ThinkingSphinx.version.should == version
+    end
+  end
+  
   describe "use_group_by_shortcut? method" do
     before :each do
       adapter = defined?(JRUBY_VERSION) ? :JdbcAdapter : :MysqlAdapter

data/tasks/distribution.rb

@@ -1,41 +1,34 @@
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-require 'thinking_sphinx'
+require 'yard'
+require 'jeweler'
 
 desc 'Generate documentation'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Thinking Sphinx - ActiveRecord Sphinx Plugin'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+YARD::Rake::YardocTask.new do |t|
+  # t.title = 'Thinking Sphinx - ActiveRecord Sphinx Plugin'
 end
 
-spec = Gem::Specification.new do |s|
-  s.name              = "thinking-sphinx"
-  s.version           = ThinkingSphinx::Version::String
-  s.summary           = "A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching."
-  s.description       = "A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching."
-  s.author            = "Pat Allan"
-  s.email             = "pat@freelancing-gods.com"
-  s.homepage          = "http://ts.freelancing-gods.com"
-  s.has_rdoc          = true
-  s.rdoc_options     << "--title" << "Thinking Sphinx -- Rails/Merb Sphinx Plugin" <<
-                        "--line-numbers"
-  s.rubyforge_project = "thinking-sphinx"
-  s.test_files        = FileList["spec/**/*_spec.rb"]
-  s.files             = FileList[
+Jeweler::Tasks.new do |gem|
+  gem.name      = "thinking-sphinx"
+  gem.summary   = "A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching."
+  gem.author    = "Pat Allan"
+  gem.email     = "pat@freelancing-gods.com"
+  gem.homepage  = "http://ts.freelancing-gods.com"
+    
+  # s.rubyforge_project = "thinking-sphinx"
+  gem.files     = FileList[
     "rails/*.rb",
     "lib/**/*.rb",
     "LICENCE",
     "README.textile",
     "tasks/**/*.rb",
     "tasks/**/*.rake",
-    "vendor/**/*"
+    "vendor/**/*",
+    "VERSION.yml"
   ]
-  s.post_install_message = <<-MESSAGE
+  gem.test_files = FileList["spec/**/*_spec.rb"]
+  
+  gem.add_dependency 'activerecord', '>= 1.15.6'
+  
+  gem.post_install_message = <<-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
@@ -54,14 +47,3 @@ http://www.sphinxsearch.com/docs/manual-0.9.8.html#conf-morphology
 
 MESSAGE
 end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
-end
-
-desc "Build gemspec file"
-task :build do
-  File.open('thinking-sphinx.gemspec', 'w') { |f| f.write spec.to_ruby }
-end

data/tasks/testing.rb

@@ -84,10 +84,12 @@ task :cucumber_defaults do
 end
 
 namespace :thinking_sphinx do
-  # "Append testing enviroment settings to app_env task for xmlpipe support"
+  # Initialize test enviroment for ts:xml rake task
   task :app_env do
     # Establish DB connection
     if ENV['DATABASE']
+      $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')
+      require "thinking_sphinx"
       database = ENV['DATABASE'].to_s.sub(/jdbc|_enhanced/, '')
       require "features/support/db/#{database}"
       require "features/support/db/active_record"

data/vendor/riddle/lib/riddle.rb

@@ -18,7 +18,7 @@ module Riddle #:nodoc:
     Rev     = 1533
     # Release number to mark my own fixes, beyond feature parity with
     # Sphinx itself.
-    Release = 5
+    Release = 7
     
     String      = [Major, Minor, Tiny].join('.')
     GemVersion  = [Major, Minor, Tiny, Rev, Release].join('.')

data/vendor/riddle/lib/riddle/client.rb

@@ -437,6 +437,9 @@ module Riddle
       version  = 0
       length   = 0
       message  = Array(messages).join("")
+      if message.respond_to?(:force_encoding)
+        message = message.force_encoding('ASCII-8BIT')
+      end
           
       connect do |socket|
         case command

data/vendor/riddle/lib/riddle/client/message.rb

@@ -10,14 +10,15 @@ module Riddle
       
       # Append raw data (only use if you know what you're doing)
       def append(*args)
-        return if args.length == 0
-        
         args.each { |arg| @message << arg }
       end
       
       # Append a string's length, then the string itself
       def append_string(str)
-        @message << [str.send(@size_method)].pack('N') + str
+        string = str.respond_to?(:force_encoding) ?
+          str.dup.force_encoding('ASCII-8BIT') : str
+        
+        @message << [string.send(@size_method)].pack('N') + string
       end
       
       # Append an integer

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

@@ -21,7 +21,7 @@ module Riddle
             conf = "  #{setting} = "
           else
             conf = setting_to_array(setting).collect { |set|
-              "  #{setting} = #{set}"  
+              "  #{setting} = #{set}"
             }
           end
           conf.length == 0 ? nil : conf

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

@@ -4,18 +4,23 @@ module Riddle
       @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}`    
+
+      if RUBY_PLATFORM =~ /mswin/
+        system("start /B #{cmd} 1> NUL 2>&1")
+      else
+        `#{cmd}`
+      end
 
       sleep(1)
 
@@ -26,19 +31,24 @@ module Riddle
 
     def stop
       return unless running?
-      `kill #{pid}`
+      Process.kill('SIGTERM', pid.to_i)
+    rescue Errno::EINVAL
+      Process.kill('SIGKILL', pid.to_i)
     end
 
     def pid
-      if File.exists?("#{@configuration.searchd.pid_file}")
-        `cat #{@configuration.searchd.pid_file}`[/\d+/]
+      if File.exists?(@configuration.searchd.pid_file)
+        File.read(@configuration.searchd.pid_file)[/\d+/]
       else
         nil
       end
     end
 
     def running?
-      pid && `ps #{pid} | wc -l`.to_i > 1
+      !!pid && !!Process.kill(0, pid.to_i)
+    rescue
+      false
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ebeigarts-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.22
+  version: 1.2.10
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,92 +9,93 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-22 00:00:00 -07:00
+date: 2009-09-12 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
-description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.15.6
+    version: 
+description: 
 email: pat@freelancing-gods.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.textile
 files: 
-- rails/init.rb
+- LICENCE
+- README.textile
+- VERSION.yml
+- lib/thinking_sphinx.rb
+- lib/thinking_sphinx/active_record.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.rb
+- lib/thinking_sphinx/active_record/scopes.rb
 - lib/thinking_sphinx/adapters/abstract_adapter.rb
 - lib/thinking_sphinx/adapters/mysql_adapter.rb
-- lib/thinking_sphinx/adapters/sqlite3_adapter.rb
 - lib/thinking_sphinx/adapters/oracle_adapter.rb
 - lib/thinking_sphinx/adapters/postgresql_adapter.rb
+- lib/thinking_sphinx/adapters/sqlite3_adapter.rb
 - lib/thinking_sphinx/association.rb
 - lib/thinking_sphinx/attribute.rb
 - lib/thinking_sphinx/class_facet.rb
-- lib/thinking_sphinx/collection.rb
 - lib/thinking_sphinx/configuration.rb
+- lib/thinking_sphinx/core/array.rb
 - lib/thinking_sphinx/core/string.rb
+- lib/thinking_sphinx/deltas.rb
 - lib/thinking_sphinx/deltas/datetime_delta.rb
 - lib/thinking_sphinx/deltas/default_delta.rb
+- lib/thinking_sphinx/deltas/delayed_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/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.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/facets.rb
 - lib/thinking_sphinx/search.rb
+- lib/thinking_sphinx/search_methods.rb
+- lib/thinking_sphinx/source.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.textile
+- rails/init.rb
 - tasks/distribution.rb
-- tasks/testing.rb
 - tasks/rails.rake
-- vendor/after_commit
+- tasks/testing.rb
+- vendor/after_commit/LICENSE
+- vendor/after_commit/README
+- vendor/after_commit/Rakefile
 - vendor/after_commit/init.rb
-- vendor/after_commit/lib
-- vendor/after_commit/lib/after_commit
+- vendor/after_commit/lib/after_commit.rb
 - 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.rb
+- vendor/riddle/lib/riddle/client.rb
 - 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.rb
 - vendor/riddle/lib/riddle/configuration/distributed_index.rb
 - vendor/riddle/lib/riddle/configuration/index.rb
 - vendor/riddle/lib/riddle/configuration/indexer.rb
@@ -104,28 +105,7 @@ files:
 - 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/facet_collection_spec.rb
-- spec/unit/thinking_sphinx/facet_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/rails_additions_spec.rb
-- spec/unit/thinking_sphinx/search_spec.rb
-- spec/unit/thinking_sphinx/source_spec.rb
-- spec/unit/thinking_sphinx_spec.rb
 has_rdoc: true
 homepage: http://ts.freelancing-gods.com
 licenses: 
@@ -147,9 +127,7 @@ post_install_message: |+
   http://www.sphinxsearch.com/docs/manual-0.9.8.html#conf-morphology
   
 rdoc_options: 
-- --title
-- Thinking Sphinx -- Rails/Merb Sphinx Plugin
-- --line-numbers
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -166,28 +144,30 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: thinking-sphinx
+rubyforge_project: 
 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/facet_collection_spec.rb
-- spec/unit/thinking_sphinx/facet_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/rails_additions_spec.rb
-- spec/unit/thinking_sphinx/search_spec.rb
-- spec/unit/thinking_sphinx/source_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/array_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