rubberband 0.0.7 → 0.0.8

data/.autotest

@@ -0,0 +1,12 @@
+require "test_notifier/runner/autotest"
+
+Autotest.add_hook(:initialize) {|at|
+  at.add_exception %r{^\.git}  # ignore Version Control System
+  at.add_exception %r{^./tmp}  # ignore temp files, lest autotest will run again, and again...
+  #  at.clear_mappings         # take out the default (test/test*rb)
+  at.add_mapping(%r{^lib/.*\.rb$}) {|f, _|
+    Dir['spec/**/*.rb']
+  }
+  nil
+}
+

data/.rspec

@@ -0,0 +1,2 @@
+--format nested
+--color

data/CONTRIBUTORS

@@ -2,6 +2,7 @@ Maintainer:
   Grant Rodgers <grantr at gmail dot com>
 
 Contributors:
+  Edmund Salvacion
   Ernie Makris
   jeroig
   mootpointer

data/Gemfile

@@ -4,8 +4,10 @@ gem "patron"
 gem "yajl-ruby"
 
 group :development do
-  gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem "jeweler", "~> 1.5.2"
+  gem "simplecov", ">= 0.3.8", :require => false
+  gem "rspec", "~> 2.4"
+  gem "yard", "~> 0.6"
+  gem "mocha", "~> 0.9.11"
 end

data/Gemfile.lock

@@ -1,24 +1,39 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.2)
     git (1.2.5)
-    jeweler (1.5.1)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    mocha (0.9.11)
+      rake
     patron (0.4.10)
     rake (0.8.7)
-    rcov (0.9.9)
-    shoulda (2.11.3)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    simplecov (0.3.9)
+      simplecov-html (>= 0.3.7)
+    simplecov-html (0.3.9)
     yajl-ruby (0.7.8)
