tire 0.1.6 → 0.1.7

data/lib/tire/search/query.rb

@@ -4,7 +4,7 @@ module Tire
     class Query
       def initialize(&block)
         @value = {}
-        self.instance_eval(&block) if block_given?
+        block.arity < 1 ? self.instance_eval(&block) : block.call(self) if block_given?
       end
 
       def term(field, value)
@@ -27,7 +27,11 @@ module Tire
       def boolean(options={}, &block)
         # TODO: Try to get rid of the `boolean` method
         raise ArgumentError, "Please pass a block to boolean query" unless block_given?
-        @value = BooleanQuery.new(options, &block).to_hash
+
+        @boolean ||= BooleanQuery.new(options)
+        block.arity < 1 ? @boolean.instance_eval(&block) : block.call(@boolean) if block_given?
+        @value[:bool] = @boolean.to_hash
+        @value
       end
 
       def all
@@ -66,7 +70,7 @@ module Tire
       def initialize(options={}, &block)
         @options = options
         @value   = {}
-        self.instance_eval(&block)
+        block.arity < 1 ? self.instance_eval(&block) : block.call(self) if block_given?
       end
 
       def must(&block)
@@ -85,7 +89,7 @@ module Tire
       end
 
       def to_hash
-        { :bool => @value.update(@options) }
+        @value.update(@options)
       end
     end
 

data/lib/tire/version.rb

@@ -1,3 +1,3 @@
 module Tire
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/test/unit/search_query_test.rb

@@ -113,6 +113,19 @@ module Tire::Search
         assert_equal( { :query_string => {:query => 'fuu'} }, query[:bool][:must_not].first )
       end
 
+      should "allow passing variables from outer scope" do
+        q1 = 'foo'
+        q2 = 'bar'
+        query = Query.new.boolean do |boolean|
+          boolean.must { |query| query.string q1 }
+          boolean.must { |query| query.string q2 }
+        end
+
+        assert_equal( 2, query[:bool][:must].size, query[:bool][:must].inspect )
+        assert_equal( { :query_string => {:query => 'foo'} }, query[:bool][:must].first )
+        assert_equal( { :query_string => {:query => 'bar'} }, query[:bool][:must].last )
+      end
+
     end
 
   end

data/test/unit/search_test.rb

@@ -253,6 +253,27 @@ module Tire
           assert_equal( { 'terms' => { 'tags' => ['baz'] } }, query['must'].last)
         end
 
+        should "allow passing variables from outer scope" do
+          q1 = 'foo'
+          q2 = 'bar'
+
+          assert_nothing_raised do
+            @search = Search::Search.new('index') do
+              query do
+                boolean do
+                  must   { string q1 }
+                  must   { string q2 }
+                end
+              end
+            end
+          end
+
+          hash  = MultiJson.decode(@search.to_json)
+          query = hash['query']['bool']
+
+          assert_equal 2, query['must'].size
+        end
+
       end
 
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tire
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Karel Minarik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 +02:00
+date: 2011-06-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency