freelancing-god-thinking-sphinx 1.2.5 → 1.2.6

data/README.textile

@@ -147,3 +147,4 @@ Since I first released this library, there's been quite a few people who have su
 * J.D. Hollis
 * Jeffrey Chupp
 * Rob Anderton
+* Zach Inglis

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:major: 1
+:minor: 2
+:patch: 6

data/lib/thinking_sphinx.rb

@@ -5,6 +5,7 @@ end
 require 'active_record'
 require 'riddle'
 require 'after_commit'
+require 'yaml'
 
 require 'thinking_sphinx/core/string'
 require 'thinking_sphinx/property'
@@ -35,14 +36,6 @@ Merb::Plugins.add_rakefiles(
 ) if defined?(Merb)
 
 module ThinkingSphinx
-  module Version #:nodoc:
-    Major = 1
-    Minor = 2
-    Tiny  = 5
-    
-    String = [Major, Minor, Tiny].join('.')
-  end
-
   # A ConnectionError will get thrown when a connection to Sphinx can't be
   # made.
   class ConnectionError < StandardError
@@ -56,7 +49,16 @@ module ThinkingSphinx
       self.ids = ids
     end
   end
-
+  
+  # The current version of Thinking Sphinx.
+  # 
+  # @return [String] The version number as a string
+  # 
+  def self.version
+    hash = YAML.load_file File.join(File.dirname(__FILE__), '../VERSION.yml')
+    [hash[:major], hash[:minor], hash[:patch]].join('.')
+  end
+  
   # The collection of indexed models. Keep in mind that Rails lazily loads
   # its classes, so this may not actually be populated with _all_ the models
   # that have Sphinx indexes.

data/lib/thinking_sphinx/configuration.rb

@@ -157,7 +157,9 @@ module ThinkingSphinx
     # messy dependencies issues).
     # 
     def load_models
-      return if defined?(Rails) && Rails.configuration.cache_classes
+      return if defined?(Rails) &&
+        Rails.configuration.cache_classes &&
+        Rails::VERSION::STRING.to_f > 2.1
       
       self.model_directories.each do |base|
         Dir["#{base}**/*.rb"].each do |file|

data/lib/thinking_sphinx/search.rb

@@ -25,7 +25,7 @@ module ThinkingSphinx
     HashOptions   = [:conditions, :with, :without, :with_all]
     ArrayOptions  = [:classes, :without_ids]
     
-    attr_reader :args, :options, :results
+    attr_reader :args, :options
     
     # Deprecated. Use ThinkingSphinx.search
     def self.search(*args)
@@ -68,6 +68,24 @@ module ThinkingSphinx
       @array
     end
     
+    # Indication of whether the request has been made to Sphinx for the search
+    # query.
+    # 
+    # @return [Boolean] true if the results have been requested.
+    # 
+    def populated?
+      !!@populated
+    end
+    
+    # The query result hash from Riddle.
+    # 
+    # @return [Hash] Raw Sphinx results
+    # 
+    def results
+      populate
+      @results
+    end
+    
     def method_missing(method, *args, &block)
       if is_scope?(method)
         add_scope(method, *args, &block)

data/lib/thinking_sphinx/tasks.rb

@@ -12,7 +12,7 @@ namespace :thinking_sphinx do
   
   desc "Output the current Thinking Sphinx version"
   task :version => :app_env do
-    puts "Thinking Sphinx v" + ThinkingSphinx::Version::String
+    puts "Thinking Sphinx v" + ThinkingSphinx.version
   end
   
   desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings"
@@ -43,11 +43,14 @@ namespace :thinking_sphinx do
   
   desc "Stop Sphinx using Thinking Sphinx's settings"
   task :stop => :app_env do
-    raise RuntimeError, "searchd is not running." unless sphinx_running?
-    config = ThinkingSphinx::Configuration.instance
-    pid    = sphinx_pid
-    system! "#{config.bin_path}#{config.searchd_binary_name} --stop --config \"#{config.config_file}\""
-    puts "Stopped search daemon (pid #{pid})."
+    unless sphinx_running?
+      puts "searchd is not running"
+    else
+      config = ThinkingSphinx::Configuration.instance
+      pid    = sphinx_pid
+      system! "#{config.bin_path}#{config.searchd_binary_name} --stop --config \"#{config.config_file}\""
+      puts "Stopped search daemon (pid #{pid})."
+    end
   end
   
   desc "Restart Sphinx"

data/spec/lib/thinking_sphinx/search_spec.rb

@@ -32,7 +32,43 @@ describe ThinkingSphinx::Search do
     end
   end
   
+  describe '#populated?' do
+    before :each do
+      @search = ThinkingSphinx::Search.new
+    end
+    
+    it "should be false if the client request has not been made" do
+      @search.populated?.should be_false
+    end
+    
+    it "should be true once the client request has been made" do
+      @search.first
+      @search.populated?.should be_true
+    end
+  end
+  
+  describe '#results' do
+    it "should populate search results before returning" do
+      @search = ThinkingSphinx::Search.new
+      @search.populated?.should be_false
+      
+      @search.results
+      @search.populated?.should be_true
+    end
+  end
+  
   describe '#method_missing' do
+    before :each do
+      Alpha.sphinx_scope(:by_name) { |name|
+        {:conditions => {:name => name}}
+      }
+      Alpha.sphinx_scope(:ids_only) { {:ids_only => true} }
+    end
+    
+    after :each do
+      Alpha.remove_sphinx_scopes
+    end
+    
     it "should handle Array methods" do
       ThinkingSphinx::Search.new.private_methods.should be_an(Array)
     end

data/spec/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/vendor/riddle/lib/riddle/controller.rb

@@ -15,8 +15,12 @@ module Riddle
       return if running?
 
       cmd = "searchd --pidfile --config #{@path}"
-      cmd = "start /B #{cmd}" if RUBY_PLATFORM =~ /mswin/
-      `#{cmd}`
+
+      if RUBY_PLATFORM =~ /mswin/
+        system("start /B #{cmd} 1> NUL 2>&1")
+      else
+        `#{cmd}`
+      end
 
       sleep(1)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,25 +9,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-02 00:00:00 -07:00
+date: 2009-08-08 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/scopes.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
@@ -36,63 +48,51 @@ files:
 - lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.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_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.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
@@ -102,29 +102,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/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/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
 has_rdoc: true
 homepage: http://ts.freelancing-gods.com
 licenses: 
@@ -146,9 +124,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 
@@ -165,7 +141,7 @@ 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