rubberband 0.1.5 → 0.1.6

data/Gemfile

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

data/README.rdoc

@@ -17,7 +17,15 @@ Copyright 2010-2011 Grant Rodgers. See included LICENSE file.
 
 Instantiate a client:
 
-  client = ElasticSearch.new('127.0.0.1:9200', :index => "twitter", :type => "tweet")
+    client = ElasticSearch.new('127.0.0.1:9200', :index => "twitter", :type => "tweet")
+
+Instantiate a client with multiple servers:
+  
+    client = ElasticSearch.new(['127.0.0.1:9200', '127.0.0.1:9201'])
+
+Instantiate a client using a Heroku URL (this sets the default index):
+
+    client = ElasticSearch.new(ENV['ELASTICSEARCH_URL'])
 
 API:
 

data/lib/elasticsearch.rb

@@ -8,7 +8,7 @@ require 'client'
 
 module ElasticSearch
 
-  def self.new(servers, options={})
-    ElasticSearch::Client.new(servers, options)
+  def self.new(servers_or_url, options={})
+    ElasticSearch::Client.new(servers_or_url, options)
   end
 end

data/lib/elasticsearch/client/abstract_client.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module ElasticSearch
   class AbstractClient
 
@@ -5,12 +7,31 @@ module ElasticSearch
       :transport => ElasticSearch::Transport::HTTP
     }.freeze
 
-    def initialize(servers, options={})
+    def initialize(servers_or_url, options={})
       @options = DEFAULTS.merge(options)
-      @server_list = Array(servers)
+      @server_list, @default_index, @default_type = extract_server_list_and_defaults(servers_or_url)
       @current_server = @server_list.first
     end
 
+    def extract_server_list_and_defaults(servers_or_url)
+      default_index = default_type = nil
+      servers = Array(servers_or_url).collect do |server|
+        uri = URI.parse(server)
+        _, default_index, default_type = uri.path.split("/")
+        uri.path = "" # is this expected behavior of URI? may be dangerous to rely on
+        uri.to_s
+      end
+      [servers, default_index, default_type]
+    end
+
+    def current_server
+      @current_server
+    end
+
+    def servers
+      @server_list
+    end
+
     def inspect
       "<#{self.class} @current_server=#{@current_server} @server_list=#{@server_list.inspect} @options=#{@options.inspect}>"
     end

data/lib/elasticsearch/client/admin_index.rb

@@ -55,7 +55,8 @@ module ElasticSearch
           execute(:alias_index, alias_ops, options)
         end
 
-        def get_aliases(index, options={})
+        def get_aliases(index=default_index, options={})
+          index, type, options = extract_scope(options)
           execute(:get_aliases, index, options)
         end
 
@@ -83,7 +84,7 @@ module ElasticSearch
           execute(:update_settings, index, settings, options)
         end
 
-        def get_settings(index, options={})
+        def get_settings(index=default_index, options={})
           execute(:get_settings, index, options)
         end
 

data/lib/elasticsearch/version.rb

@@ -1,3 +1,3 @@
 module ElasticSearch
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/rubberband.gemspec

@@ -26,12 +26,11 @@ Gem::Specification.new do |s|
   ]
   s.licenses = ["Apache v2"]
 
-  s.add_runtime_dependency("patron", [">= 0"])
+  s.add_runtime_dependency("patron", ["~> 0.4.12"])
   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.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

@@ -16,11 +16,15 @@ describe "basic ops" do
 
     @client.update_mapping({"tweet" => {:properties => {:bar => {:type => "string"}}}})
     @client.index_mapping(@first_index).should == {@first_index => {"tweet" => { "properties" => { "foo" => {"type" => "string" }, "bar" => { "type" => "string"}}}}}
+    # default should also work
+    @client.index_mapping.should == {@first_index => {"tweet" => { "properties" => { "foo" => {"type" => "string" }, "bar" => { "type" => "string"}}}}}
   end
 
   it "should get and update settings" do
     @client.update_settings("index" => {"refresh_interval" => 30})
     @client.get_settings(@first_index)[@first_index]["settings"].should include("index.refresh_interval" => "30")
+    # default should also work
+    @client.get_settings[@first_index]["settings"].should include("index.refresh_interval" => "30")
   end
 
   it "should get and update aliases" do
@@ -31,5 +35,9 @@ describe "basic ops" do
     result = @client.get_aliases(@first_index)
     result[@first_index]["aliases"].keys.should_not include("#{@first_index}-alias")
     result[@first_index]["aliases"].keys.should include("#{@first_index}-alias2")
+    # default should also work
+    result = @client.get_aliases
+    result[@first_index]["aliases"].keys.should_not include("#{@first_index}-alias")
+    result[@first_index]["aliases"].keys.should include("#{@first_index}-alias2")
   end
 end

data/spec/connect_spec.rb

@@ -9,9 +9,21 @@ describe "connect" do
       client = ElasticSearch.new(servers)
       client.nodes_info.should include('cluster_name')
     end
+
   end
 
   context "multiple servers" do
+    let(:servers) { ['http://127.0.0.1:9200', 'http://127.0.0.1:9201'] }
+
+    it 'should set servers array' do
+      client = ElasticSearch.new(servers, :auto_discovery => false)
+      client.servers.should == servers
+    end
+
+    it 'should choose a server to connect to' do
+      client = ElasticSearch.new(servers, :auto_discovery => false)
+      servers.should include(client.current_server)
+    end
   end
  
   context 'invalid server' do
@@ -29,4 +41,21 @@ describe "connect" do
       expect { ElasticSearch.new(servers).nodes_info }.to raise_error(ElasticSearch::ConnectionFailed)
     end
   end
+
+  context 'server url with index' do
+    let(:servers) { 'http://127.0.0.1:9200/test_index' }
+
+    it 'should set default_index' do
+      client = ElasticSearch.new(servers, :auto_discovery => false)
+      client.current_server.should == 'http://127.0.0.1:9200'
+      client.default_index.should == 'test_index'
+    end
+
+    it 'should set default_type' do
+      client = ElasticSearch.new(servers + "/test_type", :auto_discovery => false)
+      client.current_server.should == 'http://127.0.0.1:9200'
+      client.default_index.should == 'test_index'
+      client.default_type.should == 'test_type'
+    end
+  end
 end

metadata

@@ -1,156 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rubberband
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.1.6
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
 platform: ruby
-authors: 
+authors:
 - Grant Rodgers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-04 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: patron
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &16575640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.12
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *16575640
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &16575000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *16575000
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &16574340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *16574340
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &16573760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *16573760
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &16573180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *16573180
+- !ruby/object:Gem::Dependency
   name: simplecov
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &16572580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 3
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.8
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *16572580
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &16571980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *16571980
 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
@@ -195,39 +141,31 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: rubberband
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 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