+    yard (0.6.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  jeweler (~> 1.5.1)
+  jeweler (~> 1.5.2)
+  mocha (~> 0.9.11)
   patron
-  rcov
-  shoulda
+  rspec (~> 2.4)
+  simplecov (>= 0.3.8)
   yajl-ruby
+  yard (~> 0.6)

data/Rakefile

@@ -21,30 +21,20 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{An ElasticSearch client with ThriftClient-like failover handling.}
   gem.email = "grantr@gmail.com"
   gem.authors = ["grantr"]
-end
-Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+  gem.add_runtime_dependency 'patron'
+  gem.add_runtime_dependency 'yajl-ruby'
+  gem.add_development_dependency 'rspec', '~> 2.4'
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :test
+task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = ElasticSearch::Version::STRING
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "rubberband #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/lib/elasticsearch/transport/base_protocol.rb

@@ -8,7 +8,7 @@ module ElasticSearch
         else
           response = request(:put, {:index => index, :type => type, :id => id}, options, body)
         end
-        handle_error(response) unless response.status == 200
+        handle_error(response) unless (response.status == 200 or response.status == 201)
         encoder.decode(response.body)
       end
 

data/lib/elasticsearch/version.rb

@@ -2,7 +2,7 @@ module ElasticSearch
   module Version
     MAJOR = 0
     MINOR = 0
-    PATCH = 7
+    PATCH = 8
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/rubberband.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubberband}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["grantr"]
-  s.date = %q{2011-02-08}
+  s.date = %q{2011-02-22}
   s.description = %q{An ElasticSearch client with ThriftClient-like failover handling.}
   s.email = %q{grantr@gmail.com}
   s.extra_rdoc_files = [
@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
     "TODO"
   ]
   s.files = [
+    ".autotest",
+    ".rspec",
     "CONTRIBUTORS",
     "Gemfile",
     "Gemfile.lock",
@@ -50,12 +52,12 @@ Gem::Specification.new do |s|
     "lib/elasticsearch/version.rb",
     "lib/rubberband.rb",
     "rubberband.gemspec",
-    "test/admin_test.rb",
-    "test/elasticsearch_test.rb",
-    "test/hits_test.rb",
-    "test/index_test.rb",
-    "test/test_helper.rb",
-    "test/type_test.rb",
+    "spec/admin_spec.rb",
+    "spec/bulk_spec.rb",
+    "spec/hits_spec.rb",
+    "spec/index_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/type_spec.rb",
     "vendor/elasticsearch/elasticsearch.thrift"
   ]
   s.homepage = %q{http://github.com/grantr/rubberband}
@@ -64,12 +66,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{An ElasticSearch client.}
   s.test_files = [
-    "test/admin_test.rb",
-    "test/elasticsearch_test.rb",
-    "test/hits_test.rb",
-    "test/index_test.rb",
-    "test/test_helper.rb",
-    "test/type_test.rb"
+    "spec/admin_spec.rb",
+    "spec/bulk_spec.rb",
+    "spec/hits_spec.rb",
+    "spec/index_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/type_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -79,25 +81,40 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<patron>, [">= 0"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<simplecov>, [">= 0.3.8"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.4"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.9.11"])
+      s.add_runtime_dependency(%q<patron>, [">= 0"])
+      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.4"])
     else
       s.add_dependency(%q<patron>, [">= 0"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<simplecov>, [">= 0.3.8"])
+      s.add_dependency(%q<rspec>, ["~> 2.4"])
+      s.add_dependency(%q<yard>, ["~> 0.6"])
+      s.add_dependency(%q<mocha>, ["~> 0.9.11"])
+      s.add_dependency(%q<patron>, [">= 0"])
+      s.add_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.4"])
     end
   else
     s.add_dependency(%q<patron>, [">= 0"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<simplecov>, [">= 0.3.8"])
+    s.add_dependency(%q<rspec>, ["~> 2.4"])
+    s.add_dependency(%q<yard>, ["~> 0.6"])
+    s.add_dependency(%q<mocha>, ["~> 0.9.11"])
+    s.add_dependency(%q<patron>, [">= 0"])
+    s.add_dependency(%q<yajl-ruby>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.4"])
   end
 end
 

data/spec/admin_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "basic ops" do
+  before(:all) do
+    @first_index = 'first-' + Time.now.to_i.to_s
+    @client = ElasticSearch.new('127.0.0.1:9200', :index => @first_index, :type => "tweet")
+  end
+
+  after(:all) do
+    @client.delete_index(@first_index)
+    sleep(1)
+  end
+
+  it "should get and update mappings" do
+    @client.index({:foo => "bar"}, :id => "1", :refresh => true)
+
+    @client.index_mapping(@first_index).should == {@first_index => {"tweet" => { "properties" => { "foo" => {"type" => "string" }}}}}
+    @client.update_mapping({"tweet" => {:properties => {:bar => {:type => "string"}}}})
+    @client.index_mapping(@first_index).should == {@first_index => {"tweet" => { "properties" => { "foo" => {"type" => "string" }, "bar" => { "type" => "string"}}}}}
+  end
+end

data/spec/bulk_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "bulk ops" do
+  before(:all) do
+    @index = 'first-' + Time.now.to_i.to_s
+    @client = ElasticSearch.new('127.0.0.1:9200', :index => @index, :type => "tweet")
+  end
+
+  after(:all) do
+    @client.delete_index(@index)
+    sleep(1)
+  end
+
+  it "should index documents in bulk" do
+    @client.bulk do |c|
+      c.index({:foo => 'bar'}, :id => '1')
+      c.index({:foo => 'baz'}, :id => '2')
+    end
+    @client.bulk do
+      @client.index({:socks => 'stripey'}, :id => '3')
+      @client.index({:socks => 'argyle'}, :id => '4')
+    end
+    @client.refresh
+
+    @client.get("1").foo.should == "bar"
+    @client.get("2").foo.should == "baz"
+    @client.get("3").socks.should == "stripey"
+    @client.get("4").socks.should == "argyle"
+  end
+end

data/spec/hits_spec.rb

@@ -0,0 +1,79 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ElasticSearch::Api::Hit do
+  let(:response) { {"_source" => {"foo" => "bar"}, "_id" => "1"} }
+
+  subject { described_class.new(response) }
+
+  its(:id) { should == response["_id"] }
+
+  its(:attributes) { should be_frozen }
+
+  it "should set hit attributes" do
+    subject.foo.should == response["_source"]["foo"]
+  end
+end
+
+describe ElasticSearch::Api::Hits do
+  context "unpaginated" do
+    let(:response) do
+      {
+        "_shards"=>{"total"=>30, "successful"=>30, "failed"=>0}, 
+        "hits"=>{"total"=>2, "max_score"=>1.0, "hits"=>[
+          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"1", "_score"=>1.0, "_source"=>{"foo" => "bar"}},
+          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"2", "_score"=>1.0, "_source"=>{"foo" => "baz"}}
+      ]}}
+    end
+
+    subject { described_class.new(response) }
+
+    it { should respond_to(:response) }
+
+    its(:total_entries) { should == response["hits"]["hits"].size }
+
+    it "should instantiate hits in order" do
+      response["hits"]["hits"].each_with_index do |hit, i|
+        subject.hits[i].should == ElasticSearch::Api::Hit.new(hit)
+      end
+    end
+
+
+    it "should freeze all hits" do
+      subject.hits.all? { |h| h.frozen? }.should be_true
+    end
+
+    it "should freeze hits array when frozen" do
+      subject.freeze
+      subject.hits.should be_frozen
+    end
+
+    it { should respond_to(:to_a) }
+
+    it "should delegate array methods" do
+      subject.collect { |h| h.id }.should == response["hits"]["hits"].collect { |h| h["_id"] }
+    end
+
+  end
+
+  context "paginated" do
+    let(:response) do
+      {
+        "_shards"=>{"total"=>30, "successful"=>30, "failed"=>0}, 
+        "hits"=>{"total"=>6, "max_score"=>1.0, "hits"=>[
+          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"3", "_score"=>1.0, "_source"=>{"foo" => "bar"}},
+          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"4", "_score"=>1.0, "_source"=>{"foo" => "baz"}}
+      ]}}
+    end
+    
+    let(:per_page) { 2 }
+    let(:page) { 2 }
+    
+    subject { described_class.new(response, {:page => page, :per_page => per_page}) }
+
+    its(:total_pages) { should == (response["hits"]["total"] / per_page.to_f).ceil }
+    its(:next_page) { should == (page + 1) }
+    its(:previous_page) { should == (page - 1) }
+    its(:current_page) { should == page }
+    its(:per_page) { should == per_page }
+  end
+end

data/spec/index_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "index ops" do
+  before(:all) do
+    @first_index = 'first-' + Time.now.to_i.to_s
+    @client = ElasticSearch.new('127.0.0.1:9200', :index => @first_index, :type => "tweet")
+  end
+
+  after(:all) do
+    @client.delete_index(@first_index)
+    sleep(1)
+  end
+
+  it "should get and delete a document" do
+    @client.index({:foo => "bar"}, :id => "1", :refresh => true)
+
+    @client.get("1").foo.should == "bar"
+    @client.delete("1", :refresh => true).should be_true
+    @client.get("1").should be_nil
+  end
+
+  it 'should search and count documents' do
+    @client.index({:foo => "bar"}, :id => "1")
+    @client.index({:foo => "baz"}, :id => "2")
+    @client.index({:foo => "baz also"}, :id => "3")
+    @client.refresh(@first_index)
+
+    @client.search("bar").should have(1).items
+    @client.count("bar").should == 1
+
+    @client.search(:query => { :term => { :foo => 'baz' }}).should have(2).items
+    @client.count(:term => { :foo => 'baz' }).should == 2
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,20 @@
+if RUBY_VERSION =~ /^1\.9/
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/spec/'
+    add_filter '/features/'
+  end
+end
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'rubberband'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  config.mock_with :mocha
+end

data/spec/type_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "type and index parameters" do
+  before(:all) do
+    @first_index = 'first-' + Time.now.to_i.to_s
+    @second_index = 'second-' + Time.now.to_i.to_s
+    @third_index = 'third-' + Time.now.to_i.to_s
+    @username = 'kimchy' + Time.now.to_i.to_s
+    @client = ElasticSearch.new('127.0.0.1:9200', :index => @first_index, :type => "tweet")
+    @client.index({:user => @username}, :id => 1)
+    @client.index({:user => @username}, :id => 2, :type => "grillo")
+    @client.index({:user => @username}, :id => 3, :type => "cote")
+    @client.index({:user => @username}, :id => 4, :index => @second_index, :type => "cote")
+    @client.index({:user => @username}, :id => 5, :index => @third_index, :type => "mencho")
+    @client.index({:user => @username}, :id => 6, :index => @third_index, :type => "cote")
+    @client.refresh(@first_index, @second_index, @third_index)
+  end
+
+  after(:all) do
+    @client.delete_index(@first_index)
+    @client.delete_index(@second_index)
+    @client.delete_index(@third_index)
+    sleep(1)
+  end
+
+  it "should search in all indexes" do
+    @client.count(@username,{:index => "", :type => ""}).should == 6
+  end
+
+  it "should search in all types with index first" do
+    @client.count(@username,{:index => @first_index, :type => ""}).should == 3
+  end
+ 
+  it "should search in first index with types tweet,cote" do
+    @client.count(@username,{:index => @first_index, :type => "tweet,cote"}).should == 2
+  end
+
+  it "should search in index first and second" do
+    @first_and_second = @first_index + ',' + @second_index  
+    @client.count(@username,{:index => @first_and_second,  :type => ""}).should == 4
+  end
+
+  it "should search in types grillo,cote of all indexes" do
+    @client.count(@username,{:index => "",  :type => "grillo,cote"}).should == 4
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - grantr
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,20 +44,22 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: bundler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 0
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: jeweler
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,30 +67,86 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 0
-        - 0
-        version: 1.0.0
+        - 5
+        - 2
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: simplecov
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
+        - 0
+        - 3
+        - 8
+        version: 0.3.8
   type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rspec
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        version: "2.4"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 11
+        version: 0.9.11
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: patron
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,9 +154,23 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        version: "2.4"
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id011
 description: An ElasticSearch client with ThriftClient-like failover handling.
 email: grantr@gmail.com
 executables: []
@@ -110,6 +182,8 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
+- .autotest
+- .rspec
 - CONTRIBUTORS
 - Gemfile
 - Gemfile.lock
@@ -142,12 +216,12 @@ files:
 - lib/elasticsearch/version.rb
 - lib/rubberband.rb
 - rubberband.gemspec
-- test/admin_test.rb
-- test/elasticsearch_test.rb
-- test/hits_test.rb
-- test/index_test.rb
-- test/test_helper.rb
-- test/type_test.rb
+- spec/admin_spec.rb
+- spec/bulk_spec.rb
+- spec/hits_spec.rb
+- spec/index_spec.rb
+- spec/spec_helper.rb
+- spec/type_spec.rb
 - vendor/elasticsearch/elasticsearch.thrift
 has_rdoc: true
 homepage: http://github.com/grantr/rubberband
@@ -163,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4380067439050607353
+      hash: 2137179161715678959
       segments: 
       - 0
       version: "0"
@@ -183,9 +257,9 @@ signing_key:
 specification_version: 3
 summary: An ElasticSearch client.
 test_files: 
-- test/admin_test.rb
-- test/elasticsearch_test.rb
-- test/hits_test.rb
-- test/index_test.rb
-- test/test_helper.rb
-- test/type_test.rb
+- spec/admin_spec.rb
+- spec/bulk_spec.rb
+- spec/hits_spec.rb
+- spec/index_spec.rb
+- spec/spec_helper.rb
+- spec/type_spec.rb

data/test/admin_test.rb

@@ -1,25 +0,0 @@
-require 'test_helper'
-
-class BasicTest < Test::Unit::TestCase
-  context "basic ops" do
-
-    setup do
-      @first_index = 'first-' + Time.now.to_i.to_s
-      @client = ElasticSearch.new('127.0.0.1:9200', :index => @first_index, :type => "tweet")
-    end
-
-    teardown do
-      @client.delete_index(@first_index)
-      sleep(1)
-    end
-
-    #TODO this test fails randomly, there's some kind of timing issue here
-    should "get and update mappings" do
-      @client.index({:foo => "bar"}, :id => "1", :refresh => true)
-      
-      assert_equal({@first_index => {"tweet" => { "properties" => { "foo" => {"type" => "string" }}}}}, @client.index_mapping(@first_index))
-      @client.update_mapping({"tweet" => {:properties => {:bar => {:type => "string"}}}})
-      assert_equal({@first_index => {"tweet" => { "properties" => { "foo" => {"type" => "string" }, "bar" => { "type" => "string"}}}}}, @client.index_mapping(@first_index))
-    end
-  end
-end

data/test/elasticsearch_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class ElasticSearchTest < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    #flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end

data/test/hits_test.rb

@@ -1,101 +0,0 @@
-require 'test_helper'
-
-class HitsTest < Test::Unit::TestCase
-  context "A Hit instance" do
-    setup do
-      @response = {"_source" => {"foo" => "bar"}, "_id" => "1"}
-      @hit = ElasticSearch::Api::Hit.new(@response)
-    end
-
-    should "set id" do
-      assert_equal @response["_id"], @hit.id
-    end
-
-    should "set hit attributes" do
-      assert_equal @response["_source"]["foo"], @hit.foo
-    end
-
-    should "be frozen" do
-      assert @hit.attributes.frozen?
-    end
-
-  end
-
-  context "A Hits instance" do
-    setup do
-      @response = {
-        "_shards"=>{"total"=>30, "successful"=>30, "failed"=>0}, 
-        "hits"=>{"total"=>2, "max_score"=>1.0, "hits"=>[
-          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"1", "_score"=>1.0, "_source"=>{"foo" => "bar"}},
-          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"2", "_score"=>1.0, "_source"=>{"foo" => "baz"}}
-      ]}}
-      @hits = ElasticSearch::Api::Hits.new(@response)
-    end
-
-    should "set response" do
-      assert_equal @response, @hits.response
-    end
-
-    should "set total_entries" do
-      assert_equal @response["hits"]["hits"].size, @hits.total_entries
-    end
-
-    should "instantiate hits in order" do
-      @response["hits"]["hits"].each_with_index do |hit, i|
-        assert_equal ElasticSearch::Api::Hit.new(hit), @hits.hits[i]
-      end
-    end
-
-    should "freeze hits" do
-      assert @hits.hits.all? { |h| h.frozen? }
-    end
-
-    should "freeze hits array when frozen" do
-      @hits.freeze
-      assert @hits.hits.frozen?
-    end
-
-    should "respond to to_a" do
-      assert_equal @hits.hits, @hits.to_a
-    end
-
-    should "respond to array methods" do
-      assert @hits.respond_to?(:collect)
-      assert_equal @response["hits"]["hits"].collect { |h| h["_id"] }, @hits.collect { |h| h.id }
-    end
-  end
-
-  context "a paginated hits instance" do
-    setup do
-      @response = {
-        "_shards"=>{"total"=>30, "successful"=>30, "failed"=>0}, 
-        "hits"=>{"total"=>6, "max_score"=>1.0, "hits"=>[
-          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"3", "_score"=>1.0, "_source"=>{"foo" => "bar"}},
-          {"_index"=>"test_index", "_type"=>"test_type", "_id"=>"4", "_score"=>1.0, "_source"=>{"foo" => "baz"}}
-      ]}}
-      @per_page = 2
-      @page = 2
-      @hits = ElasticSearch::Api::Hits.new(@response, {:page => @page, :per_page => @per_page})
-    end
-
-    should "respond to total_pages" do
-      assert_equal (@response["hits"]["total"] / @per_page.to_f).ceil, @hits.total_pages
-    end
-
-    should "respond to next_page" do
-      assert_equal @page + 1, @hits.next_page
-    end
-
-    should "respond to previous_page" do
-      assert_equal @page - 1, @hits.previous_page
-    end
-
-    should "respond to current_page" do
-      assert_equal @page, @hits.current_page
-    end
-
-    should "respond to per page" do
-      assert_equal @per_page, @hits.per_page
-    end
-  end
-end

data/test/index_test.rb

@@ -1,35 +0,0 @@
-require 'test_helper'
-
-class IndexTest < Test::Unit::TestCase
-  context "index ops" do
-
-    setup do
-      @first_index = 'first-' + Time.now.to_i.to_s
-      @client = ElasticSearch.new('127.0.0.1:9200', :index => @first_index, :type => "tweet")
-    end
-
-    teardown do
-      @client.delete_index(@first_index)
-      sleep(1)
-    end
-
-    should "do basic ops on a document" do
-      @client.index({:foo => "bar"}, :id => "1", :refresh => true)
-
-      assert_equal "bar", @client.get("1").foo
-      assert_equal true, @client.delete("1", :refresh => true)
-      assert_equal nil, @client.get("1")
-
-      @client.index({:foo => "bar"}, :id => "1")
-      @client.index({:foo => "baz"}, :id => "2")
-      @client.index({:foo => "baz also"}, :id => "3")
-      @client.refresh(@first_index)
-
-      assert_equal 1, @client.search("bar").size
-      assert_equal 1, @client.count("bar")
-
-      assert_equal 2, @client.search(:query => { :term => { :foo => 'baz' }}).size
-      assert_equal 2, @client.count(:term => { :foo => 'baz' })
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'elasticsearch'
-
-class Test::Unit::TestCase
-end

data/test/type_test.rb

@@ -1,47 +0,0 @@
-require 'test_helper'
-
-class TypeTest < Test::Unit::TestCase
-  context "Test with differents Types" do
-
-    setup do
-      @first_index = 'first-' + Time.now.to_i.to_s
-      @second_index = 'second-' + Time.now.to_i.to_s
-      @third_index = 'third-' + Time.now.to_i.to_s
-      @username = 'kimchy' + Time.now.to_i.to_s
-      @client = ElasticSearch.new('127.0.0.1:9200', :index => @first_index, :type => "tweet")
-      @client.index({:user => @username}, :id => 1)
-      @client.index({:user => @username}, :id => 2, :type => "grillo")
-      @client.index({:user => @username}, :id => 3, :type => "cote")
-      @client.index({:user => @username}, :id => 4, :index => @second_index, :type => "cote")
-      @client.index({:user => @username}, :id => 5, :index => @third_index, :type => "mencho")
-      @client.index({:user => @username}, :id => 6, :index => @third_index, :type => "cote")
-      @client.refresh(@first_index, @second_index, @third_index)
-    end
-
-    teardown do
-      @client.delete_index(@first_index)
-      @client.delete_index(@second_index)
-      @client.delete_index(@third_index)
-      sleep(1)
-    end
-
-    should "Test different stages using indexes and types" do
-      # Search in all indexes
-      assert_equal @client.count(@username,{:index => "", :type => ""}), 6
-      
-      # Search in all types with index first
-      assert_equal @client.count(@username,{:index => @first_index, :type => ""}), 3
-      
-      # Search in first index with types tweet,cote
-      assert_equal @client.count(@username,{:index => @first_index, :type => "tweet,cote"}), 2
-      
-      # Search in index first and second
-      @first_and_second = @first_index + ',' + @second_index  
-      assert_equal @client.count(@username,{:index => @first_and_second,  :type => ""}), 4
-      
-      # Search in types grillo,cote of all indexes" do
-      assert_equal @client.count(@username,{:index => "",  :type => "grillo,cote"}), 4
-    end
-
-  end
-end