dnif 0.0.1.alpha.3 → 0.0.1.alpha.4

data/dnif.gemspec

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

@@ -26,5 +26,37 @@ module Dnif
         yield name, class_name
       end
     end
+
+    # Code extracted from Ultrasphinx
+    # Configuration file parser.
+    def self.options_for(heading, path)
+      # Evaluate ERB
+      template = ERB.new(File.open(path) {|f| f.read})
+      contents = template.result(binding)
+
+      # Find the correct heading.
+      section = contents[/^#{heading.gsub('/', '__')}\s*?\{(.*?)\}/m, 1]
+
+      if section
+        # Strip comments and leading/trailing whitespace
+        section.gsub!(/^\s*(.*?)\s*(?:#.*)?$/, '\1')
+
+        # Convert to a hash
+        returning({}) do |options|
+          lines = section.split(/\n+/)
+          while line = lines.shift
+            if line =~ /(.*?)\s*=\s*(.*)/
+              key, value = $1, [$2]
+              value << (line = lines.shift) while line =~ /\\$/
+              options[key] = value.join("\n    ")
+            end
+          end
+        end
+      else
+        # XXX Is it safe to raise here?
+        puts "warning; heading #{heading} not found in #{path}; it may be corrupted. "
+        {}    
+      end    
+    end
   end
 end

data/lib/dnif/search.rb

@@ -3,7 +3,9 @@ module Dnif
   def self.search(query, options = {})
     options.reverse_merge!(:index => '*')
 
-    client = Riddle::Client.new("127.0.0.1", 3313)
+    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)

data/test/unit/test_configuration.rb

@@ -29,4 +29,9 @@ class TestConfiguration < Test::Unit::TestCase
     assert_equal ["users_main", "people_main", "orders_main", "notes_main"], names
     assert_equal ["User", "Person", "Order", "Note"], classes
   end
+
+  test ".options_for" do
+    client = Dnif::Configuration.options_for("searchd", File.join(Dnif.root_path, "templates", "config.erb"))
+    assert client.is_a?(Hash)
+  end
 end

data/test/unit/test_search.rb

@@ -21,7 +21,8 @@ class TestSearch < Test::Unit::TestCase
       }]
     }
 
-    Riddle::Client.any_instance.expects(:query).times(2).with("post", "*").returns(results_for_post, results_for_comment)
+    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)
 
     Post.expects(:find_all_by_id).once.with([1])
     Comment.expects(:find_all_by_id).once.with([2])

metadata

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