elastic_searchable 0.6.5 → 0.6.6

data/README.rdoc

@@ -27,15 +27,12 @@ Integrate the elasticsearch library into Rails.
   #defaults to localhost:9200
   ElasticSearchable.base_uri = 'server:9200'
 
-== Contributing to elastic_searchable
+== Contributing
  
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+* Fix the issue
+* Add unit tests
+* Submit pull request on github
 
 == Copyright
 

data/lib/elastic_searchable/index.rb

@@ -18,11 +18,12 @@ module ElasticSearchable
       end
 
       # create the index
-      # http://www.elasticsearch.com/docs/elasticsearch/rest_api/admin/indices/create_index/
+      # http://www.elasticsearch.org/guide/reference/api/admin-indices-create-index.html
       def create_index
-        options = self.elastic_options[:index_options] ? self.elastic_options[:index_options].to_json : ''
-        ElasticSearchable.request :put, index_path, :body => options
-        self.update_index_mapping
+        options = {}
+        options.merge! :settings => self.elastic_options[:index_options] if self.elastic_options[:index_options]
+        options.merge! :mappings => {index_type => self.elastic_options[:mapping]} if self.elastic_options[:mapping]
+        ElasticSearchable.request :put, index_path, :body => options.to_json
       end
 
       # explicitly refresh the index, making all operations performed since the last refresh
@@ -68,7 +69,7 @@ module ElasticSearchable
 
         records = scope.paginate(options)
         while records.any? do
-          ElasticSearchable.logger.info "reindexing batch ##{records.current_page}..."
+          ElasticSearchable.logger.debug "reindexing batch ##{records.current_page}..."
 
           actions = []
           records.each do |record|

data/lib/elastic_searchable/version.rb

@@ -1,4 +1,4 @@
 module ElasticSearchable
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end
 

data/test/setup_database.rb

@@ -6,6 +6,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :posts, :force => true do |t|
     t.column :title, :string
     t.column :body, :string
+    t.column :name, :string
   end
   create_table :blogs, :force => true do |t|
     t.column :title, :string

data/test/test_elastic_searchable.rb

@@ -4,11 +4,10 @@ class TestElasticSearchable < Test::Unit::TestCase
   def setup
     delete_index
   end
-  def teardown
-    delete_index
-  end
+  ElasticSearchable.debug_output
+
   class Post < ActiveRecord::Base
-    elastic_searchable :index_options => { "analysis.analyzer.default.tokenizer" => 'standard', "analysis.analyzer.default.filter" => ["standard", "lowercase", 'porterStem'] }
+    elastic_searchable
     after_index :indexed
     after_index_on_create :indexed_on_create
     def indexed
@@ -24,7 +23,7 @@ class TestElasticSearchable < Test::Unit::TestCase
       @indexed_on_create
     end
   end
-  context 'Post class with default elastic_searchable config' do
+  context 'activerecord class with default elastic_searchable config' do
     setup do
       @clazz = Post
     end
@@ -36,7 +35,7 @@ class TestElasticSearchable < Test::Unit::TestCase
     end
   end
 
-  context 'ElasticSearchable.request with invalid url' do
+  context 'Model.request with invalid url' do
     should 'raise error' do
       assert_raises ElasticSearchable::ElasticError do
         ElasticSearchable.request :get, '/elastic_searchable/foobar/notfound'
@@ -44,25 +43,15 @@ class TestElasticSearchable < Test::Unit::TestCase
     end
   end
 
-  context 'Post.create_index' do
+  context 'Model.create_index' do
     setup do
       Post.create_index
+      Post.refresh_index
       @status = ElasticSearchable.request :get, '/elastic_searchable/_status'
     end
     should 'have created index' do
       assert @status['ok']
     end
-    should 'have used custom index_options' do
-      expected = {
-        "index.number_of_replicas" => "1",
-        "index.number_of_shards" => "5",
-        "index.analysis.analyzer.default.tokenizer" => "standard",
-        "index.analysis.analyzer.default.filter.0" => "standard",
-        "index.analysis.analyzer.default.filter.1" => "lowercase",
-        "index.analysis.analyzer.default.filter.2" => "porterStem"
-      }
-      assert_equal expected, @status['indices']['elastic_searchable']['settings'], @status.inspect
-    end
   end
 
   context 'deleting object that does not exist in search index' do
@@ -73,7 +62,7 @@ class TestElasticSearchable < Test::Unit::TestCase
     end
   end
 
-  context 'Post.create' do
+  context 'Model.create' do
     setup do
       @post = Post.create :title => 'foo', :body => "bar"
     end
@@ -96,7 +85,7 @@ class TestElasticSearchable < Test::Unit::TestCase
       ElasticSearchable.expects(:request).raises(ElasticSearchable::ElasticError.new('faux error'))
       Post.reindex
     end
-    context 'Post.reindex' do
+    context 'Model.reindex' do
       setup do
         Post.reindex :per_page => 1, :scope => Post.scoped(:order => 'body desc')
         Post.refresh_index
@@ -195,15 +184,28 @@ class TestElasticSearchable < Test::Unit::TestCase
   end
 
   class User < ActiveRecord::Base
-    elastic_searchable :mapping => {:properties => {:name => {:type => :string, :index => :not_analyzed}}}
+    elastic_searchable :index_options => { "analysis.analyzer.default.tokenizer" => 'standard', "analysis.analyzer.default.filter" => ["standard", "lowercase", 'porterStem'] },
+      :mapping => {:properties => {:name => {:type => :string, :index => :not_analyzed}}}
   end
-  context 'activerecord class with :mapping=>{}' do
+  context 'activerecord class with :index_options and :mapping' do
     context 'creating index' do
       setup do
         User.create_index
-        @status = ElasticSearchable.request :get, '/elastic_searchable/users/_mapping'
+      end
+      should 'have used custom index_options' do
+        @status = ElasticSearchable.request :get, '/elastic_searchable/_status'
+        expected = {
+          "index.number_of_replicas" => "1",
+          "index.number_of_shards" => "5",
+          "index.analysis.analyzer.default.tokenizer" => "standard",
+          "index.analysis.analyzer.default.filter.0" => "standard",
+          "index.analysis.analyzer.default.filter.1" => "lowercase",
+          "index.analysis.analyzer.default.filter.2" => "porterStem"
+        }
+        assert_equal expected, @status['indices']['elastic_searchable']['settings'], @status.inspect
       end
       should 'have set mapping' do
+        @status = ElasticSearchable.request :get, '/elastic_searchable/users/_mapping'
         expected = {
           "users"=> {
             "properties"=> {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elastic_searchable
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-01 00:00:00 -05:00
-default_executable: 
+date: 2011-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -200,7 +199,6 @@ files:
 - test/helper.rb
 - test/setup_database.rb
 - test/test_elastic_searchable.rb
-has_rdoc: true
 homepage: http://github.com/wireframe/elastic_searchable
 licenses: []
 
@@ -230,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: elastic_searchable
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: elastic search for activerecord