ssickles-tire 0.4.2 → 0.4.2.7

data/lib/tire.rb

@@ -1,17 +1,12 @@
 require 'rest_client'
 require 'multi_json'
-#require 'active_model'
 require 'hashr'
 require 'cgi'
+require 'escape_utils'
 
-require 'active_support'
+require 'active_support/core_ext'
 
-# Ruby 1.8 compatibility
-require 'tire/rubyext/ruby_1_8' if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
-
-require 'tire/rubyext/hash'
-require 'tire/rubyext/symbol'
-require 'tire/utils'
+require 'tire/rubyext/to_json'
 require 'tire/logger'
 require 'tire/configuration'
 require 'tire/http/response'
@@ -29,16 +24,6 @@ require 'tire/results/item'
 require 'tire/index'
 require 'tire/alias'
 require 'tire/dsl'
-require 'tire/model/naming'
-require 'tire/model/callbacks'
-require 'tire/model/percolate'
-require 'tire/model/indexing'
-require 'tire/model/import'
-require 'tire/model/search'
-require 'tire/model/persistence/finders'
-require 'tire/model/persistence/attributes'
-require 'tire/model/persistence/storage'
-require 'tire/model/persistence'
 require 'tire/tasks'
 
 module Tire

data/lib/tire/alias.rb

@@ -74,6 +74,7 @@ module Tire
     def initialize(attributes={}, &block)
       raise ArgumentError, "Please pass a Hash-like object" unless attributes.respond_to?(:each_pair)
 
+      @url = attributes.delete(:url) || Configuration.url
       @attributes = { :indices => IndexCollection.new([]) }
 
       attributes.each_pair do |key, value|
@@ -87,34 +88,57 @@ module Tire
       block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
     end
 
+    attr_accessor :url
+
     # Returns a collection of Tire::Alias objects for all aliases defined in the cluster, or for a specific index.
     #
-    def self.all(index=nil)
-      @response = Configuration.client.get [Configuration.url, index, '_aliases'].compact.join('/')
+    def self.all(url=nil, index=nil)
+      if url and url !~ /^https?:\/\//i
+        index, url = url, Configuration.url
+      elsif url.nil?
+        url = Configuration.url
+      end
 
-      aliases = MultiJson.decode(@response.body).inject({}) do |result, (index, value)|
+      @response = Configuration.client.get [url, index, '_aliases'].compact.join('/')
+
+      aliases = MultiJson.decode(@response.body).inject({}) do |result, (name, value)|
         # 1] Skip indices without aliases
         next result if value['aliases'].empty?
 
         # 2] Build a reverse map of hashes (alias => indices, config)
-        value['aliases'].each do |key, value| (result[key] ||= { 'indices' => [] }).update(value)['indices'].push(index) end
+        value['aliases'].each do |key, v| (result[key] ||= { 'indices' => [] }).update(v)['indices'].push(name) end
         result
       end
 
       # 3] Build a collection of Alias objects from hashes
       aliases.map do |key, value|
-        self.new(value.update('name' => key))
+        self.new(value.update('name' => key, :url => url))
       end
 
     ensure
       # FIXME: Extract the `logged` method
-      Alias.new.logged '_aliases', %Q|curl "#{Configuration.url}/_aliases"|
+      Alias.new.logged '_aliases', %Q|curl "#{url}/_aliases"|
     end
 
     # Returns an alias by name
     #
-    def self.find(name, &block)
-      a = all.select { |a| a.name == name }.first
+    # Examples
+    #
+    #   Alias.find( url, name )
+    #   Alias.find( name )
+    #
+    def self.find(*args, &block)
+      case args.length
+      when 2
+        url, name = args
+      when 1
+        url = Configuration.url
+        name = args.first
+      else
+        raise ArgumentError, "wrong number of arguments (#{args.length} for 2)"
+      end
+
+      a = all(url).select { |b| b.name == name }.first
       block.call(a) if block_given?
       return a
     end
@@ -159,10 +183,10 @@ module Tire
     # Save the alias in _ElasticSearch_
     #
     def save
-      @response = Configuration.client.post "#{Configuration.url}/_aliases", to_json
+      @response = Configuration.client.post "#{url}/_aliases", to_json
 
     ensure
-      logged '_aliases', %Q|curl -X POST "#{Configuration.url}/_aliases" -d '#{to_json}'|
+      logged '_aliases', %Q|curl -X POST "#{url}/_aliases" -d '#{to_json}'|
     end
 
     # Return a Hash suitable for JSON serialization
@@ -187,7 +211,7 @@ module Tire
     # Return alias serialized in JSON for _ElasticSearch_
     #
     def to_json(options=nil)
-      as_json.to_json
+      MultiJson.encode(as_json)
     end
 
     def inspect

data/lib/tire/index.rb

@@ -1,15 +1,27 @@
 module Tire
   class Index
 
-    attr_reader :name, :response
+    attr_reader :name, :response, :url
+
+    def initialize(*args, &block)
+      case args.length
+      when 2
+        @name = args.last
+        self.url = args.first
+      when 1
+        @name = args.first
+        self.url = Configuration.url
+      else
+        raise ArgumentError, "wrong number of arguments (#{args.length} for 2)"
+      end
 
