tire 0.3.5 → 0.3.6

data/lib/tire/index.rb

@@ -181,6 +181,18 @@ module Tire
       logged(error, '_close', curl)
     end
 
+    def analyze(text, options={})
+      options = {:pretty => true}.update(options)
+      params  = options.to_param
+      @response = Configuration.client.get "#{Configuration.url}/#{@name}/_analyze?#{params}", text
+      @response.success? ? MultiJson.decode(@response.body) : false
+    rescue Exception => error
+      raise
+    ensure
+      curl = %Q|curl -X GET "#{Configuration.url}/#{@name}/_analyze?#{params}" -d '#{text}'|
+      logged(error, '_analyze', curl)
+    end
+
     def register_percolator_query(name, options={}, &block)
       options[:query] = Search::Query.new(&block).to_hash if block_given?
 

data/lib/tire/model/indexing.rb

@@ -68,15 +68,14 @@ module Tire
         # for more information.
         #
         def indexes(name, options = {}, &block)
-          options[:type] ||= 'string'
-
           if block_given?
-            mapping[name] ||= { :type => 'object', :properties => {} }
+            mapping[name] ||= { :type => 'object', :properties => {} }.update(options)
             @_nested_mapping = name
             nested = yield
             @_nested_mapping = nil
             self
           else
+            options[:type] ||= 'string'
             if @_nested_mapping
               mapping[@_nested_mapping][:properties][name] = options
             else

data/lib/tire/results/item.rb

@@ -13,9 +13,9 @@ module Tire
         @attributes = {}
         args.each_pair do |key, value|
           if value.is_a?(Array)
-            @attributes[key.to_sym] = value.map { |item| @attributes[key.to_sym] = item.is_a?(Hash) ? self.class.new(item.to_hash) : item }
+            @attributes[key.to_sym] = value.map { |item| @attributes[key.to_sym] = item.is_a?(Hash) ? Item.new(item.to_hash) : item }
           else
-            @attributes[key.to_sym] = value.is_a?(Hash) ? self.class.new(value.to_hash) : value
+            @attributes[key.to_sym] = value.is_a?(Hash) ? Item.new(value.to_hash) : value
           end
         end
       end
@@ -59,6 +59,8 @@ module Tire
       #
       def class
         defined?(::Rails) && @attributes[:_type] ? @attributes[:_type].camelize.constantize : super
+      rescue NameError
+        super
       end
 
       def inspect

data/lib/tire/search.rb

@@ -89,7 +89,8 @@ module Tire
         request.update( { :query  => @query.to_hash } )    if @query
         request.update( { :sort   => @sort.to_ary   } )    if @sort
         request.update( { :facets => @facets.to_hash } )   if @facets
-        @filters.each { |filter| request.update( { :filter => filter.to_hash } ) } if @filters
+        request.update( { :filter => @filters.first.to_hash } ) if @filters && @filters.size == 1
+        request.update( { :filter => { :and => @filters.map { |filter| filter.to_hash } } } ) if  @filters && @filters.size > 1
         request.update( { :highlight => @highlight.to_hash } ) if @highlight
         request.update( { :size => @size } )               if @size
         request.update( { :from => @from } )               if @from

data/lib/tire/tasks.rb

@@ -55,7 +55,7 @@ namespace :tire do
       mapping = defined?(Yajl) ? Yajl::Encoder.encode(klass.tire.mapping_to_hash, :pretty => true) :
                                  MultiJson.encode(klass.tire.mapping_to_hash)
       puts "[IMPORT] Creating index '#{index.name}' with mapping:", mapping
-      index.create :mappings => klass.tire.mapping_to_hash
+      index.create :mappings => klass.tire.mapping_to_hash, :settings => klass.tire.settings
     end
 
     STDOUT.sync = true

data/lib/tire/version.rb

@@ -1,10 +1,12 @@
 module Tire
-  VERSION   = "0.3.5"
+  VERSION   = "0.3.6"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
 
