zinx 0.0.4 → 0.0.5

data/lib/zinx.rb

@@ -141,7 +141,6 @@ module Zinx
 
 			def results
 				run if @results.empty?
-				@results
 			end
 
 			# syntax sugar for results[0].matches when using only one query
@@ -163,12 +162,12 @@ module Zinx
 					q.each do |result|
 						@results << Result.new(result)
 					end
+					@results
 				else
 					q = @client.Query(@query, @index_name)
 					@results << Result.new(q)
+					@results.first
 				end
-
-				@results
 			end
 
 			# add query for multiple queries
@@ -186,7 +185,8 @@ module Zinx
 			def search(query, params = {}, &block)
 				params[:query] = query
 				init(params)
-				block_given? ? yield(self) : run
+				yield self if block_given?
+				run
 			end
 
 			def init(params = {})

data/test/test.rb

@@ -1,19 +1,12 @@
 require 'test/unit'
 require 'zinx'
-require 'awesome_print'
+require 'pp'
 require 'zlib'
 
 class ZinxTest < Test::Unit::TestCase
 	def test_simple_search
 		result = Zinx::Client.search 'something'
-		assert result.count > 0, 'nothing returned from search'
-		assert_equal result.first.error, ''
-	end
-
-	def test_something
-		result = Zinx::Client.search 'something' do |s|
-			s.run
-		end
-		assert_equal result[0].class, Zinx::Result.new({}).class
+		assert result.status == 0, 'error in Sphinx'
+		assert_equal result.error, ''
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zinx
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: