dnif 0.0.1.beta.3 → 0.0.1.beta.4

data/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+*.gem
+pkg
+.bundle/config

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format documentation

data/Gemfile

@@ -0,0 +1,15 @@
+source "http://rubygems.org"
+
+gem "rake"
+gem "activerecord", ">= 3.0.0", :require => "active_record"
+gem "activesupport", ">= 3.0.0", :require => "active_support"
+gem "riddle", ">= 1.1.0"
+gem "builder", ">= 2.1.2"
+
+group :development do
+  gem "jeweler", ">= 1.5.0.pre2"
+  gem "rspec", ">= 2.0.0.beta.20"
+  gem "database_cleaner"
+  gem "awesome_print", :require => "ap"
+  gem "sqlite3-ruby", :require => "sqlite3"
+end

data/Gemfile.lock

@@ -0,0 +1,52 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.0)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    awesome_print (0.2.1)
+    builder (2.1.2)
+    database_cleaner (0.5.2)
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    i18n (0.4.1)
+    jeweler (1.5.0.pre2)
+      bundler (>= 1.0.0.rc.5)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    riddle (1.1.0)
+    rspec (2.0.0.beta.20)
+      rspec-core (= 2.0.0.beta.20)
+      rspec-expectations (= 2.0.0.beta.20)
+      rspec-mocks (= 2.0.0.beta.20)
+    rspec-core (2.0.0.beta.20)
+    rspec-expectations (2.0.0.beta.20)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.20)
+    sqlite3-ruby (1.3.1)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 3.0.0)
+  activesupport (>= 3.0.0)
+  awesome_print
+  builder (>= 2.1.2)
+  database_cleaner
+  jeweler (>= 1.5.0.pre2)
+  rake
+  riddle (>= 1.1.0)
+  rspec (>= 2.0.0.beta.20)
+  sqlite3-ruby

data/Rakefile

@@ -1,38 +1,36 @@
+require "bundler"
 begin
-  require 'jeweler'
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "dnif"
-    gemspec.summary = "dnif is the new find... for sphinx"
-    gemspec.description = "dnif is a gem to index data using ActiveRecord finders, letting you index your custom methods and not only your table fields"
-    gemspec.email = "me@rafaelss.com"
-    gemspec.homepage = "http://github.com/rafaelss/dnif"
-    gemspec.authors = ["Rafael Souza"]
+require "jeweler"
 
-    gemspec.has_rdoc = false
-    gemspec.files = %w(Rakefile dnif.gemspec README.rdoc) + Dir["{lib,test}/**/*"]
+$LOAD_PATH.unshift('lib')
+require "dnif"
 
-    gemspec.add_dependency "activerecord"
-    gemspec.add_dependency "activesupport"
-    gemspec.add_dependency "riddle"
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
+Jeweler::Tasks.new do |gemspec|
+  gemspec.name = "dnif"
+  gemspec.version = Dnif::Version::STRING
+  gemspec.summary = "dnif is the new find... for sphinx"
+  gemspec.description = "dnif is a gem to index data using ActiveRecord finders, letting you index your custom methods and not only your table fields"
+  gemspec.email = "me@rafaelss.com"
+  gemspec.homepage = "http://github.com/rafaelss/dnif"
+  gemspec.authors = ["Rafael Souza"]
+  gemspec.has_rdoc = false
+  gemspec.files.include %w(.gitignore .rspec templates/config.erb)
 end
 
+Jeweler::GemcutterTasks.new
+
 desc "Generate gemspec and build gem"
 task :build_gem do
   Rake::Task["gemspec"].invoke
   Rake::Task["build"].invoke
 end
 
-Jeweler::GemcutterTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.test_files = FileList.new('test/**/test_*.rb') do |list|
-    list.exclude 'test/test_helper.rb'
-  end
-  test.libs << 'test'
-  test.verbose = true
-end
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)

data/dnif.gemspec

@@ -5,68 +5,73 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dnif}
-  s.version = "0.0.1.beta.3"
+  s.version = "0.0.1.beta.4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rafael Souza"]
-  s.date = %q{2010-07-15}
+  s.date = %q{2010-09-07}
   s.description = %q{dnif is a gem to index data using ActiveRecord finders, letting you index your custom methods and not only your table fields}
   s.email = %q{me@rafaelss.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
+    ".gitignore",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
     "README.rdoc",
-     "Rakefile",
-     "dnif.gemspec",
-     "lib/dnif.rb",
-     "lib/dnif/configuration.rb",
-     "lib/dnif/document.rb",
-     "lib/dnif/index.rb",
-     "lib/dnif/index_builder.rb",
-     "lib/dnif/indexer.rb",
-     "lib/dnif/multi_attribute.rb",
-     "lib/dnif/schema.rb",
-     "lib/dnif/search.rb",
-     "lib/dnif/tasks.rb",
-     "test/fixtures/db/schema.rb",
-     "test/fixtures/log/searchd.pid",
-     "test/fixtures/models.rb",
-     "test/fixtures/sphinx_1.xml",
-     "test/fixtures/sphinx_2.xml",
-     "test/fixtures/sphinx_3.xml",
-     "test/fixtures/sphinx_4.xml",
-     "test/fixtures/sphinx_5.xml",
-     "test/fixtures/templates/config.erb",
-     "test/test_helper.rb",
-     "test/unit/test_configuration.rb",
-     "test/unit/test_dnif.rb",
-     "test/unit/test_document.rb",
-     "test/unit/test_index.rb",
-     "test/unit/test_index_builder.rb",
-     "test/unit/test_indexer.rb",
-     "test/unit/test_multi_attribute.rb",
-     "test/unit/test_schema.rb",
-     "test/unit/test_search.rb"
+    "Rakefile",
+    "dnif.gemspec",
+    "lib/dnif.rb",
+    "lib/dnif/configuration.rb",
+    "lib/dnif/document.rb",
+    "lib/dnif/index.rb",
+    "lib/dnif/indexer.rb",
+    "lib/dnif/multi_attribute.rb",
+    "lib/dnif/schema.rb",
+    "lib/dnif/search.rb",
+    "lib/dnif/tasks.rb",
+    "lib/dnif/version.rb",
+    "spec/dnif/configuration_spec.rb",
+    "spec/dnif/dnif_spec.rb",
+    "spec/dnif/document_spec.rb",
+    "spec/dnif/index_spec.rb",
+    "spec/dnif/indexer_spec.rb",
+    "spec/dnif/multi_attribute_spec.rb",
+    "spec/dnif/schema_spec.rb",
+    "spec/dnif/search_spec.rb",
+    "spec/fixtures/db/schema.rb",
+    "spec/fixtures/log/searchd.pid",
+    "spec/fixtures/models.rb",
+    "spec/fixtures/sphinx_1.xml",
+    "spec/fixtures/sphinx_2.xml",
+    "spec/fixtures/sphinx_3.xml",
+    "spec/fixtures/sphinx_4.xml",
+    "spec/fixtures/sphinx_5.xml",
+    "spec/fixtures/templates/config.erb",
+    "spec/spec_helper.rb",
+    "spec/support/activerecord/models.rb",
+    "templates/config.erb"
   ]
