elastic_searchable 0.6.6 → 0.6.7

data/.gitignore

@@ -19,6 +19,15 @@ pkg
 test/*.log
 test/*.sqlite3
 
+# For vim:
+*.swp
+
+# For MacOS:
+.DS_Store
+
+# git files
+*.orig
+
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
 #
 # * Create a file at ~/.gitignore
@@ -30,10 +39,6 @@ test/*.sqlite3
 #
 # Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
 #
-# For MacOS:
-#
-#.DS_Store
-#
 # For TextMate
 #*.tmproj
 #tmtags
@@ -42,6 +47,4 @@ test/*.sqlite3
 #*~
 #\#*
 #.\#*
-#
-# For vim:
-#*.swp
+

data/Gemfile

@@ -1,2 +1,4 @@
+source "http://rubygems.org"
+
 gemspec
 

data/Rakefile

@@ -9,22 +9,5 @@ Rake::TestTask.new(:test) do |test|
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "elastic_searchable #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/elastic_searchable.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
   s.add_development_dependency(%q<rcov>, [">= 0"])
   s.add_development_dependency(%q<sqlite3-ruby>, ["~> 1.3.2"])
+  s.add_development_dependency(%q<ruby-debug>, [">= 0"])
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/elastic_searchable/version.rb

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

data/lib/elastic_searchable.rb

@@ -28,7 +28,10 @@ module ElasticSearchable
     def logger
       @@logger
     end
-    #perform a request to the elasticsearch server
+    # perform a request to the elasticsearch server
+    # configuration:
+    # ElasticSearchable.base_uri 'host:port' controls where to send request to
+    # ElasticSearchable.debug_output outputs all http traffic to console
     def request(method, url, options = {})
       response = self.send(method, url, options)
       logger.debug "elasticsearch request: #{method} #{url} #{"took #{response['took']}ms" if response['took']}"

data/test/helper.rb

@@ -10,6 +10,7 @@ end
 require 'test/unit'
 require 'shoulda'
 require 'mocha'
+require 'ruby-debug'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/setup_database.rb

@@ -18,9 +18,11 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :friends, :force => true do |t|
     t.column :name, :string
     t.column :favorite_color, :string
+    t.belongs_to :book
   end
   create_table :books, :force => true do |t|
     t.column :title, :string
+    t.column :isbn, :string
   end
   create_table :max_page_size_classes, :force => true do |t|
     t.column :name, :string

data/test/test_elastic_searchable.rb

@@ -7,7 +7,7 @@ class TestElasticSearchable < Test::Unit::TestCase
   ElasticSearchable.debug_output
 
   class Post < ActiveRecord::Base
-    elastic_searchable
+    elastic_searchable :index_options => {'number_of_replicas' => 0, 'number_of_shards' => 1}
     after_index :indexed
     after_index_on_create :indexed_on_create
     def indexed
@@ -76,6 +76,7 @@ class TestElasticSearchable < Test::Unit::TestCase
 
   context 'with empty index when multiple database records' do
     setup do
+      Post.delete_all
       Post.create_index
       @first_post = Post.create :title => 'foo', :body => "first bar"
       @second_post = Post.create :title => 'foo', :body => "second bar"
@@ -164,7 +165,7 @@ class TestElasticSearchable < Test::Unit::TestCase
 
 
   class Blog < ActiveRecord::Base
-    elastic_searchable :if => proc {|b| b.should_index? }
+    elastic_searchable :if => proc {|b| b.should_index? }, :index_options => {'number_of_replicas' => 0, 'number_of_shards' => 1}
     def should_index?
       false
     end
@@ -184,8 +185,12 @@ class TestElasticSearchable < Test::Unit::TestCase
   end
 
   class User < ActiveRecord::Base
-    elastic_searchable :index_options => { "analysis.analyzer.default.tokenizer" => 'standard', "analysis.analyzer.default.filter" => ["standard", "lowercase", 'porterStem'] },
-      :mapping => {:properties => {:name => {:type => :string, :index => :not_analyzed}}}
+    elastic_searchable :index_options => {
+      'number_of_replicas' => 0,
+      'number_of_shards' => 1,
+      "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 :index_options and :mapping' do
     context 'creating index' do
@@ -195,8 +200,8 @@ class TestElasticSearchable < Test::Unit::TestCase
       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.number_of_replicas" => "0",
+          "index.number_of_shards" => "1",
           "index.analysis.analyzer.default.tokenizer" => "standard",
           "index.analysis.analyzer.default.filter.0" => "standard",
           "index.analysis.analyzer.default.filter.1" => "lowercase",
@@ -219,19 +224,27 @@ class TestElasticSearchable < Test::Unit::TestCase
   end
 
   class Friend < ActiveRecord::Base
-    elastic_searchable :json => {:only => [:name]}
+    belongs_to :book
+    elastic_searchable :json => {:include => {:book => {:only => :title}}, :only => :name}, :index_options => {'number_of_replicas' => 0, 'number_of_shards' => 1}
   end
-  context 'activerecord class with optiona :json config' do
+  context 'activerecord class with optional :json config' do
     context 'creating index' do
       setup do
         Friend.create_index
-        @friend = Friend.create! :name => 'bob', :favorite_color => 'red'
+        @book = Book.create! :isbn => '123abc', :title => 'another world'
+        @friend = Friend.new :name => 'bob', :favorite_color => 'red'
+        @friend.book = @book
+        @friend.save!
         Friend.refresh_index
       end
       should 'index json with configuration' do
         @response = ElasticSearchable.request :get, "/elastic_searchable/friends/#{@friend.id}"
+        # should not index:
+        # friend.favorite_color
+        # book.isbn
         expected = {
-          "name" => 'bob' #favorite_color should not be indexed
+          "name" => 'bob',
+          'book' => {'title' => 'another world'}
         }
         assert_equal expected, @response['_source'], @response.inspect
       end
@@ -290,7 +303,7 @@ class TestElasticSearchable < Test::Unit::TestCase
   end
 
   class MaxPageSizeClass < ActiveRecord::Base
-    elastic_searchable
+    elastic_searchable :index_options => {'number_of_replicas' => 0, 'number_of_shards' => 1}
     def self.max_per_page
       1
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elastic_searchable
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 Z
+date: 2011-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -171,6 +171,20 @@ dependencies:
         version: 1.3.2
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
 description: integrate the elastic search engine with rails
 email: 
 - ryan@codecrate.com
@@ -187,7 +201,6 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - elastic_searchable.gemspec
 - lib/elastic_searchable.rb
 - lib/elastic_searchable/active_record_extensions.rb

data/VERSION

@@ -1 +0,0 @@
-0.6.1