rubberband 0.1.2 → 0.1.3

data/README.rdoc

@@ -5,7 +5,7 @@ An ElasticSearch client with ThriftClient-like failover handling.
 
 == License
 
-Copyright 2010 Grant Rodgers. See included LICENSE file.
+Copyright 2010-2011 Grant Rodgers. See included LICENSE file.
 
 == Features
 

data/lib/elasticsearch/transport/http.rb

@@ -6,12 +6,18 @@ module ElasticSearch
     class HTTP < Base
 
       DEFAULTS = {
-        :timeout => 5
+        :timeout => 5,
+        :protocol => 'http'
       }.freeze
 
       def initialize(server, options={})
         super
         @options = DEFAULTS.merge(@options)
+
+        # Make sure the server starts with a URI scheme.
+        unless @server =~ /^(([^:\/?#]+):)?\/\//
+          @server = "#{@options[:protocol]}://" + @server
+        end
       end
 
       def connect!

data/lib/elasticsearch/version.rb

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

data/spec/http_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ElasticSearch::Transport::HTTP do
+
+  context "no uri scheme" do
+    let(:server) { '127.0.0.1:9200' }
+    it 'should prepend the default scheme' do
+      described_class.new(server).instance_variable_get('@server').should =~ /^http:\/\//
+    end
+
+    it 'should make default protocol configurable' do
+      described_class.new(server, :protocol => 'https').instance_variable_get('@server').should =~ /^https:\/\//
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubberband
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Grant Rodgers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 Z
+date: 2011-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: patron
@@ -156,7 +156,6 @@ files:
 - .rspec
 - CONTRIBUTORS
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -190,6 +189,7 @@ files:
 - spec/bulk_spec.rb
 - spec/connect_spec.rb
 - spec/hits_spec.rb
+- spec/http_spec.rb
 - spec/index_spec.rb
 - spec/spec_helper.rb
 - spec/type_spec.rb
@@ -232,6 +232,7 @@ test_files:
 - spec/bulk_spec.rb
 - spec/connect_spec.rb
 - spec/hits_spec.rb
+- spec/http_spec.rb
 - spec/index_spec.rb
 - spec/spec_helper.rb
 - spec/type_spec.rb

data/Gemfile.lock

@@ -1,40 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rubberband (0.1.2)
-      patron
-      yajl-ruby
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.2)
-    mocha (0.9.12)
-    patron (0.4.12)
-    rake (0.9.2)
-    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.4.1)
-      simplecov-html (~> 0.4.3)
-    simplecov-html (0.4.3)
-    yajl-ruby (0.8.2)
-    yard (0.7.2)
-
-PLATFORMS
-  ruby
-
-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.7.0)