+  s.has_rdoc = false
   s.homepage = %q{http://github.com/rafaelss/dnif}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{dnif is the new find... for sphinx}
   s.test_files = [
-    "test/fixtures/db/schema.rb",
-     "test/fixtures/models.rb",
-     "test/test_helper.rb",
-     "test/unit/test_configuration.rb",
-     "test/unit/test_dnif.rb",
-     "test/unit/test_document.rb",
-     "test/unit/test_index.rb",
-     "test/unit/test_index_builder.rb",
-     "test/unit/test_indexer.rb",
-     "test/unit/test_multi_attribute.rb",
-     "test/unit/test_schema.rb",
-     "test/unit/test_search.rb"
+    "spec/dnif/configuration_spec.rb",
+    "spec/dnif/dnif_spec.rb",
+    "spec/dnif/document_spec.rb",
+    "spec/dnif/index_spec.rb",
+    "spec/dnif/indexer_spec.rb",
+    "spec/dnif/multi_attribute_spec.rb",
+    "spec/dnif/schema_spec.rb",
+    "spec/dnif/search_spec.rb",
+    "spec/fixtures/db/schema.rb",
+    "spec/fixtures/models.rb",
+    "spec/spec_helper.rb",
+    "spec/support/activerecord/models.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -74,18 +79,39 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<riddle>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_runtime_dependency(%q<riddle>, [">= 1.1.0"])
+      s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.20"])
+      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_development_dependency(%q<awesome_print>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<riddle>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+      s.add_dependency(%q<riddle>, [">= 1.1.0"])
+      s.add_dependency(%q<builder>, [">= 2.1.2"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.20"])
+      s.add_dependency(%q<database_cleaner>, [">= 0"])
+      s.add_dependency(%q<awesome_print>, [">= 0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<riddle>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
+    s.add_dependency(%q<riddle>, [">= 1.1.0"])
+    s.add_dependency(%q<builder>, [">= 2.1.2"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.0.pre2"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.20"])
+    s.add_dependency(%q<database_cleaner>, [">= 0"])
+    s.add_dependency(%q<awesome_print>, [">= 0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end
 end
 

data/lib/dnif.rb

@@ -1,55 +1,104 @@
 # encoding: utf-8
+require "bundler"
+Bundler.setup(:default)
 
-require 'active_record'
-require 'active_support'
-require 'riddle'
-
-require "dnif/configuration"
-require "dnif/index_builder" # TODO remove
-require "dnif/index"
-require "dnif/schema"
-require "dnif/document"
-require "dnif/indexer"
-require "dnif/multi_attribute"
-require "dnif/search"
+require "riddle"
 
 module Dnif
+  extend self
+
+  autoload :Configuration, "dnif/configuration"
+  autoload :Index, "dnif/index"
+  autoload :Schema, "dnif/schema"
+  autoload :Document, "dnif/document"
+  autoload :Indexer, "dnif/indexer"
+  autoload :MultiAttribute, "dnif/multi_attribute"
+  autoload :Search, "dnif/search"
+  autoload :Version, "dnif/version"
 
-  def self.root_path
+  def root_path
     @root_path
   end
 
-  def self.root_path=(value)
+  def root_path=(value)
     @root_path = value
   end
 
-  def self.environment
+  def environment
     @environment || 'development'
   end
+  alias :env :environment
 
-  def self.environment=(value)
+  def environment=(value)
     @environment = value
   end
+  alias :env= :environment=
 
-  def self.models_path
+  def models_path
     @models_path
   end
 
-  def self.models_path=(value)
+  def models_path=(value)
     @models_path = value
   end
 
-  def self.load_models
+  def load_models
     models = Dir["#{self.models_path}/*.rb"]
     models.map! do |filename|
       filename = File.basename(filename, '.rb')
       filename.classify.constantize
     end
   end
+
+  def search(query, options = {})
+    options.reverse_merge!(:index => '*')
+
+    if options[:classes]
+      ids = if options[:classes].is_a?(Array)
+        options[:classes].map { |name| ActiveRecord::Base.indexes.keys.index(name) }
+      else
+        [ActiveRecord::Base.indexes.keys.index(options[:classes])]
+      end
+
+      client.filters = [Riddle::Client::Filter.new("class_id", ids)]
+    end
+
+    results = client.query(query, options[:index])
+    raise results[:error] if results[:error]
+
+    models = results[:matches].inject({}) do |memo, match|
+      encoded_class_name = match[:attributes]["class_name"].split(',').flatten
+      class_name = Dnif::MultiAttribute.decode(encoded_class_name)
+
+      memo[class_name] ||= []
+      memo[class_name] << (match[:doc] - encoded_class_name.sum { |c| c.to_i })
+      memo
+    end
+
+    models.map do |class_name, ids|
+      class_name.constantize.find_all_by_id(ids)
+    end.flatten
+  end
+
+  def client
+    searchd = Dnif::Configuration.options_for("searchd", config_path)
+    if searchd["listen"]
+      address, port = searchd["listen"].split(":")
+    else
+      address = searchd["address"] || "127.0.0.1"
+      port = searchd["port"] || 3313
+    end
+
+    @client ||= Riddle::Client.new(address, port)
+  end
+
+  def config_path
+    Dnif.root_path ||= File.expand_path(File.dirname("."))
+    File.join(Dnif.root_path, "config/sphinx", Dnif.environment + ".erb")
+  end
 end
 
-if defined?(Rails)
-  Dnif.root_path = RAILS_ROOT
-  Dnif.environment = RAILS_ENV
-  Dnif.models_path = File.join(RAILS_ROOT, "app", "models")
-end
+if defined?(ActiveRecord::Base)
+  ActiveRecord::Base.extend(Dnif::Indexer)
+  ActiveRecord::Base.extend(Dnif::Search)
+end

data/lib/dnif/configuration.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'dnif'
 
 module Dnif
 
@@ -11,9 +10,11 @@ module Dnif
 
       # TODO turn "db/sphinx" and "config/sphinx" configurable
       FileUtils.mkdir_p(File.join(Dnif.root_path, "db", "sphinx", Dnif.environment))
-      File.open(Dnif.root_path + "/config/sphinx/" + Dnif.environment + ".conf", "w") do |f|
+      path = File.join(Dnif.root_path, "config", "sphinx", Dnif.environment + ".conf")
+      File.open(path, "w") do |f|
         f.puts output
       end
+      path
     end
 
     def self.sources
@@ -38,7 +39,7 @@ module Dnif
         section.gsub!(/^\s*(.*?)\s*(?:#.*)?$/, '\1')
 
         # Convert to a hash
-        returning({}) do |options|
+        {}.tap do |options|
           lines = section.split(/\n+/)
           while line = lines.shift
             if line =~ /(.*?)\s*=\s*(.*)/