-    def initialize(name, &block)
-      @name = name
       block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
     end
 
-    def url
-      "#{Configuration.url}/#{@name}"
+    def url=( url )
+      @base_url = url.dup
+      @url = "#@base_url/#@name"
+      @percolator_url = "#@base_url/_percolator/#@name"
     end
 
     def exists?
@@ -41,15 +53,15 @@ module Tire
     end
 
     def add_alias(alias_name, configuration={})
-      Alias.create(configuration.merge( :name => alias_name, :index => @name ) )
+      Alias.create(configuration.merge( :name => alias_name, :index => @name, :url => @base_url ) )
     end
 
     def remove_alias(alias_name)
-      Alias.find(alias_name) { |a| a.indices.delete @name }.save
+      Alias.find(@base_url, alias_name) { |a| a.indices.delete @name }.save
     end
 
     def aliases(alias_name=nil)
-      alias_name ? Alias.all(@name).select { |a| a.name == alias_name }.first : Alias.all(@name)
+      alias_name ? Alias.all(@base_url, @name).select { |a| a.name == alias_name }.first : Alias.all(@base_url, @name)
     end
 
     def mapping
@@ -63,23 +75,24 @@ module Tire
     end
 
     def store(*args)
-      document, options = args
-      type = get_type_from_document(document)
+      document, params = args
+      id      = get_id_from_document(document)
+      type    = get_type_from_document(document)
+      routing = get_routing_from_document(document)
+      parent  = get_parent_from_document(document)
 
-      if options
-        percolate = options[:percolate]
-        percolate = "*" if percolate === true
-      end
+      params ||= {}
+      params[:routing] = routing if routing
+      params[:parent]  = parent  if parent
+      params[:percolate] = '*' if params[:percolate] === true
 
-      id       = get_id_from_document(document)
-      document = convert_document_to_json(document)
+      url = id ? "#{self.url}/#{type}/#{id}" : "#{self.url}/#{type}"
+      url << "?#{params.to_param}" unless params.empty?
 
-      url  = id ? "#{self.url}/#{type}/#{id}" : "#{self.url}/#{type}/"
-      url += "?percolate=#{percolate}" if percolate
+      document = convert_document_to_json(document)
 
       @response = Configuration.client.post url, document
       MultiJson.decode(@response.body)
-
     ensure
       curl = %Q|curl -X POST "#{url}" -d '#{document}'|
       logged([type, id].join('/'), curl)
@@ -159,7 +172,7 @@ module Tire
     def remove(*args)
       if args.size > 1
         type, document = args
-        type           = Utils.escape(type)
+        type           = EscapeUtils.escape_url(type.to_s)
         id             = get_id_from_document(document) || document
       else
         document = args.pop
@@ -168,20 +181,25 @@ module Tire
       end
       raise ArgumentError, "Please pass a document ID" unless id
 
-      url    = "#{self.url}/#{type}/#{id}"
+      routing = get_routing_from_document(document)
+
+      url = "#{self.url}/#{type}/#{id}"
+      url << "?routing=#{EscapeUtils.escape_url(routing)}" if routing
+
       result = Configuration.client.delete url
       MultiJson.decode(result.body) if result.success?
-
     ensure
       curl = %Q|curl -X DELETE "#{url}"|
       logged(id, curl)
     end
 
-    def retrieve(type, id)
+    def retrieve(type, id, params = {})
       raise ArgumentError, "Please pass a document ID" unless id
 
-      type      = Utils.escape(type)
-      url       = "#{self.url}/#{type}/#{id}"
+      type = EscapeUtils.escape_url(type.to_s)
+      url  = "#{self.url}/#{type}/#{id}"
+      url << "?#{params.to_param}" unless params.empty?
+
       @response = Configuration.client.get url
 
       h = MultiJson.decode(@response.body)
@@ -239,20 +257,22 @@ module Tire
     def register_percolator_query(name, options={}, &block)
       options[:query] = Search::Query.new(&block).to_hash if block_given?
 
-      @response = Configuration.client.put "#{Configuration.url}/_percolator/#{@name}/#{name}", MultiJson.encode(options)
+      url = "#@percolator_url/#{name}"
+      @response = Configuration.client.put url, MultiJson.encode(options)
       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 "#{url}?pretty=true" -d '#{MultiJson.encode(options)}'|
       logged('_percolator', curl)
     end
 
     def unregister_percolator_query(name)
-      @response = Configuration.client.delete "#{Configuration.url}/_percolator/#{@name}/#{name}"
+      url = "#@percolator_url/#{name}"
+      @response = Configuration.client.delete url
       MultiJson.decode(@response.body)['ok']
 
     ensure
-      curl = %Q|curl -X DELETE "#{Configuration.url}/_percolator/#{@name}"|
+      curl = %Q|curl -X DELETE "#{url}"|
       logged('_percolator', curl)
     end
 
@@ -302,10 +322,10 @@ module Tire
 
       old_verbose, $VERBOSE = $VERBOSE, nil # Silence Object#type deprecation warnings
       type = case
+        when document.is_a?(Hash)
+          document.delete(:_type) || document.delete('_type') || document[:type] || document['type']
         when document.respond_to?(:document_type)
           document.document_type
-        when document.is_a?(Hash)
-          document[:_type] || document['_type'] || document[:type] || document['type']
         when document.respond_to?(:_type)
           document._type
         when document.respond_to?(:type) && document.type != document.class
@@ -313,15 +333,15 @@ module Tire
         end
       $VERBOSE = old_verbose
 
-      type ||= 'document'
-      options[:escape] ? Utils.escape(type) : type
+      type = type ? type.to_s : 'document'
+      options[:escape] ? EscapeUtils.escape_url(type) : type
     end
 
     def get_id_from_document(document)
       old_verbose, $VERBOSE = $VERBOSE, nil # Silence Object#id deprecation warnings
       id = case
         when document.is_a?(Hash)
-          document[:_id] || document['_id'] || document[:id] || document['id']
+          document.delete(:_id) || document.delete('_id') || document[:id] || document['id']
         when document.respond_to?(:id) && document.id != document.object_id
           document.id
       end
@@ -329,6 +349,28 @@ module Tire
       id
     end
 
+    def get_routing_from_document(document)
+      case
+      when document.is_a?(Hash)
+        document.delete(:_routing) || document.delete('_routing')
+      when document.respond_to?(:routing)
+        document.routing
+      when document.respond_to?(:_routing)
+        document._routing
+      end
+    end
+
+    def get_parent_from_document(document)
+      case
+      when document.is_a?(Hash)
+        document.delete(:_parent) || document.delete('_parent')
+      when document.respond_to?(:parent)
+        document.parent
+      when document.respond_to?(:_parent)
+        document._parent
+      end
+    end
+
     def convert_document_to_json(document)
       document = case
         when document.is_a?(String)

data/lib/tire/results/collection.rb

@@ -18,49 +18,24 @@ module Tire
 
       def results
         @results ||= begin
-          hits = @response['hits']['hits'].map { |d| d.update '_type' => Utils.unescape(d['_type']) }
+          hits = @response['hits']['hits'].map { |d| d.update '_type' => EscapeUtils.unescape_url(d['_type']) }
 
-          unless @options[:load]
-            if @wrapper == Hash
-              hits
-            else
-              hits.map do |h|
-                 document = {}
+          if @wrapper == Hash
+            hits
+          else
+            hits.map do |h|
+               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)
-              end
+               # Return an instance of the "wrapper" class
+               @wrapper.new(document)
             end
-
-          else
-            return [] if hits.empty?
-
-            records = {}
-            @response['hits']['hits'].group_by { |item| item['_type'] }.each do |type, items|
-              raise NoMethodError, "You have tried to eager load the model instances, " +
-                                   "but Tire cannot find the model class because " +
-                                   "document has no _type property." unless type
-
-              begin
-                klass = type.camelize.constantize
-              rescue NameError => e
-                raise NameError, "You have tried to eager load the model instances, but " +
-                                 "Tire cannot find the model class '#{type.camelize}' " +
-                                 "based on _type '#{type}'.", e.backtrace
-              end
-              ids = items.map { |h| h['_id'] }
-              records[type] = @options[:load] === true ? klass.find(ids) : klass.find(ids, @options[:load])
-            end
-
-            # Reorder records to preserve order from search results
-            @response['hits']['hits'].map { |item| records[item['_type']].detect { |record| record.id.to_s == item['_id'].to_s } }
           end
         end
       end

data/lib/tire/results/item.rb

@@ -2,9 +2,6 @@ module Tire
   module Results
 
     class Item
-      #extend  ActiveModel::Naming
-      #include ActiveModel::Conversion
-
       # Create new instance, recursively converting all Hashes to Item
       # and leaving everything else alone.
       #
@@ -43,14 +40,6 @@ module Tire
         !!id
       end
 
-      def errors
-        ActiveModel::Errors.new(self)
-      end
-
-      def valid?
-        true
-      end
-
       def to_key
         persisted? ? [id] : nil
       end
@@ -59,14 +48,6 @@ module Tire
         @attributes
       end
 
-      # Let's pretend we're someone else in Rails
-      #
-      def class
-        defined?(::Rails) && @attributes[:_type] ? @attributes[:_type].camelize.constantize : super
-      rescue NameError
-        super
-      end
-
       def inspect
         s = []; @attributes.each { |k,v| s << "#{k}: #{v.inspect}" }
         %Q|<Item#{self.class.to_s == 'Tire::Results::Item' ? '' : " (#{self.class})"} #{s.join(', ')}>|

data/lib/tire/rubyext/to_json.rb

@@ -0,0 +1,21 @@
+require 'time'
+
+class Array
+  def to_json(options=nil)
+    MultiJson.encode(self)
+  end unless method_defined? :to_json
+end
+
+class Hash
+  def to_json(options=nil)
+    MultiJson.encode(self)
+  end unless method_defined? :to_json
+
+  alias_method :to_indexed_json, :to_json
+end
+
+class Time
+  def to_json(options=nil)
+    %Q/"#{self.iso8601}"/
+  end
+end