dnif 0.0.1.alpha.5 → 0.0.1.alpha.6

data/dnif.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dnif}
-  s.version = "0.0.1.alpha.5"
+  s.version = "0.0.1.alpha.6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rafael Souza"]

data/lib/dnif/search.rb

@@ -3,10 +3,6 @@ module Dnif
   def self.search(query, options = {})
     options.reverse_merge!(:index => '*')
 
-    Dnif.root_path ||= File.expand_path(File.dirname("."))
-    searchd = Dnif::Configuration.options_for("searchd", File.join(Dnif.root_path, "config/sphinx", Dnif.environment + ".erb"))
-    client = Riddle::Client.new(*searchd["listen"].split(":"))
-
     if not options[:class].nil?
       filter_value = Dnif::MultiAttribute.encode(options[:class]).split(",").map(&:to_i)
       client.filters << Riddle::Client::Filter.new("class_id", filter_value)
@@ -29,6 +25,23 @@ module Dnif
     end.flatten
   end
 
+  def self.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 self.config_path
+    Dnif.root_path ||= File.expand_path(File.dirname("."))
+    File.join(Dnif.root_path, "config/sphinx", Dnif.environment + ".erb")
+  end
+
   module Search
 
     def search(query)

data/test/unit/test_search.rb

@@ -3,7 +3,63 @@ require 'test_helper'
 
 class TestSearch < Test::Unit::TestCase
 
-  test "search" do
+  test ".config_path with nil root_path" do
+    File.expects(:expand_path).returns("/expanded/path")
+    Dnif.expects(:root_path).twice.returns(nil, ".")
+    Dnif.expects(:root_path=).with("/expanded/path")
+    Dnif.expects(:environment).returns("development")
+
+    assert_equal "./config/sphinx/development.erb", Dnif.config_path
+  end
+
+  test ".config_path with defined root_path" do
+    Dnif.expects(:root_path).twice.returns("/root/path", "/root/path")
+    Dnif.expects(:environment).returns("development")
+
+    assert_equal "/root/path/config/sphinx/development.erb", Dnif.config_path
+  end
+
+  test ".client when config uses listen" do
+    Dnif.expects(:config_path).returns("config/path.erb")
+    Dnif::Configuration.expects(:options_for).with("searchd", "config/path.erb").returns({ "listen" => "127.0.0.1:3313" })
+    Riddle::Client.expects(:new).with("127.0.0.1", "3313")
+
+    Dnif.client
+  end
+
+  test ".client when config uses address and port" do
+    Dnif.expects(:config_path).returns("config/path.erb")
+    Dnif::Configuration.expects(:options_for).with("searchd", "config/path.erb").returns({ "address" => "127.0.0.1", "port" => "3313" })
+    Riddle::Client.expects(:new).with("127.0.0.1", "3313")
+
+    Dnif.client
+  end
+
+  test ".search" do
+    results = {
+      :matches => [{
+        :doc => 2983,
+        :attributes => {
+          "class_id" => "336,623,883,1140"
+        }
+      }, {
+        :doc => 7893,
+        :attributes => {
+          "class_id" => "323,623,877,1133,1381,1646,1908"
+        }
+      }]
+    }
+
+    riddle = mock("Riddle")
+    riddle.expects(:query).with("my search", "*").returns(results)
+    Dnif.expects(:client).returns(riddle)
+    Post.expects(:find_all_by_id).once.with([1])
+    Comment.expects(:find_all_by_id).once.with([2])
+
+    Dnif.search("my search")
+  end
+
+  test ".search through models" do
     results_for_post = {
       :matches => [{
         :doc => 2983,
@@ -21,13 +77,19 @@ class TestSearch < Test::Unit::TestCase
       }]
     }
 
-    Dnif::Configuration.expects(:options_for).twice.returns({ "listen" => "127.0.0.1:3333" })
-    Riddle::Client.any_instance.expects(:query).twice.with("post", "*").returns(results_for_post, results_for_comment)
+    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("post")
+    Comment.search("comment")
   end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - alpha
-  - 5
-  version: 0.0.1.alpha.5
+  - 6
+  version: 0.0.1.alpha.6
 platform: ruby
 authors: 
 - Rafael Souza