elastic_searchable 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/elastic_searchable.gemspec

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

data/lib/elastic_searchable/active_record.rb

@@ -12,8 +12,6 @@ module ElasticSearchable
     end
 
     module ClassMethods
-      attr_accessor :index_name
-      attr_accessor :elastic_search_type
       attr_accessor :elastic_options
 
       # Valid options:
@@ -22,13 +20,11 @@ module ElasticSearchable
       # :unless
       def elastic_searchable(options = {})
         options.symbolize_keys!
-
+        options[:index] ||= self.table_name
+        options[:type] ||= self.table_name
+        options[:index_options] ||= {}
+        options[:mapping] ||= false
         self.elastic_options = options
-        @index_name = options[:index_name] || self.name.underscore.gsub(/\//,'-')
-        @elastic_search_type = options[:elastic_search_type] || self.name.underscore.singularize.gsub(/\//,'-')
-
-        @index_options = options[:index_options] || {}
-        @mapping = options[:mapping] || false
 
         extend ElasticSearchable::ActiveRecord::Index
         extend ElasticSearchable::Queries
@@ -47,12 +43,11 @@ module ElasticSearchable
       def indexed_json_document
         self.to_json
       end
-      def index_in_elastic_search(options = {})
-        options[:id]    ||= self.id.to_s
+      def index_in_elastic_search(lifecycle = nil)
         document = self.indexed_json_document
-        ElasticSearchable.searcher.index document, self.class.elastic_search_options(options)
+        ElasticSearchable.searcher.index document, self.class.index_options.merge(:id => self.id.to_s)
 
-        self.run_callbacks("after_index_on_#{options[:lifecycle]}".to_sym) if options[:lifecycle]
+        self.run_callbacks("after_index_on_#{lifecycle}".to_sym) if lifecycle
         self.run_callbacks(:after_index)
       end
     end

data/lib/elastic_searchable/callbacks.rb

@@ -20,10 +20,10 @@ module ElasticSearchable
     end
 
     def update_index_on_create
-      index_in_elastic_search :lifecycle => :create
+      index_in_elastic_search :create
     end
     def update_index_on_update
-      index_in_elastic_search :lifecycle => :update
+      index_in_elastic_search :update
     end
   end
 end

data/lib/elastic_searchable/index.rb

@@ -3,15 +3,16 @@ module ElasticSearchable
     module Index
       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
+        ElasticSearchable.searcher.create_index index_name, self.elastic_options[:index_options]
+        if mapping = self.elastic_options[:mapping]
+          ElasticSearchable.searcher.update_mapping mapping, self.index_options
+        end
 
         self.find_each do |record|
           record.run_callbacks :after_commit_on_update
         end
         self.refresh_index
       end
-
       # explicitly refresh the index, making all operations performed since the last refresh
       # available for search
       #
@@ -35,8 +36,15 @@ module ElasticSearchable
       end
 
       #delete one record from the index
-      def delete_id_from_index(id, options = {})
-        ElasticSearchable.searcher.delete id.to_s, elastic_search_options(options)
+      def delete_id_from_index(id)
+        ElasticSearchable.searcher.delete id.to_s, index_options
+      end
+
+      def index_name
+        self.elastic_options[:index]
+      end
+      def index_options
+        self.elastic_options.slice :index, :type
       end
     end
   end

data/lib/elastic_searchable/queries.rb

@@ -13,7 +13,7 @@ module ElasticSearchable
       if query.kind_of?(Hash)
         query = {:query => query}
       end
-      hits = ElasticSearchable.searcher.search query, elastic_search_options(options)
+      hits = ElasticSearchable.searcher.search query, index_options.merge(options)
 
       results = WillPaginate::Collection.new(hits.current_page, hits.per_page, hits.total_entries)
       results.replace self.find(hits.collect(&:_id))
@@ -25,7 +25,7 @@ module ElasticSearchable
       if query.kind_of?(Hash)
         query = {:query => query}
       end
-      ElasticSearchable.searcher.count query, elastic_search_options(options)
+      ElasticSearchable.searcher.count query, index_options.merge(options)
     end
 
     def facets(fields_list, options = {})
@@ -43,7 +43,7 @@ module ElasticSearchable
         options[:facets][field] = {:terms => {:field => field, :size => size}}
       end
 
-      hits = ElasticSearchable.searcher.search options, elastic_search_options
+      hits = ElasticSearchable.searcher.search options, index_options.merge(options)
       out = {}
       
       fields_list.each do |field|
@@ -55,9 +55,5 @@ module ElasticSearchable
 
       out
     end
-
-    def elastic_search_options(options = {})
-      options.merge(:index => self.index_name, :type => self.elastic_search_type)
-    end
   end
 end

data/test/test_elastic_searchable.rb

@@ -1,5 +1,24 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
+module ElasticSearch
+  class Client
+    def index_mapping(*args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      indices = args.empty? ? [(default_index || :all)] : args.flatten
+      indices.collect! { |i| [:all].include?(i) ? "_#{i}" : i }
+      execute(:index_mapping, indices, options)
+    end
+  end
+  module Transport
+    class HTTP
+      def index_mapping(index_list, options={})
+        standard_request(:get, {:index => index_list, :op => "_mapping"})
+      end
+    end
+  end
+end
+
+
 class TestElasticSearchable < Test::Unit::TestCase
   ActiveRecord::Schema.define(:version => 1) do
     create_table :posts, :force => true do |t|
@@ -11,6 +30,9 @@ class TestElasticSearchable < Test::Unit::TestCase
       t.column :title, :string
       t.column :body, :string
     end
+    create_table :users, :force => true do |t|
+      t.column :name, :string
+    end
   end
 
   class Post < ActiveRecord::Base
@@ -24,8 +46,11 @@ class TestElasticSearchable < Test::Unit::TestCase
     should 'respond to :search' do
       assert @clazz.respond_to?(:search)
     end
+    should 'define elastic_options' do
+      assert @clazz.elastic_options
+    end
     should 'define index_name' do
-      assert_equal 'test_elastic_searchable-post', @clazz.index_name
+      assert_equal 'posts', @clazz.index_name
     end
   end
 
@@ -83,4 +108,28 @@ class TestElasticSearchable < Test::Unit::TestCase
       end
     end
   end
+
+  class User < ActiveRecord::Base
+    elastic_searchable :mapping => {:properties => {:name => {:type => :string, :index => :not_analyzed}}}
+  end
+  context 'activerecord class with :mapping=>{}' do
+    context 'creating index' do
+      setup do
+        User.create_index
+        @status = ElasticSearchable.searcher.index_mapping User.index_name
+      end
+      should 'have set mapping' do
+        expected = {
+          "users"=> {
+            "users"=> {
+              "properties"=> {
+                "name"=> {"type"=>"string", "index"=>"not_analyzed"}
+              }
+            }
+          }
+        }
+        assert_equal expected, @status
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elastic_searchable
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Ryan Sonnek