-    # Added a "query" facet for free-form aggregations
+    * Fixed a bug: `Results::Item` was referencing Ruby classes incorrectly within Rails
+    * Added support for the Analyze API (#124)
+    * Added support for adding multiple filters (#122)
 
   END
 end

data/test/integration/filters_test.rb

@@ -8,6 +8,8 @@ module Tire
     context "Filters" do
 
       should "filter the results" do
+        # 2.json > Begins with "T" and is tagged "ruby"
+
         s = Tire.search('articles-test') do
           query { string 'title:T*' }
           filter :terms, :tags => ['ruby']
@@ -17,7 +19,9 @@ module Tire
         assert_equal 'Two', s.results.first.title
       end
 
-      should "filter the results with multiple filters" do
+      should "filter the results with multiple 'or' filters" do
+        # 4.json > Begins with "F" and is tagged "erlang"
+
         s = Tire.search('articles-test') do
           query { string 'title:F*' }
           filter :or, {:terms => {:tags => ['ruby']}},
@@ -28,10 +32,23 @@ module Tire
         assert_equal 'Four', s.results.first.title
       end
 
+      should "filter the results with multiple 'and' filters" do
+        # 5.json > Is tagged ["java", "javascript"] and is published on 2011-01-04
+
+        s = Tire.search('articles-test') do
+          filter :terms, :tags         => ["java"]
+          filter :term,  :published_on => "2011-01-04"
+        end
+
+        assert_equal 1, s.results.count
+        assert_equal 'Five', s.results.first.title
+      end
+
       should "not influence facets" do
         s = Tire.search('articles-test') do
           query { string 'title:T*' }
           filter :terms, :tags => ['ruby']
+
           facet('tags') { terms :tags }
         end
 

data/test/unit/index_test.rb

@@ -59,6 +59,43 @@ module Tire
         assert_nothing_raised { assert @index.close }
       end
 
+      context "analyze support" do
+        setup do
+          @mock_analyze_response = '{"tokens":[{"token":"foo","start_offset":0,"end_offset":4,"type":"<ALPHANUM>","position":1}]}'
+        end
+
+        should "send text to the Analyze API" do
+          Configuration.client.expects(:get).
+                               with("#{Configuration.url}/dummy/_analyze?pretty=true", "foo bar").
+                               returns(mock_response(@mock_analyze_response))
+
+          response = @index.analyze("foo bar")
+p response
+          assert_equal 1, response['tokens'].size
+        end
+
+        should "properly encode parameters" do
+          Configuration.client.expects(:get).with do |url, payload|
+                                url == "#{Configuration.url}/dummy/_analyze?analyzer=whitespace&pretty=true"
+                               end.returns(mock_response(@mock_analyze_response))
+
+          @index.analyze("foo bar", :analyzer => 'whitespace')
+
+          Configuration.client.expects(:get).with do |url, payload|
+                                url == "#{Configuration.url}/dummy/_analyze?field=title&pretty=true"
+                               end.returns(mock_response(@mock_analyze_response))
+
+          @index.analyze("foo bar", :field => 'title')
+
+          Configuration.client.expects(:get).with do |url, payload|
+                                url == "#{Configuration.url}/dummy/_analyze?analyzer=keyword&format=text&pretty=true"
+                               end.returns(mock_response(@mock_analyze_response))
+
+          @index.analyze("foo bar", :analyzer => 'keyword', :format => 'text')
+        end
+
+      end
+
       context "mapping" do
 
         should "create index with mapping" do

data/test/unit/model_search_test.rb

@@ -347,6 +347,28 @@ module Tire
             assert_equal   100, ModelWithNestedMapping.mapping[:author][:properties][:last_name][:boost]
           end
 
+          should "define mapping for nested documents" do
+            class ::ModelWithNestedDocuments
+              extend ActiveModel::Naming
+              extend ActiveModel::Callbacks
+
+              include Tire::Model::Search
+              include Tire::Model::Callbacks
+
+              mapping do
+                indexes :comments, :type => 'nested', :include_in_parent => true do
+                  indexes :author_name
+                  indexes :body, :boost => 100
+                end
+              end
+
+            end
+
+            assert_equal 'nested', ModelWithNestedDocuments.mapping[:comments][:type]
+            assert_not_nil         ModelWithNestedDocuments.mapping[:comments][:properties][:author_name]
+            assert_equal 100,      ModelWithNestedDocuments.mapping[:comments][:properties][:body][:boost]
+          end
+
         end
 
         context "with settings" do

data/test/unit/results_item_test.rb

@@ -118,6 +118,12 @@ module Tire
           assert_equal 'fake_rails_models', ActiveModel::Naming.plural(@document)
         end
 
+        should "instantiate itself for deep hashes, not a Ruby class corresponding to type" do
+          document = Results::Item.new :_type => 'my_model', :title => 'Test', :author => { :name => 'John' }
+
+          assert_equal Tire::Results::Item, document.class
+        end
+
       end
 
     end

data/test/unit/search_test.rb

@@ -181,8 +181,27 @@ module Tire
           end
 
           assert_equal 1, s.filters.size
+
           assert_not_nil s.filters.first
           assert_not_nil s.filters.first[:terms]
+
+          assert_equal( {:terms => {:tags => ['foo']}}.to_json,
+                        s.to_hash[:filter].to_json )
+        end
+
+        should "allow to add multiple filters" do
+          s = Search::Search.new('index') do
+            filter :terms, :tags  => ['foo']
+            filter :term,  :words => 125
+          end
+
+          assert_equal 2, s.filters.size
+
+          assert_not_nil  s.filters.first[:terms]
+          assert_not_nil  s.filters.last[:term]
+
+          assert_equal( { :and => [ {:terms => {:tags => ['foo']}}, {:term => {:words => 125}} ] }.to_json,
+                        s.to_hash[:filter].to_json )
         end
 
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tire
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000 Z
+date: 2011-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70362722303360 !ruby/object:Gem::Requirement
+  requirement: &70265158105660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70362722303360
+  version_requirements: *70265158105660
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70362722302860 !ruby/object:Gem::Requirement
+  requirement: &70265158105100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70362722302860
+  version_requirements: *70265158105100
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70362722302360 !ruby/object:Gem::Requirement
+  requirement: &70265158104600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362722302360
+  version_requirements: *70265158104600
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70362722301880 !ruby/object:Gem::Requirement
+  requirement: &70265158103940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362722301880
+  version_requirements: *70265158103940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70362722301400 !ruby/object:Gem::Requirement
+  requirement: &70265158102840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70362722301400
+  version_requirements: *70265158102840
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70362722300940 !ruby/object:Gem::Requirement
+  requirement: &70265158097660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *70362722300940
+  version_requirements: *70265158097660
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70362722300540 !ruby/object:Gem::Requirement
+  requirement: &70265158097280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362722300540
+  version_requirements: *70265158097280
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70362722300080 !ruby/object:Gem::Requirement
+  requirement: &70265158096780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362722300080
+  version_requirements: *70265158096780
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70362722299560 !ruby/object:Gem::Requirement
+  requirement: &70265158096280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70362722299560
+  version_requirements: *70265158096280
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70362722288980 !ruby/object:Gem::Requirement
+  requirement: &70265158095780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 2.2.1
   type: :development
   prerelease: false
-  version_requirements: *70362722288980
+  version_requirements: *70265158095780
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70362722288600 !ruby/object:Gem::Requirement
+  requirement: &70265158095380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362722288600
+  version_requirements: *70265158095380
 - !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &70362722288140 !ruby/object:Gem::Requirement
+  requirement: &70265158094900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362722288140
+  version_requirements: *70265158094900
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &70362722287700 !ruby/object:Gem::Requirement
+  requirement: &70265158094460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362722287700
+  version_requirements: *70265158094460
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70362722287280 !ruby/object:Gem::Requirement
+  requirement: &70265158094040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362722287280
+  version_requirements: *70265158094040
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70362722286860 !ruby/object:Gem::Requirement
+  requirement: &70265158093620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362722286860
+  version_requirements: *70265158093620
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70362722286440 !ruby/object:Gem::Requirement
+  requirement: &70265158093160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362722286440
+  version_requirements: *70265158093160
 description: ! "   Tire is a Ruby client for the ElasticSearch search engine/database.\n\n
   \  It provides Ruby-like API for fluent communication with the ElasticSearch server\n
   \  and blends with ActiveModel class for convenient usage in Rails applications.\n\n
@@ -297,8 +297,10 @@ homepage: http://github.com/karmi/tire
 licenses: []
 post_install_message: ! "================================================================================\n\n
   \ Please check the documentation at <http://karmi.github.com/tire/>.\n\n--------------------------------------------------------------------------------\n\n
-  \ IMPORTANT CHANGES LATELY:\n\n  # Added a \"query\" facet for free-form aggregations\n\n\n
-  \ See the full changelog at <http://github.com/karmi/tire/commits/v0.3.5>.\n\n--------------------------------------------------------------------------------\n"
+  \ IMPORTANT CHANGES LATELY:\n\n  * Fixed a bug: `Results::Item` was referencing
+  Ruby classes incorrectly within Rails\n  * Added support for the Analyze API (#124)\n
+  \ * Added support for adding multiple filters (#122)\n\n\n  See the full changelog
+  at <http://github.com/karmi/tire/commits/v0.3.6>.\n\n--------------------------------------------------------------------------------\n"
 rdoc_options:
 - --charset=UTF-8
 require_paths: