dnif 0.0.1.beta.6 → 0.1.0

data/Rakefile

@@ -10,7 +10,7 @@ end
 require "jeweler"
 
 $LOAD_PATH.unshift('lib')
-require "dnif"
+require "dnif/version"
 
 Jeweler::Tasks.new do |gemspec|
   gemspec.name = "dnif"
@@ -26,11 +26,5 @@ end
 
 Jeweler::GemcutterTasks.new
 
-desc "Generate gemspec and build gem"
-task :build_gem do
-  Rake::Task["gemspec"].invoke
-  Rake::Task["build"].invoke
-end
-
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)

data/dnif.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dnif}
-  s.version = "0.0.1.beta.6"
+  s.version = "0.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rafael Souza"]
-  s.date = %q{2010-09-08}
+  s.date = %q{2010-10-21}
   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 = [

data/lib/dnif.rb

@@ -14,7 +14,6 @@ module Dnif
   autoload :Indexer, "dnif/indexer"
   autoload :MultiAttribute, "dnif/multi_attribute"
   autoload :Search, "dnif/search"
-  autoload :Version, "dnif/version"
 
   def root_path
     @root_path
@@ -66,17 +65,18 @@ module Dnif
     results = client.query(query, options[:index])
     raise results[:error] if results[:error]
 
-    models = results[:matches].inject({}) do |memo, match|
+    models = {}
+    results[:matches].each do |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
+      models[class_name] ||= []
+      models[class_name] << (match[:doc] - encoded_class_name.sum { |c| c.to_i })
     end
 
     models.map do |class_name, ids|
-      class_name.constantize.find_all_by_id(ids)
+      klass = class_name.constantize
+      class_name.constantize.where("#{klass.primary_key} IN (?)", ids)
     end.flatten
   end
 

data/lib/dnif/document.rb

@@ -53,7 +53,7 @@ module Dnif
     end
 
     def document_id
-      @object.id + encoded_class_name.split(',').sum { |c| c.to_i }
+      @object.send(@object.class.primary_key.to_sym) + encoded_class_name.split(',').sum { |c| c.to_i }
     end
 
     private

data/lib/dnif/index.rb

@@ -22,8 +22,8 @@ module Dnif
       @attributes[name] = options[:type]
     end
 
-    def where(conditions)
+    def where(*conditions)
       @conditions = conditions
     end
   end
-end
+end

data/lib/dnif/indexer.rb

@@ -22,8 +22,9 @@ module Dnif
         schema = Schema.new(self)
         xml << schema.generate
 
-        results = all(:conditions => indexes[self.name].conditions)
-        results.each do |object|
+        results = self
+        results = where(*indexes[self.name].conditions) if indexes[self.name].conditions.present?
+        results.find_each(:batch_size => 5000) do |object|
           document = Document.new(object)
           xml << document.generate
         end

data/lib/dnif/tasks.rb

@@ -64,7 +64,10 @@ namespace :dnif do
 
   desc "Stop sphinx daemon"
   task :stop => :environment do
-    controller.stop
+    while controller.running?
+      controller.stop
+      sleep(1)
+    end
     puts "\n>> daemon stopped" # TODO show this only whether daemon is really stopped
   end
 

data/lib/dnif/version.rb

@@ -1,9 +1,9 @@
 module Dnif
   module Version
     MAJOR = 0
-    MINOR = 0
-    PATCH = 1
-    BUILD = "beta.6"
+    MINOR = 1
+    PATCH = 0
+    BUILD = nil # "beta.6"
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

data/spec/dnif/dnif_spec.rb

@@ -72,8 +72,9 @@ describe Dnif do
       riddle = mock("Riddle")
       riddle.should_receive(:query).with("my search", "*").and_return(results)
       Dnif.should_receive(:client).and_return(riddle)
-      Post.should_receive(:find_all_by_id).once.with([1])
-      Comment.should_receive(:find_all_by_id).once.with([2])
+
+      Post.should_receive(:where).with("id IN (?)", [1]).and_return([])
+      Comment.should_receive(:where).with("id IN (?)", [2]).and_return([])
 
       Dnif.search("my search")
     end
@@ -90,8 +91,8 @@ describe Dnif do
       Riddle::Client::Filter.should_receive(:new).with("class_id", [0])
       Riddle::Client::Filter.should_receive(:new).with("class_id", [1])
 
-      Post.should_receive(:find_all_by_id).once.with([1])
-      Comment.should_receive(:find_all_by_id).once.with([2])
+      Post.should_receive(:where).with("id IN (?)", [1]).and_return([])
+      Comment.should_receive(:where).with("id IN (?)", [2]).and_return([])
 
       Post.search("post")
       Comment.search("comment")
@@ -106,7 +107,8 @@ describe Dnif do
       ActiveRecord::Base.should_receive(:indexes).and_return({ "Post" => mock })
 
       Riddle::Client::Filter.should_receive(:new).with("class_id", [0])
-      Post.should_receive(:find_all_by_id).once.with([1])
+
+      Post.should_receive(:where).with("id IN (?)", [1]).and_return([])
 
       Dnif.search("post", :classes => "Post")
     end

data/spec/dnif/index_spec.rb

@@ -15,6 +15,6 @@ describe Dnif::Index do
 
   it "should define where clause" do
     index = Dnif::Index.new(&proc { where "field = 'value'" })
-    index.conditions.should == "field = 'value'"
+    index.conditions.should == ["field = 'value'"]
   end
 end

data/spec/dnif/indexer_spec.rb

@@ -17,7 +17,7 @@ describe Dnif::Indexer do
 
       klass.indexes["Klass"].fields.should == [ :a ]
       klass.indexes["Klass"].attributes.should == { :b => :integer }
-      klass.indexes["Klass"].conditions.should == "c"
+      klass.indexes["Klass"].conditions.should == ["c"]
 
       klass.indexes.delete("Klass")
     end

data/spec/support/activerecord/models.rb

@@ -1,11 +1,19 @@
 class Post
 
   extend Dnif::Search
+
+  def self.primary_key
+    "id"
+  end
 end
 
 class Comment
 
   extend Dnif::Search
+
+  def self.primary_key
+    "id"
+  end
 end
 
 class User < ActiveRecord::Base

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dnif
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  - beta
-  - 6
-  version: 0.0.1.beta.6
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Rafael Souza
@@ -16,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -03:00
+date: 2010-10-21 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -212,20 +210,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3817415889434215376
+      hash: -121134360209263234
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: