rubberband 0.1.1 → 0.1.2

data/CONTRIBUTORS

@@ -3,9 +3,11 @@ Maintainer:
 
 Contributors:
   Edmund Salvacion
+  Erick Tryzelaar
   Ernie Makris
   Frederic De Jaeger
   jeroig
   mootpointer
+  Ruben Quintero
   Ryan Sonnek
   speedmax

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
 gemspec
+
+gem "patron", "~> 0.4.12"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubberband (0.1.1)
+    rubberband (0.1.2)
       patron
       yajl-ruby
 
@@ -10,7 +10,8 @@ GEM
   specs:
     diff-lcs (1.1.2)
     mocha (0.9.12)
-    patron (0.4.11)
+    patron (0.4.12)
+    rake (0.9.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -23,7 +24,7 @@ GEM
       simplecov-html (~> 0.4.3)
     simplecov-html (0.4.3)
     yajl-ruby (0.8.2)
-    yard (0.6.4)
+    yard (0.7.2)
 
 PLATFORMS
   ruby
@@ -31,7 +32,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   mocha (~> 0.9.0)
+  patron (~> 0.4.12)
+  rake (~> 0.9.2)
   rspec (~> 2.0)
   rubberband!
   simplecov (>= 0.3.8)
-  yard (~> 0.6.0)
+  yard (>= 0.7.0)

data/lib/elasticsearch/client/admin_index.rb

@@ -69,6 +69,11 @@ module ElasticSearch
           execute(:update_mapping, indices, type, mapping, options)
         end
 
+        def delete_mapping(options={})
+          index, type, options = extract_required_scope(options)
+          execute(:delete_mapping, index, type, options)
+        end
+
         def update_settings(settings, options={})
           index, type, options = extract_scope(options)
           execute(:update_settings, index, settings, options)
@@ -97,7 +102,7 @@ module ElasticSearch
           indices.collect! { |i| PSEUDO_INDICES.include?(i) ? "_#{i}" : i }
           execute(:refresh, indices, options)
         end
-        
+
         # list of indices, or :all
         # no options
         # default: default_index if defined, otherwise all
@@ -117,6 +122,22 @@ module ElasticSearch
           indices.collect! { |i| PSEUDO_INDICES.include?(i) ? "_#{i}" : i }
           execute(:optimize, indices, options)
         end
+
+        def create_river(type, create_options, options={})
+          execute(:create_river, type, create_options, options)
+        end
+
+        def get_river(type, options={})
+          execute(:get_river, type, options)
+        end
+
+        def river_status(type, options={})
+          execute(:river_status, type, options)
+        end
+
+        def delete_river(type=nil, options={})
+          execute(:delete_river, type, options)
+        end
       end
     end
   end

data/lib/elasticsearch/client/index.rb

@@ -127,6 +127,17 @@ module ElasticSearch
           end
         end
       end
+      
+      # minor multi get support
+      def multi_get(ids, options={})
+        index, type, options = extract_required_scope(options)
+        results = execute(:multi_get, index, type, ids, options)
+        if(results)
+          hits = []
+          results.each { |hit| hits << Hit.new(hit) }
+          hits
+        end
+      end
     end
   end
 end

data/lib/elasticsearch/transport/base_protocol.rb

@@ -87,6 +87,18 @@ module ElasticSearch
         handle_error(response) unless response.status == 200
         encoder.decode(response.body) # {"items => [ {"delete"/"create" => {"_index", "_type", "_id", "ok"}} ] }
       end
+      
+      # Uses a post request so we can send ids in content
+      def multi_get(index, type, ids, options={})
+        # { "docs" = [ {...}, {...}, ...]}
+        results = standard_request(:post, { :index => index, :type => type, :op => "_mget"}, 
+                                   options, encoder.encode({"ids" => ids}))['docs']
+        results.each do |hit|
+          unescape_id!(hit)
+          set_encoding!(hit)
+        end
+        results
+      end
     end
 
     module IndexAdminProtocol
@@ -114,6 +126,10 @@ module ElasticSearch
         standard_request(:get, {:index => index_list, :op => "_mapping"})
       end
 
+      def delete_mapping(index, type, options={})
+        standard_request(:delete, {:index => index, :type => type, :op => "_mapping"})
+      end
+
       def update_settings(index, settings, options)
         standard_request(:put, {:index => index, :op => "_settings"}, options, encoder.encode(settings))
       end
@@ -137,6 +153,24 @@ module ElasticSearch
       def optimize(index_list, options={})
         standard_request(:post, {:index => index_list, :op => "_optimize"}, options, {})
       end
+
+      def create_river(type, create_options={}, options={})
+        standard_request(:put, {:index => "_river", :type => type, :op => "_meta"}, options, encoder.encode(create_options))
+      end
+
+      def get_river(type, options={})
+        standard_request(:get, {:index => "_river", :type => type, :op => "_meta"})
+      end
+
+      def river_status(type, options={})
+        standard_request(:get, {:index => "_river", :type => type, :op => "_status"})
+      end
+
+      def delete_river(type, options={})
+        params = {:index => "_river"}
+        params[:type] = type unless type.nil?
+        standard_request(:delete, params)
+      end
     end
 
     module ClusterAdminProtocol
@@ -170,7 +204,7 @@ module ElasticSearch
 
       def standard_request(*args)
         response = request(*args)
-        handle_error(response) unless response.status == 200
+        handle_error(response) unless response.status >= 200 && response.status < 300
         encoder.decode(response.body)
       end
 

data/lib/elasticsearch/version.rb

@@ -1,3 +1,3 @@
 module ElasticSearch
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/rubberband.gemspec

@@ -28,8 +28,9 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("patron", [">= 0"])
   s.add_runtime_dependency("yajl-ruby", [">= 0"])
+  s.add_development_dependency("rake", ["~> 0.9.2"])
   s.add_development_dependency("rspec", ["~> 2.0"])
-  s.add_development_dependency("yard", ["~> 0.6.0"])
+  s.add_development_dependency("yard", [">= 0.7.0"])
   s.add_development_dependency("bundler", ["~> 1.0.0"])
   s.add_development_dependency("simplecov", [">= 0.3.8"])
   s.add_development_dependency("mocha", ["~> 0.9.0"])

data/spec/admin_spec.rb

@@ -3,7 +3,7 @@ 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")
+    @client = ElasticSearch.new('http://127.0.0.1:9200', :index => @first_index, :type => "tweet")
   end
 
   after(:all) do

data/spec/bulk_spec.rb

@@ -3,7 +3,7 @@ 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")
+    @client = ElasticSearch.new('http://127.0.0.1:9200', :index => @index, :type => "tweet")
   end
 
   after(:all) do

data/spec/connect_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "connect" do
 
   context 'one server' do
-    let(:servers) { '127.0.0.1:9200' }
+    let(:servers) { 'http://127.0.0.1:9200' }
 
     it 'should connect' do
       client = ElasticSearch.new(servers)
@@ -15,7 +15,7 @@ describe "connect" do
   end
  
   context 'invalid server' do
-    let(:servers) { '0.1.1.1:9200' }
+    let(:servers) { 'http://0.1.1.1:9200' }
 
     it 'should raise ConnectionFailed' do
       expect { ElasticSearch.new(servers).nodes_info }.to raise_error(ElasticSearch::ConnectionFailed)
@@ -23,7 +23,7 @@ describe "connect" do
   end
 
   context 'invalid servers' do
-    let(:servers) { ['0.1.1.1:9200', '0.2.2.2:9200'] }
+    let(:servers) { ['http://0.1.1.1:9200', 'http://0.2.2.2:9200'] }
 
     it 'should raise ConnectionFailed' do
       expect { ElasticSearch.new(servers).nodes_info }.to raise_error(ElasticSearch::ConnectionFailed)

data/spec/index_spec.rb

@@ -3,7 +3,7 @@ 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")
+    @client = ElasticSearch.new('http://127.0.0.1:9200', :index => @first_index, :type => "tweet")
   end
 
   after(:all) do
@@ -51,4 +51,13 @@ describe "index ops" do
     @client.refresh
     @client.count(:term => { :deleted => 'bar'}).should == 0
   end
+  
+  it 'should perform a successful multi get' do
+    @client.index({:foo => "bar"}, :id => "1")
+    @client.index({:foo => "baz"}, :id => "2")
+    @client.index({:foo => "bazbar"}, :id => "3")
+    ids = ["1", "2", "3"]
+    results = @client.multi_get(ids).inject([]) { |r,e| r << e.id }
+    results.should == ids
+  end
 end

data/spec/type_spec.rb

@@ -7,7 +7,7 @@ describe "type and index parameters" do
     @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 = ElasticSearch.new('http://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")

metadata

@@ -1,102 +1,156 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rubberband
-version: !ruby/object:Gem::Version
-  version: 0.1.1
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
-authors:
+authors: 
 - Grant Rodgers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-20 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-07-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: patron
-  requirement: &10698800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *10698800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  requirement: &10697360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *10697360
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &10696040 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: *10696040
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &10695120 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  version_requirements: *10695120
-- !ruby/object:Gem::Dependency
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &10693520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
-  prerelease: false
-  version_requirements: *10693520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &10691980 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 3
+        - 8
         version: 0.3.8
   type: :development
-  prerelease: false
-  version_requirements: *10691980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &10688320 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
         version: 0.9.0
   type: :development
-  prerelease: false
-  version_requirements: *10688320
+  version_requirements: *id008
 description: An ElasticSearch client with ThriftClient-like failover handling.
-email:
+email: 
 - grantr@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.rdoc
-files:
+files: 
 - .autotest
 - .gitignore
 - .rspec
@@ -141,31 +195,39 @@ files:
 - spec/type_spec.rb
 - vendor/elasticsearch/elasticsearch.thrift
 homepage: http://github.com/grantr/rubberband
-licenses:
+licenses: 
 - Apache v2
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: rubberband
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: An ElasticSearch client with ThriftClient-like failover handling.
-test_files:
+test_files: 
 - spec/admin_spec.rb
 - spec/bulk_spec.rb
 - spec/connect_spec.rb