tire 0.4.2 → 0.4.3

data/.travis.yml

@@ -2,12 +2,28 @@
 # Configuration file for http://travis-ci.org/#!/karmi/tire
 # ---------------------------------------------------------
 
-script: "bundle exec rake test:unit"
+language: ruby
 
 rvm:
-  - 1.8.7
   - 1.9.3
+  - 1.8.7
   - ree
 
+env:
+  - TEST_COMMAND="rake test:unit"
+  - TEST_COMMAND="rake test:integration"
+
+script: "bundle exec $TEST_COMMAND"
+
+before_install:
+  - sudo service elasticsearch start
+
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      env: TEST_COMMAND="rake test:integration"
+    - rvm: ree
+      env: TEST_COMMAND="rake test:integration"
+
 notifications:
   disable: true

data/README.markdown

@@ -675,7 +675,7 @@ OK. All this time we have been talking about `ActiveRecord` models, since
 it is a reasonable _Rails_' default for the storage layer.
 
 But what if you use another database such as [MongoDB](http://www.mongodb.org/),
-another object mapping library, such as [Mongoid](http://mongoid.org/)?
+another object mapping library, such as [Mongoid](http://mongoid.org/) or [MongoMapper](http://mongomapper.com/)?
 
 Well, things stay mostly the same:
 
@@ -691,7 +691,7 @@ Well, things stay mostly the same:
       # These Mongo guys sure do get funky with their IDs in +serializable_hash+, let's fix it.
       #
       def to_indexed_json
-        self.as_json
+        self.to_json
       end
 
     end

data/examples/tire-dsl.rb

@@ -12,7 +12,7 @@
 # from <https://github.com/karmi/tire>.
 #
 # By following these instructions you should have the search running
-# on a sane operation system in less then 10 minutes.
+# on a sane operating system in less then 10 minutes.
 
 # Note, that this file can be executed directly:
 #

data/lib/tire.rb

@@ -25,6 +25,7 @@ require 'tire/search/facet'
 require 'tire/search/filter'
 require 'tire/search/highlight'
 require 'tire/search/scan'
+require 'tire/search/script_field'
 require 'tire/results/pagination'
 require 'tire/results/collection'
 require 'tire/results/item'

data/lib/tire/http/clients/faraday.rb

@@ -0,0 +1,71 @@
+require 'faraday'
+
+# A Faraday-based HTTP client, which allows you to choose a HTTP client.
+#
+# See <https://github.com/technoweenie/faraday/tree/master/lib/faraday/adapter>
+#
+# NOTE: Tire will switch to Faraday for the HTTP abstraction layer. This client is a temporary solution.
+#
+# Example:
+# --------
+#
+#     require 'typhoeus'
+#     require 'tire/http/clients/faraday'
+#
+#     Tire.configure do |config|
+#     
+#       # Unless specified, tire will use Faraday.default_adapter and no middleware
+#       Tire::HTTP::Client::Faraday.faraday_middleware = Proc.new do |builder|
+#         builder.adapter :typhoeus
+#       end
+#     
+#       config.client(Tire::HTTP::Client::Faraday)
+#     
+#     end
+#
+#
+module Tire
+  module HTTP
+    module Client
+      class Faraday
+
+        # Default middleware stack.
+        DEFAULT_MIDDLEWARE = Proc.new do |builder|
+          builder.adapter ::Faraday.default_adapter
+        end
+
+        class << self
+          # A customized stack of Faraday middleware that will be used to make each request.
+          attr_accessor :faraday_middleware
+
+          def get(url, data = nil)
+            request(:get, url, data)
+          end
+
+          def post(url, data)
+            request(:post, url, data)
+          end
+
+          def put(url, data)
+            request(:put, url, data)
+          end
+
+          def delete(url, data = nil)
+            request(:delete, url, data)
+          end
+
+          def head(url)
+            request(:head, url)
+          end
+
+          private
+          def request(method, url, data = nil)
+            conn = ::Faraday.new( &(faraday_middleware || DEFAULT_MIDDLEWARE) )
+            response = conn.run_request(method, url, data, nil)
+            Response.new(response.body, response.status, response.headers)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tire/index.rb

@@ -103,9 +103,9 @@ module Tire
       count = 0
 
       begin
-        response = Configuration.client.post("#{url}/_bulk", payload.join("\n"))
-        raise RuntimeError, "#{response.code} > #{response.body}" if response.failure?
-        response
+        @response = Configuration.client.post("#{url}/_bulk", payload.join("\n"))
+        raise RuntimeError, "#{@response.code} > #{@response.body}" if @response && @response.failure?
+        @response
       rescue StandardError => error
         if count < tries
           count += 1
@@ -149,10 +149,17 @@ module Tire
       new_index = Index.new(name)
       new_index.create(options) unless new_index.exists?
 
+      transform = options.delete(:transform)
+
       Search::Scan.new(self.name, &block).each do |results|
-        new_index.bulk_store results.map do |document|
-          document.to_hash.except(:type, :_index, :_explanation, :_score, :_version, :highlight, :sort)
+
+        documents = results.map do |document|
+          document  = document.to_hash.except(:type, :_index, :_explanation, :_score, :_version, :highlight, :sort)
+          document  = transform.call(document) if transform
+          document
         end
+
+        new_index.bulk_store documents
       end
     end
 
@@ -198,6 +205,22 @@ module Tire
       logged(id, curl)
     end
 
+    def update(type, id, payload={}, options={})
+      raise ArgumentError, "Please pass a document type" unless type
+      raise ArgumentError, "Please pass a document ID"   unless id
+      raise ArgumentError, "Please pass a script in the payload hash" unless payload[:script]
+
+      type      = Utils.escape(type)
+      url       = "#{self.url}/#{type}/#{id}/_update"
+      url      += "?#{options.to_param}" unless options.keys.empty?
+      @response = Configuration.client.post url, MultiJson.encode(payload)
+      MultiJson.decode(@response.body)
+
+    ensure
+      curl = %Q|curl -X POST "#{url}" -d '#{MultiJson.encode(payload)}'|
+      logged(id, curl)
+    end
+
     def refresh
       @response = Configuration.client.post "#{url}/_refresh", ''
 
@@ -243,7 +266,7 @@ module Tire
       MultiJson.decode(@response.body)['ok']
 
     ensure
-      curl = %Q|curl -X PUT "#{Configuration.url}/_percolator/#{@name}/?pretty=1" -d '#{MultiJson.encode(options)}'|
+      curl = %Q|curl -X PUT "#{Configuration.url}/_percolator/#{@name}/#{name}?pretty=1" -d '#{MultiJson.encode(options)}'|
       logged('_percolator', curl)
     end
 
@@ -281,7 +304,7 @@ module Tire
 
         Configuration.logger.log_request endpoint, @name, curl
 
-        code = @response ? @response.code : error.class rescue 200
+        code = @response ? @response.code : error.class rescue 'N/A'
 
         if Configuration.logger.level.to_s == 'debug'
           body = if @response

data/lib/tire/logger.rb

@@ -9,7 +9,7 @@ module Tire
       end
       @device.sync = true if @device.respond_to?(:sync)
       @options = options
-      at_exit { @device.close unless @device.closed? } if @device.respond_to?(:closed?) && @device.respond_to?(:close)
+      # at_exit { @device.close unless @device.closed? } if @device.respond_to?(:closed?) && @device.respond_to?(:close)
     end
 
     def level

data/lib/tire/model/persistence.rb

@@ -51,9 +51,8 @@ module Tire
           end
 
           def self.search(*args, &block)
-            # Update options Hash with the wrapper definition
-            args.last.update(:wrapper => self) if args.last.is_a? Hash
-            args << { :wrapper => self }       unless args.any? { |a| a.is_a? Hash }
+            args.last.update(:wrapper => self, :version => true) if args.last.is_a? Hash
+            args << { :wrapper => self, :version => true } unless args.any? { |a| a.is_a? Hash }
 
             self.__search_without_persistence(*args, &block)
           end

data/lib/tire/model/persistence/finders.rb

@@ -41,7 +41,7 @@ module Tire
             old_wrapper = Tire::Configuration.wrapper
             Tire::Configuration.wrapper self
             s = Tire::Search::Search.new(index.name).query { all }
-            s.results
+            s.version(true).results
           ensure
             Tire::Configuration.wrapper old_wrapper
           end
@@ -51,7 +51,7 @@ module Tire
             old_wrapper = Tire::Configuration.wrapper
             Tire::Configuration.wrapper self
             s = Tire::Search::Search.new(index.name).query { all }.size(1)
-            s.results.first
+            s.version(true).results.first
           ensure
             Tire::Configuration.wrapper old_wrapper
           end

data/lib/tire/model/persistence/storage.rb

@@ -55,11 +55,9 @@ module Tire
             self.freeze
           end
 
-          # TODO: Implement `new_record?` and clean up
-
-          def destroyed?; !!@destroyed; end
-
-          def persisted?; !!id;           end
+          def destroyed?   ;  !!@destroyed;       end
+          def persisted?   ;  !!id && !!_version; end
+          def new_record?  ;  !persisted?;        end
 
         end
 

data/lib/tire/model/search.rb

@@ -85,6 +85,8 @@ module Tire
             end
           end unless sort.empty?
 
+          if version = options.delete(:version); s.version(version); end
+
           if block_given?
             block.arity < 1 ? s.instance_eval(&block) : block.call(s)
           else

data/lib/tire/results/collection.rb

@@ -25,17 +25,17 @@ module Tire
               hits
             else
               hits.map do |h|
-                 document = {}
+                document = {}
 
-                 # Update the document with content and ID
-                 document = h['_source'] ? document.update( h['_source'] || {} ) : document.update( __parse_fields__(h['fields']) )
-                 document.update( {'id' => h['_id']} )
+                # Update the document with content and ID
+                document = h['_source'] ? document.update( h['_source'] || {} ) : document.update( __parse_fields__(h['fields']) )
+                document.update( {'id' => h['_id']} )
 
-                 # Update the document with meta information
-                 ['_score', '_type', '_index', '_version', 'sort', 'highlight', '_explanation'].each { |key| document.update( {key => h[key]} || {} ) }
+                # Update the document with meta information
+                ['_score', '_type', '_index', '_version', 'sort', 'highlight', '_explanation'].each { |key| document.update( {key => h[key]} || {} ) }
 
-                 # Return an instance of the "wrapper" class
-                 @wrapper.new(document)
+                # Return an instance of the "wrapper" class
+                @wrapper.new(document)
               end
             end
 

data/lib/tire/results/item.rb

@@ -56,7 +56,10 @@ module Tire
       end
 
       def to_hash
-        @attributes
+        @attributes.reduce({}) do |sum, item|
+          sum[ item.first ] = item.last.respond_to?(:to_hash) ? item.last.to_hash : item.last
+          sum
+        end
       end
 
       # Let's pretend we're someone else in Rails

data/lib/tire/search.rb

@@ -4,10 +4,15 @@ module Tire
 
     class Search
 
-      attr_reader :indices, :json, :query, :facets, :filters, :options, :explain
+      attr_reader :indices, :query, :facets, :filters, :options, :explain, :script_fields
 
       def initialize(indices=nil, options={}, &block)
-        @indices = Array(indices)
+        if indices.is_a?(Hash)
+          set_indices_options(indices)
+          @indices = indices.keys
+        else
+          @indices = Array(indices)
+        end
         @types   = Array(options.delete(:type)).map { |type| Utils.escape(type) }
         @options = options
 
@@ -16,6 +21,16 @@ module Tire
         block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
       end
 
+
+      def set_indices_options(indices)
+        indices.each do |index, index_options|
+          if index_options[:boost]
+            @indices_boost ||= {}
+            @indices_boost[index] = index_options[:boost]
+          end
+        end
+      end
+
       def results
         @results  || (perform; @results)
       end
@@ -24,6 +39,10 @@ module Tire
         @response || (perform; @response)
       end
 
+      def json
+        @json     || (perform; @json)
+      end
+
       def url
         Configuration.url + @path
       end
@@ -55,6 +74,12 @@ module Tire
         self
       end
 
+      def script_field(name, options={})
+        @script_fields ||= {}
+        @script_fields.merge! ScriptField.new(name, options).to_hash
+        self
+      end
+
       def highlight(*args)
         unless args.empty?
           @highlight = Highlight.new(*args)
@@ -88,6 +113,7 @@ module Tire
 
       def version(value)
         @version = value
+        self
       end
 
       def perform
@@ -110,6 +136,7 @@ module Tire
       def to_hash
         @options.delete(:payload) || begin
           request = {}
+          request.update( { :indices_boost => @indices_boost } ) if @indices_boost
           request.update( { :query  => @query.to_hash } )    if @query
           request.update( { :sort   => @sort.to_ary   } )    if @sort
           request.update( { :facets => @facets.to_hash } )   if @facets
@@ -119,6 +146,7 @@ module Tire
           request.update( { :size => @size } )               if @size
           request.update( { :from => @from } )               if @from
           request.update( { :fields => @fields } )           if @fields
+          request.update( { :script_fields => @script_fields } ) if @script_fields
           request.update( { :version => @version } )         if @version
           request.update( { :explain => @explain } )         if @explain
           request

data/lib/tire/search/facet.rb

@@ -17,7 +17,11 @@ module Tire
       def terms(field, options={})
         size      = options.delete(:size) || 10
         all_terms = options.delete(:all_terms) || false
-        @value = { :terms => { :field => field, :size => size, :all_terms => all_terms }.update(options) }
+        @value = if field.is_a?(Enumerable) and not field.is_a?(String)
+          { :terms => { :fields => field }.update({ :size => size, :all_terms => all_terms }).update(options) }
+        else
+          { :terms => { :field => field  }.update({ :size => size, :all_terms => all_terms }).update(options) }
+        end
         self
       end
 

data/lib/tire/search/query.rb

@@ -34,6 +34,14 @@ module Tire
         @value
       end
 
+      def prefix(field, value, options={})
+        if options[:boost]
+          @value = { :prefix => { field => { :prefix => value, :boost => options[:boost] } } }
+        else
+          @value = { :prefix => { field => value } }
+        end
+      end
+
       def custom_score(options={}, &block)
         @custom_score ||= Query.new(&block)
         @value[:custom_score] = options
@@ -60,6 +68,13 @@ module Tire
         @value
       end
 
+      def dis_max(options={}, &block)
+        @dis_max ||= DisMaxQuery.new(options)
+        block.arity < 1 ? @dis_max.instance_eval(&block) : block.call(@dis_max) if block_given?
+        @value[:dis_max] = @dis_max.to_hash
+        @value
+      end
+
       def all
         @value = { :match_all => {} }
         @value
@@ -119,7 +134,6 @@ module Tire
       end
     end
 
-
     class FilteredQuery
       def initialize(&block)
         @value = {}
@@ -147,5 +161,26 @@ module Tire
       end
     end
 
+    class DisMaxQuery
+      def initialize(options={}, &block)
+        @options = options
+        @value   = {}
+        block.arity < 1 ? self.instance_eval(&block) : block.call(self) if block_given?
+      end
+
+      def query(&block)
+        (@value[:queries] ||= []) << Query.new(&block).to_hash
+        @value
+      end
+
+      def to_hash
+        @value.update(@options)
+      end
+
+      def to_json
+        to_hash.to_json
+      end
+    end
+
   end
 end