freelancing-god-thinking-sphinx 1.1.2 → 1.1.3

data/lib/thinking_sphinx/index/builder.rb

@@ -89,13 +89,13 @@ module ThinkingSphinx
           args.each do |columns|
             fields << Field.new(FauxColumn.coerce(columns), options)
             
-            if fields.last.sortable
+            if fields.last.sortable || fields.last.faceted
               attributes << Attribute.new(
                 fields.last.columns.collect { |col| col.clone },
                 options.merge(
                   :type => :string,
                   :as => fields.last.unique_name.to_s.concat("_sort").to_sym
-                )
+                ).except(:facet)
               )
             end
           end

data/lib/thinking_sphinx/search.rb

@@ -352,6 +352,23 @@ module ThinkingSphinx
         end
       end
       
+      def facets(*args)
+        options = args.extract_options!.merge! :group_function => :attr
+        
+        options[:class].sphinx_facets.inject({}) do |hash, facet|
+          facet_result = {}
+          options[:group_by] = facet.attribute_name
+          
+          results = search *(args + [options])
+          results.each_with_groupby_and_count do |result, group, count|
+            facet_result[facet.value(result, group)] = count
+          end
+          hash[facet.name] = facet_result
+          
+          hash
+        end
+      end
+      
       private
       
       # This method handles the common search functionality, and returns both

data/spec/unit/thinking_sphinx/active_record_spec.rb

@@ -230,7 +230,8 @@ describe "ThinkingSphinx::ActiveRecord" do
 
     it "should allow associations to other STI models" do
       Child.sphinx_indexes.last.link!
-      sql = Child.sphinx_indexes.last.to_sql.gsub('$start', '0').gsub('$end', '100')
+      sql = Child.sphinx_indexes.last.to_riddle_for_core(0, 0).sql_query
+      sql.gsub!('$start', '0').gsub!('$end', '100')
       lambda { Child.connection.execute(sql) }.should_not raise_error(ActiveRecord::StatementInvalid)
     end
   end

data/spec/unit/thinking_sphinx/core/string_spec.rb

@@ -0,0 +1,9 @@
+require 'spec/spec_helper'
+
+describe String do  
+  describe "to_crc32 instance method" do
+    it "should return an integer" do
+      'to_crc32'.to_crc32.should be_a_kind_of(Integer)
+    end
+  end
+end    

data/spec/unit/thinking_sphinx/index_spec.rb

@@ -1,12 +1,12 @@
 require 'spec/spec_helper'
 
 describe ThinkingSphinx::Index do
-  describe "to_sql method" do
+  describe "generated sql_query" do
     it "should include explicit groupings if requested" do
       @index = ThinkingSphinx::Index.new(Person)
       
       @index.groupings << "custom_sql"
-      @index.to_sql.should match(/GROUP BY.+custom_sql/)
+      @index.to_riddle_for_core(0, 0).sql_query.should match(/GROUP BY.+custom_sql/)
     end
   end
   

data/tasks/distribution.rb

@@ -0,0 +1,48 @@
+require 'rake/rdoctask'
+require 'rake/gempackagetask'
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require 'thinking_sphinx'
+
+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')
+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[
+    "lib/**/*.rb",
+    "LICENCE",
+    "README",
+    "tasks/**/*.rb",
+    "tasks/**/*.rake",
+    "vendor/**/*"
+  ]
+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

@@ -0,0 +1,86 @@
+require 'rubygems'
+require 'spec/rake/spectask'
+require 'cucumber/rake/task'
+
+desc "Run the specs under spec"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts << "-c"
+end
+
+desc "Run all feature-set configurations"
+task :features do |t|
+  puts   "rake features:mysql"
+  system "rake features:mysql"
+  puts   "rake features:postgresql"
+  system "rake features:postgresql"
+end
+
+namespace :features do
+  def add_task(name, description)
+    Cucumber::Rake::Task.new(name, description) do |t|
+      t.cucumber_opts = "--format pretty"
+      t.step_pattern  = [
+        "features/support/env",
+        "features/support/db/#{name}",
+        "features/support/db/active_record",
+        "features/support/post_database",
+        "features/step_definitions/**.rb"
+      ]
+    end
+  end
+  
+  add_task :mysql,      "Run feature-set against MySQL"
+  add_task :postgresql, "Run feature-set against PostgreSQL"
+end
+
+desc "Generate RCov reports"
+Spec::Rake::SpecTask.new(:rcov) do |t|
+  t.libs << 'lib'
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec', '--exclude', 'gems', '--exclude', 'riddle']
+end
+
+namespace :rcov do
+  def add_task(name, description)
+    Cucumber::Rake::Task.new(name, description) do |t|
+      t.cucumber_opts = "--format pretty"
+      t.step_pattern  = [
+        "features/support/env",
+        "features/support/db/#{name}",
+        "features/support/db/active_record",
+        "features/support/post_database",
+        "features/step_definitions/**.rb"
+      ]
+      t.rcov = true
+      t.rcov_opts = [
+        '--exclude', 'spec',
+        '--exclude', 'gems',
+        '--exclude', 'riddle',
+        '--exclude', 'features'
+      ]
+    end
+  end
+  
+  add_task :mysql,      "Run feature-set against MySQL with rcov"
+  add_task :postgresql, "Run feature-set against PostgreSQL with rcov"
+end
+
+desc "Build cucumber.yml file"
+task :cucumber_defaults do
+  default_requires = %w(
+    --require features/support/env.rb
+    --require features/support/db/mysql.rb
+    --require features/support/db/active_record.rb
+    --require features/support/post_database.rb
+  ).join(" ")
+  
+  step_definitions = FileList["features/step_definitions/**.rb"].collect { |path|
+    "--require #{path}"
+  }.join(" ")
+  
+  File.open('cucumber.yml', 'w') { |f|
+    f.write "default: \"#{default_requires} #{step_definitions}\""
+  }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-08 00:00:00 -08:00
+date: 2009-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - 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
@@ -49,6 +50,8 @@ files:
 - lib/thinking_sphinx.rb
 - LICENCE
 - README
+- tasks/distribution.rb
+- tasks/testing.rb
 - tasks/thinking_sphinx_tasks.rb
 - tasks/thinking_sphinx_tasks.rake
 - vendor/after_commit
@@ -99,6 +102,7 @@ files:
 - 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
@@ -142,6 +146,7 @@ test_files:
 - 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/tasks/thinking_sphinx_tasks.rake

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

data/tasks/thinking_sphinx_tasks.rb

@@ -1,128 +0,0 @@
-require 'fileutils'
-
-namespace :thinking_sphinx do
-  task :app_env do
-    Rake::Task[:environment].invoke if defined?(RAILS_ROOT)
-    Rake::Task[:merb_env].invoke    if defined?(Merb)
-  end
-  
-  desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings"
-  task :running_start => :app_env do
-   Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running?
-   Rake::Task["thinking_sphinx:start"].invoke
-  end
-  
-  desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"
-  task :start => :app_env do
-    config = ThinkingSphinx::Configuration.instance
-    
-    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 = "#{config.bin_path}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?
-    config = ThinkingSphinx::Configuration.instance
-    pid    = sphinx_pid
-    system "searchd --stop --config #{config.config_file}"
-    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
-    config = ThinkingSphinx::Configuration.instance
-    puts "Generating Configuration to #{config.config_file}"
-    config.build
-  end
-  
-  desc "Index data for Sphinx using Thinking Sphinx's settings"
-  task :index => :app_env do
-    ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
-    
-    config = ThinkingSphinx::Configuration.instance
-    unless ENV["INDEX_ONLY"] == "true"
-      puts "Generating Configuration to #{config.config_file}"
-      config.build
-    end
-        
-    FileUtils.mkdir_p config.searchd_file_path
-    cmd = "#{config.bin_path}indexer --config #{config.config_file} --all"
-    cmd << " --rotate" if sphinx_running?
-    puts cmd
-    system cmd
-  end
-  
-  namespace :index do
-    task :delta => :app_env do
-      ThinkingSphinx.indexed_models.select { |model|
-        model.constantize.sphinx_indexes.any? { |index| index.delta? }
-      }.each do |model|
-        model.constantize.sphinx_indexes.select { |index|
-          index.delta? && index.delta_object.respond_to?(:delayed_index)
-        }.each { |index|
-          index.delta_object.delayed_index(index.model)
-        }
-      end
-    end
-  end
-  
-  desc "Process stored delta index requests"
-  task :delayed_delta => :app_env do
-    require 'delayed/worker'
-    
-    Delayed::Worker.new(
-      :min_priority => ENV['MIN_PRIORITY'],
-      :max_priority => ENV['MAX_PRIORITY']
-    ).start
-  end
-end
-
-namespace :ts do
-  desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings"
-  task :run     => "thinking_sphinx:running_start"
-  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"
-  namespace :in do
-    task :delta => "thinking_sphinx:index:delta"
-  end
-  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 :conf    => "thinking_sphinx:configure"
-  desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
-  task :config  => "thinking_sphinx:configure"
-  desc "Process stored delta index requests"
-  task :dd      => "thinking_sphinx:delayed_delta"
-end
-
-def sphinx_pid
-  ThinkingSphinx.sphinx_pid
-end
-
-def sphinx_running?
-  ThinkingSphinx.sphinx_running?
-end