ssickles-tire 0.4.2.7 → 0.4.3

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

@@ -0,0 +1,71 @@
+module Tire
+  module Model
+
+    module Persistence
+
+      # Provides infrastructure for storing records in _ElasticSearch_.
+      #
+      module Storage
+
+        def self.included(base)
+
+          base.class_eval do
+            extend  ClassMethods
+            include InstanceMethods            
+          end
+
+        end
+
+        module ClassMethods
+
+          def create(args={})
+            document    = new(args)
+            return false unless document.valid?
+            document.save
+            document
+          end
+
+        end
+
+        module InstanceMethods
+
+          def update_attribute(name, value)
+            __update_attributes name => value
+            save
+          end
+
+          def update_attributes(attributes={})
+            __update_attributes attributes
+            save
+          end
+
+          def save
+            return false unless valid?
+            run_callbacks :save do
+              # Document#id is set in the +update_elasticsearch_index+ method,
+              # where we have access to the JSON response
+            end
+            self
+          end
+
+          def destroy
+            run_callbacks :destroy do
+              @destroyed = true
+            end
+            self.freeze
+          end
+
+          # TODO: Implement `new_record?` and clean up
+
+          def destroyed?; !!@destroyed; end
+
+          def persisted?; !!id;           end
+
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/tire/model/search.rb

@@ -0,0 +1,305 @@
+module Tire
+  module Model
+
+    # Main module containing the search infrastructure for ActiveModel classes.
+    #
+    # By including this module, you'll provide the model with facilities to
+    # perform searches against index, define index settings and mappings,
+    # access the index object, etc.
+    #
+    # All the _Tire_ methods are accessible via the "proxy" class and instance
+    # methods of the model, named `tire`, eg. `Article.tire.search 'foo'`.
+    #
+    # When there's no clash with a method in the class (your own, defined by another gem, etc)
+    # _Tire_ will bring these methods to the top-level namespace of the class,
+    # eg. `Article.search 'foo'`.
+    #
+    # You'll find the relevant methods in the ClassMethods and InstanceMethods module.
+    #
+    #
+    module Search
+
+      # Alias for Tire::Model::Naming::ClassMethods.index_prefix
+      #
+      def self.index_prefix(*args)
+        Naming::ClassMethods.index_prefix(*args)
+      end
+
+      module ClassMethods
+
+        # Returns search results for a given query.
+        #
+        # Query can be passed simply as a String:
+        #
+        #     Article.search 'love'
+        #
+        # Any options, such as pagination or sorting, can be passed as a second argument:
+        #
+        #     Article.search 'love', :per_page => 25, :page => 2
+        #     Article.search 'love', :sort => 'title'
+        #
+        # For more powerful query definition, use the query DSL passed as a block:
+        #
+        #     Article.search do
+        #       query { terms :tags, ['ruby', 'python'] }
+        #       facet 'tags' { terms :tags }
+        #     end
+        #
+        # You can pass options as the first argument, in this case:
+        #
+        #     Article.search :per_page => 25, :page => 2 do
+        #       query { string 'love' }
+        #     end
+        #
+        # This methods returns a Tire::Results::Collection instance, containing instances
+        # of Tire::Results::Item, populated by the data available in _ElasticSearch, by default.
+        #
+        # If you'd like to load the "real" models from the database, you may use the `:load` option:
+        #
+        #     Article.search 'love', :load => true
+        #
+        # You can pass options as a Hash to the model's `find` method:
+        #
+        #     Article.search :load => { :include => 'comments' } do ... end
+        #
+        def search(*args, &block)
+          default_options = {:type => document_type, :index => index.name}
+
+          if block_given?
+            options = args.shift || {}
+          else
+            query, options = args
+            options ||= {}
+          end
+
+          sort      = Array( options[:order] || options[:sort] )
+          options   = default_options.update(options)
+
+          s = Tire::Search::Search.new(options.delete(:index), options)
+          s.size( options[:per_page].to_i ) if options[:per_page]
+          s.from( options[:page].to_i <= 1 ? 0 : (options[:per_page].to_i * (options[:page].to_i-1)) ) if options[:page] && options[:per_page]
+          s.sort do
+            sort.each do |t|
+              field_name, direction = t.split(' ')
+              by field_name, direction
+            end
+          end unless sort.empty?
+
+          if block_given?
+            block.arity < 1 ? s.instance_eval(&block) : block.call(s)
+          else
+            s.query { string query }
+            # TODO: Actualy, allow passing all the valid options from
+            # <http://www.elasticsearch.org/guide/reference/api/search/uri-request.html>
+            s.fields Array(options[:fields]) if options[:fields]
+          end
+
+          s.results
+        end
+
+        # Returns a Tire::Index instance for this model.
+        #
+        # Example usage: `Article.index.refresh`.
+        #
+        def index
+          name = index_name.respond_to?(:to_proc) ? klass.instance_eval(&index_name) : index_name
+          @index = Index.new(name)
+        end
+
+      end
+
+      module InstanceMethods
+
+        # Returns a Tire::Index instance for this instance of the model.
+        #
+        # Example usage: `@article.index.refresh`.
+        #
+        def index
+          instance.class.tire.index
+        end
+
+        # Updates the index in _ElasticSearch_.
+        #
+        # On model instance create or update, it will store its serialized representation in the index.
+        #
+        # On model destroy, it will remove the corresponding document from the index.
+        #
+        # It will also execute any `<after|before>_update_elasticsearch_index` callback hooks.
+        #
+        def update_index
+          #instance.send :_run_update_elasticsearch_index_callbacks do
+            if instance.destroyed?
+              index.remove instance
+            else
+              response  = index.store( instance, {:percolate => percolator} )
+              instance.id     ||= response['_id']      if instance.respond_to?(:id=)
+              instance._index   = response['_index']   if instance.respond_to?(:_index=)
+              instance._type    = response['_type']    if instance.respond_to?(:_type=)
+              instance._version = response['_version'] if instance.respond_to?(:_version=)
+              instance.matches  = response['matches']  if instance.respond_to?(:matches=)
+              self
+            end
+          #end
+        end
+        alias :update_elasticsearch_index  :update_index
+        alias :update_elastic_search_index :update_index
+
+        # The default JSON serialization of the model, based on its `#to_hash` representation.
+        #
+        # If you don't define any mapping, the model is serialized as-is.
+        #
+        # If you do define the mapping for _ElasticSearch_, only attributes
+        # declared in the mapping are serialized.
+        #
+        # For properties declared with the `:as` option, the passed String or Proc
+        # is evaluated in the instance context.
+        #
+        def to_indexed_json
+          if instance.class.tire.mapping.empty?
+            # Reject the id and type keys
+            instance.to_hash.reject {|key,_| key.to_s == 'id' || key.to_s == 'type' }.to_json
+          else
+            mapping = instance.class.tire.mapping
+            # Reject keys not declared in mapping
+            hash = instance.to_hash.reject { |key, value| ! mapping.keys.map(&:to_s).include?(key.to_s) }
+
+            # Evalute the `:as` options
+            mapping.each do |key, options|
+              case options[:as]
+                when String
+                  hash[key] = instance.instance_eval(options[:as])
+                when Proc
+                  hash[key] = instance.instance_eval(&options[:as])
+              end
+            end
+
+            hash.to_json
+          end
+        end
+
+        def matches
+          @attributes['matches']
+        end
+
+        def matches=(value)
+          @attributes ||= {}; @attributes['matches'] = value
+        end
+
+      end
+
+      module Loader
+
+        # Load the "real" model from the database via the corresponding model's `find` method.
+        #
+        # Notice that there's an option to eagerly load models with the `:load` option
+        # for the search method.
+        #
+        def load(options=nil)
+          options ? self.class.find(self.id, options) : self.class.find(self.id)
+        end
+
+      end
+
+      # An object containing _Tire's_ model class methods, accessed as `Article.tire`.
+      #
+      class ClassMethodsProxy
+        include Tire::Model::Naming::ClassMethods
+        include Tire::Model::Import::ClassMethods
+        include Tire::Model::Indexing::ClassMethods
+        include Tire::Model::Percolate::ClassMethods
+        include ClassMethods
+
+        INTERFACE = public_instance_methods.map(&:to_sym) - Object.public_instance_methods.map(&:to_sym)
+
+        attr_reader :klass
+        def initialize(klass)
+          @klass = klass
+        end
+
+      end
+
+      # An object containing _Tire's_ model instance methods, accessed as `@article.tire`.
+      #
+      class InstanceMethodsProxy
+        include Tire::Model::Naming::InstanceMethods
+        include Tire::Model::Percolate::InstanceMethods
+        include InstanceMethods
+
+        INTERFACE = public_instance_methods.map(&:to_sym) - Object.public_instance_methods.map(&:to_sym)
+
+        attr_reader :instance
+        def initialize(instance)
+          @instance = instance
+        end
+      end
+
+      # A hook triggered by the `include Tire::Model::Search` statement in the model.
+      #
+      def self.included(base)
+        base.class_eval do
+
+          # Returns proxy to the _Tire's_ class methods.
+          #
+          def self.tire &block
+            @__tire__ ||= ClassMethodsProxy.new(self)
+
+            @__tire__.instance_eval(&block) if block_given?
+            @__tire__
+          end
+
+          # Returns proxy to the _Tire's_ instance methods.
+          #
+          def tire &block
+            @__tire__ ||= InstanceMethodsProxy.new(self)
+
+            @__tire__.instance_eval(&block) if block_given?
+            @__tire__
+          end
+
+          # Define _Tire's_ callbacks (<after|before>_update_elasticsearch_index).
+          #
+          #define_model_callbacks(:update_elasticsearch_index, :only => [:after, :before]) if \
+          #  respond_to?(:define_model_callbacks)
+
+          # Serialize the model as a Hash.
+          #
+          # Uses `serializable_hash` representation of the model,
+          # unless implemented in the model already.
+          #
+          def to_hash
+            self.serializable_hash
+          end unless instance_methods.map(&:to_sym).include?(:to_hash)
+
+        end
+
+        # Alias _Tire's_ class methods in the top-level namespace of the model,
+        # unless there's a conflict with existing method.
+        #
+        ClassMethodsProxy::INTERFACE.each do |method|
+          base.class_eval <<-"end;", __FILE__, __LINE__ unless base.public_methods.map(&:to_sym).include?(method.to_sym)
+            def self.#{method}(*args, &block)                     # def search(*args, &block)
+              tire.__send__(#{method.inspect}, *args, &block)     #   tire.__send__(:search, *args, &block)
+            end                                                   # end
+          end;
+        end
+
+        # Alias _Tire's_ instance methods in the top-level namespace of the model,
+        # unless there's a conflict with existing method
+        InstanceMethodsProxy::INTERFACE.each do |method|
+          base.class_eval <<-"end;", __FILE__, __LINE__ unless base.instance_methods.map(&:to_sym).include?(method.to_sym)
+            def #{method}(*args, &block)                          # def to_indexed_json(*args, &block)
+              tire.__send__(#{method.inspect}, *args, &block)     #   tire.__send__(:to_indexed_json, *args, &block)
+            end                                                   # end
+          end;
+        end
+
+        # Include the `load` functionality in Results::Item
+        #
+        Results::Item.send :include, Loader
+      end
+
+      
+    end
+
+  end
+end

data/lib/tire/results/collection.rb

@@ -18,24 +18,49 @@ module Tire
 
       def results
         @results ||= begin
-          hits = @response['hits']['hits'].map { |d| d.update '_type' => EscapeUtils.unescape_url(d['_type']) }
+          hits = @response['hits']['hits'].map { |d| d.update '_type' => Utils.unescape(d['_type']) }
 
-          if @wrapper == Hash
-            hits
-          else
-            hits.map do |h|
-               document = {}
+          unless @options[:load]
+            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)
+                 # Return an instance of the "wrapper" class
+                 @wrapper.new(document)
+              end
             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,6 +2,9 @@ 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.
       #
@@ -40,6 +43,14 @@ module Tire
         !!id
       end
 
+      def errors
+        ActiveModel::Errors.new(self)
+      end
+
+      def valid?
+        true
+      end
+
       def to_key
         persisted? ? [id] : nil
       end
@@ -48,6 +59,14 @@ 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(', ')}>|