elastic_searchable 0.1.0 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/elastic_searchable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{elastic_searchable}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]

data/lib/elastic_searchable/index.rb

@@ -4,6 +4,8 @@ module ElasticSearchable
       def create_index
         self.delete_index
         ElasticSearchable.searcher.create_index(index_name, @index_options)
+        ElasticSearchable.searcher.update_mapping(@mapping, self.elastic_search_options) if @mapping
+
         self.find_each do |record|
           record.local_index_in_elastic_search
         end

data/lib/elastic_searchable/queries.rb

@@ -2,15 +2,6 @@ require 'will_paginate/collection'
 
 module ElasticSearchable
   module Queries
-    # search_hits returns a raw ElasticSearch::Api::Hits object for the search results
-    # see #search for the valid options
-    def search_hits(query, options = {})
-      if query.kind_of?(Hash)
-        query = {:query => query}
-      end
-      ElasticSearchable.searcher.search query, elastic_search_options(options)
-    end
-
     # search returns a will_paginate collection of ActiveRecord objects for the search results
     #
     # see ElasticSearch::Api::Index#search for the full list of valid options
@@ -18,7 +9,12 @@ module ElasticSearchable
     # note that the collection may include nils if ElasticSearch returns a result hit for a
     # record that has been deleted on the database
     def search(query, options = {})
-      hits = search_hits(query, options)
+      options[:fields] ||= '_id'
+      if query.kind_of?(Hash)
+        query = {:query => query}
+      end
+      hits = ElasticSearchable.searcher.search query, elastic_search_options(options)
+
       results = WillPaginate::Collection.new(hits.current_page, hits.per_page, hits.total_entries)
       results.replace self.find(hits.collect(&:_id))
       results

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elastic_searchable
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ryan Sonnek