dnif 0.0.1.beta.2 → 0.0.1.beta.3

data/README.rdoc

@@ -38,6 +38,8 @@ dnif is a gem to index data using ActiveRecord finders (for now), letting you in
 - Improve test suite
 - Index in chunks
 - Support to delta index (or something like that)
+- Remove the class_name (seems not be necessary anymore)
+- Move this TODO to Issues
 
 == Maintainer
 

data/dnif.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dnif}
-  s.version = "0.0.1.beta.2"
+  s.version = "0.0.1.beta.3"
 
   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-14}
+  s.date = %q{2010-07-15}
   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/document.rb

@@ -23,7 +23,8 @@ module Dnif
           end
         end
 
-        xml.class_id(class_id)
+        xml.class_id(@object.indexes.keys.index(@object.class.name))
+        xml.class_name(encoded_class_name)
 
         attributes = []
         @object.indexes.values.each do |index|
@@ -53,12 +54,12 @@ module Dnif
 
     private
 
-    def class_id
-      @class_id ||= Dnif::MultiAttribute.encode(@object.class.name)
+    def encoded_class_name
+      @encoded_class_name ||= Dnif::MultiAttribute.encode(@object.class.name)
     end
 
     def document_id
-      @object.id + class_id.split(',').sum { |c| c.to_i }
+      @object.id + encoded_class_name.split(',').sum { |c| c.to_i }
     end
   end
 end

data/lib/dnif/indexer.rb

@@ -1,9 +1,10 @@
 module Dnif
   module Indexer
 
+    @@indexes ||= {}
+
     def define_index(&block)
-      @@indexes ||= {}
-      @@indexes[self.name] = Dnif::Index.new(&block)
+      indexes[self.name] = Dnif::Index.new(&block)
 
       include InstanceMethods
     end
@@ -48,4 +49,4 @@ module Dnif
   end
 end
 
-ActiveRecord::Base.extend(Dnif::Indexer)
+ActiveRecord::Base.extend(Dnif::Indexer) if defined?(ActiveRecord::Base)

data/lib/dnif/schema.rb

@@ -8,16 +8,6 @@ module Dnif
     def generate
       xml = Builder::XmlMarkup.new(:indent => 2)
       xml.sphinx(:schema) do
-        # fields = @klass.indexes[@klass.name].fields.map do |name|
-        #   xml.sphinx(:field, :name => name)
-        #   name
-        # end
-        # 
-        # attributes = @klass.indexes[@klass.name].attributes.map do |name, type|
-        #   xml.sphinx(:attr, :name => name, :type => attribute_type(type))
-        #   name
-        # end
-
         fields = []
         @klass.indexes.values.each do |index|
           (index.fields - fields).each do |name|
@@ -26,7 +16,8 @@ module Dnif
           end
         end
 
-        xml.sphinx(:attr, :name => "class_id", :type => "multi")
+        xml.sphinx(:attr, :name => "class_id", :type => "int")
+        xml.sphinx(:attr, :name => "class_name", :type => "multi")
 
         attributes = []
         @klass.indexes.values.each do |index|

data/lib/dnif/search.rb

@@ -3,20 +3,25 @@ module Dnif
   def self.search(query, options = {})
     options.reverse_merge!(:index => '*')
 
-    if options[:class]
-      filter_value = Dnif::MultiAttribute.encode(options[:class]).split(",").map(&:to_i)
-      client.filters = [Riddle::Client::Filter.new("class_id", filter_value)]
+    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|
-      class_id = match[:attributes]["class_id"].split(',').flatten
-      class_name = Dnif::MultiAttribute.decode(class_id)
+      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] - class_id.sum { |c| c.to_i })
+      memo[class_name] << (match[:doc] - encoded_class_name.sum { |c| c.to_i })
       memo
     end
 
@@ -45,9 +50,9 @@ module Dnif
   module Search
 
     def search(query)
-      Dnif.search(query, :class => self.name)
+      Dnif.search(query, :classes => self.name)
     end
   end
 end
 
-ActiveRecord::Base.extend(Dnif::Search)
+ActiveRecord::Base.extend(Dnif::Search) if defined?(ActiveRecord::Base)

data/test/fixtures/sphinx_1.xml

@@ -5,7 +5,8 @@
   <sphinx:field name="full_name"/>
   <sphinx:field name="title"/>
   <sphinx:field name="buyer"/>
-  <sphinx:attr name="class_id" type="multi"/>
+  <sphinx:attr name="class_id" type="int"/>
+  <sphinx:attr name="class_name" type="multi"/>
   <sphinx:attr name="active" type="bool"/>
   <sphinx:attr name="clicked" type="int"/>
   <sphinx:attr name="published_at" type="timestamp"/>

data/test/fixtures/sphinx_2.xml

@@ -5,7 +5,8 @@
     <![CDATA[Note Title]]>
   </title>
   <buyer></buyer>
-  <class_id>334,623,884,1125</class_id>
+  <class_id>3</class_id>
+  <class_name>334,623,884,1125</class_name>
   <active>true</active>
   <clicked>10</clicked>
   <published_at>{now}</published_at>

data/test/fixtures/sphinx_3.xml

@@ -5,7 +5,8 @@
   </full_name>
   <title></title>
   <buyer></buyer>
-  <class_id>336,613,882,1139,1391,1646</class_id>
+  <class_id>1</class_id>
+  <class_name>336,613,882,1139,1391,1646</class_name>
   <active></active>
   <clicked></clicked>
   <published_at></published_at>

data/test/fixtures/sphinx_4.xml

@@ -3,7 +3,8 @@
   <sphinx:field name="full_name"/>
   <sphinx:field name="title"/>
   <sphinx:field name="buyer"/>
-  <sphinx:attr name="class_id" type="multi"/>
+  <sphinx:attr name="class_id" type="int"/>
+  <sphinx:attr name="class_name" type="multi"/>
   <sphinx:attr name="active" type="bool"/>
   <sphinx:attr name="clicked" type="int"/>
   <sphinx:attr name="published_at" type="timestamp"/>

data/test/fixtures/sphinx_5.xml

@@ -5,7 +5,8 @@
   <full_name></full_name>
   <title></title>
   <buyer></buyer>
-  <class_id>1,2,3,4</class_id>
+  <class_id>0</class_id>
+  <class_name>1,2,3,4</class_name>
   <active>true</active>
   <clicked></clicked>
   <published_at></published_at>

data/test/test_helper.rb

@@ -5,6 +5,7 @@
 require "test/unit"
 require "mocha"
 require "active_record"
+require "ap"
 
 require 'database_cleaner'
 DatabaseCleaner.strategy = :transaction

data/test/unit/test_indexer.rb

@@ -11,6 +11,23 @@ class TestIndexer < Test::Unit::TestCase
     DatabaseCleaner.clean
   end
 
+  test ".define_index" do
+    klass = Class.new
+    klass.extend(Dnif::Indexer)
+    klass.stubs(:name).returns("Klass")
+    klass.define_index do
+      field :a
+      attribute :b, :type => :integer
+      where "c"
+    end
+
+    assert_equal [:a], klass.indexes["Klass"].fields
+    assert_equal({ :b => :integer }, klass.indexes["Klass"].attributes)
+    assert_equal "c", klass.indexes["Klass"].conditions
+
+    klass.indexes.delete("Klass")
+  end
+
   test "objects without index should not have dnif included" do
     assert_false Post.new.respond_to?(:to_sphinx)
     assert_false Post.respond_to?(:to_sphinx)

data/test/unit/test_search.rb

@@ -40,12 +40,12 @@ class TestSearch < Test::Unit::TestCase
       :matches => [{
         :doc => 2983,
         :attributes => {
-          "class_id" => "336,623,883,1140"
+          "class_name" => "336,623,883,1140"
         }
       }, {
         :doc => 7893,
         :attributes => {
-          "class_id" => "323,623,877,1133,1381,1646,1908"
+          "class_name" => "323,623,877,1133,1381,1646,1908"
         }
       }]
     }
@@ -60,36 +60,57 @@ class TestSearch < Test::Unit::TestCase
   end
 
   test ".search through models" do
-    results_for_post = {
+    riddle = mock("Riddle")
+    riddle.expects(:query).with("post", "*").returns(results_for_post)
+    riddle.expects(:query).with("comment", "*").returns(results_for_comment)
+    riddle.expects(:filters=).twice.returns([])
+    Dnif.expects(:client).times(4).returns(riddle)
+
+    ActiveRecord::Base.expects(:indexes).twice.returns({ "Post" => mock, "Comment" => mock })
+
+    Riddle::Client::Filter.expects(:new).with("class_id", [0])
+    Riddle::Client::Filter.expects(:new).with("class_id", [1])
+
+    Post.expects(:find_all_by_id).once.with([1])
+    Comment.expects(:find_all_by_id).once.with([2])
+
+    Post.search("post")
+    Comment.search("comment")
+  end
+
+  test "search only in specified models" do
+    riddle = mock("Riddle")
+    riddle.expects(:query).with("post", "*").returns(results_for_post)
+    riddle.expects(:filters=).returns([])
+    Dnif.expects(:client).times(2).returns(riddle)
+
+    ActiveRecord::Base.expects(:indexes).returns({ "Post" => mock })
+
+    Riddle::Client::Filter.expects(:new).with("class_id", [0])
+    Post.expects(:find_all_by_id).once.with([1])
+
+    Dnif.search("post", :classes => "Post")
+  end
+
+  def results_for_post
+    {
       :matches => [{
         :doc => 2983,
         :attributes => {
-          "class_id" => "336,623,883,1140"
+          "class_name" => "336,623,883,1140"
         }
       }]
     }
-    results_for_comment = {
+  end
+
+  def results_for_comment
+    {
       :matches => [{
         :doc => 7893,
         :attributes => {
-          "class_id" => "323,623,877,1133,1381,1646,1908"
+          "class_name" => "323,623,877,1133,1381,1646,1908"
         }
       }]
     }
-
-    riddle = mock("Riddle")
-    riddle.expects(:query).with("post", "*").returns(results_for_post)
-    riddle.expects(:query).with("comment", "*").returns(results_for_comment)
-    riddle.expects(:filters).twice.returns([])
-    Dnif.expects(:client).times(4).returns(riddle)
-
-    Riddle::Client::Filter.expects(:new).with("class_id", [336, 623, 883, 1140])
-    Riddle::Client::Filter.expects(:new).with("class_id", [323, 623, 877, 1133, 1381, 1646, 1908])
-
-    Post.expects(:find_all_by_id).once.with([1])
-    Comment.expects(:find_all_by_id).once.with([2])
-
-    Post.search("post")
-    Comment.search("comment")
   end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - beta
-  - 2
-  version: 0.0.1.beta.2
+  - 3
+  version: 0.0.1.beta.3
 platform: ruby
 authors: 
 - Rafael Souza
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-14 00:00:00 -03:00
+date: 2010-07-15 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency