rubberband 0.0.10 → 0.0.12

data/.gitignore

@@ -0,0 +1,19 @@
+# bundler
+.bundle
+
+# rcov generated
+coverage
+
+# jeweler generated
+pkg
+
+# yard generated
+doc
+.yardoc
+
+# cucumber generated
+.cuke_*.log
+cuke_*.log
+
+# ctags generated
+tags

data/Gemfile

@@ -1,13 +1,3 @@
 source "http://rubygems.org"
 
-gem "patron"
-gem "yajl-ruby"
-
-group :development do
-  gem "bundler", "~> 1.0.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
+gemspec

data/Gemfile.lock

@@ -1,16 +1,16 @@
+PATH
+  remote: .
+  specs:
+    rubberband (0.0.12)
+      patron
+      yajl-ruby
+
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.2)
-    git (1.2.5)
-    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)
+    mocha (0.9.12)
+    patron (0.4.11)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -19,10 +19,10 @@ GEM
     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)
+    simplecov (0.4.1)
+      simplecov-html (~> 0.4.3)
+    simplecov-html (0.4.3)
+    yajl-ruby (0.8.2)
     yard (0.6.4)
 
 PLATFORMS
@@ -30,10 +30,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
   mocha (~> 0.9.11)
-  patron
-  rspec (~> 2.4)
+  rspec (~> 2)
+  rubberband!
   simplecov (>= 0.3.8)
-  yajl-ruby
-  yard (~> 0.6)
+  yard (~> 0.6.0)

data/Rakefile

@@ -1,32 +1,5 @@
-require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-require './lib/elasticsearch/version'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "rubberband"
-  gem.version = ElasticSearch::Version::STRING
-  gem.homepage = "http://github.com/grantr/rubberband"
-  gem.license = "Apache v2.0"
-  gem.summary = %Q{An ElasticSearch client.}
-  gem.description = %Q{An ElasticSearch client with ThriftClient-like failover handling.}
-  gem.email = "grantr@gmail.com"
-  gem.authors = ["grantr"]
-
-  gem.add_runtime_dependency 'patron'
-  gem.add_runtime_dependency 'yajl-ruby'
-  gem.add_development_dependency 'rspec', '~> 2.4'
-end
-Jeweler::RubygemsDotOrgTasks.new
+Bundler::GemHelper.install_tasks
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/lib/elasticsearch/client/hits.rb

@@ -10,7 +10,6 @@ module ElasticSearch
         hit.merge!(hit["_source"]) if hit["_source"]
         hit["id"] ||= hit["_id"]
         super(hit)
-        @table.freeze
       end
 
       def attributes
@@ -76,7 +75,7 @@ module ElasticSearch
       private
 
       def populate(ids_only=false)
-        @hits = @response["hits"]["hits"].collect { |h| ids_only ? h["_id"] : Hit.new(h).freeze }
+        @hits = @response["hits"]["hits"].collect { |h| ids_only ? h["_id"] : Hit.new(h) }
       end
     end
   end

data/lib/elasticsearch/client/index.rb

@@ -36,7 +36,7 @@ module ElasticSearch
         
         hit = execute(:get, index, type, id, options)
         if hit
-          Hit.new(hit).freeze
+          Hit.new(hit)
         end
       end
 
@@ -78,7 +78,7 @@ module ElasticSearch
 
         response = execute(:search, index, type, query, search_options)
 
-        Hits.new(response, {:per_page => options[:per_page], :page => options[:page], :ids_only => options[:ids_only]}).freeze #ids_only returns array of ids instead of hits
+        Hits.new(response, {:per_page => options[:per_page], :page => options[:page], :ids_only => options[:ids_only]}) #ids_only returns array of ids instead of hits
       end
 
       #ids_only Return ids instead of hits
@@ -87,7 +87,7 @@ module ElasticSearch
         begin
           search_options = options.reject { |k, v| [:page, :per_page, :ids_only, :limit, :offset].include?(k) }
           response = execute(:scroll, scroll_id, options)
-          hits = Hits.new(response, { :ids_only => options[:ids_only] }).freeze
+          hits = Hits.new(response, { :ids_only => options[:ids_only] })
           if block_given? && !hits.empty?
             yield hits 
             scroll_id = hits.scroll_id

data/lib/elasticsearch/transport.rb

@@ -2,7 +2,7 @@ require "transport/base_protocol"
 require "transport/base"
 
 module ElasticSearch
-  class ConnectionFailed < RetryableError; end
+  class ConnectionFailed < FatalError; end
   class HostResolutionError < RetryableError; end
   class TimeoutError < RetryableError; end
   class RequestError < FatalError; end

data/lib/elasticsearch/transport/base_protocol.rb

@@ -166,7 +166,7 @@ module ElasticSearch
       def generate_uri(options)
         path = ""
         path << "/#{Array(options[:index]).collect { |i| escape(i.downcase) }.join(",")}" if options[:index] && !options[:index].empty?
-        path << "/" if options[:index] && options[:index].empty?
+        path << "/_all" if options[:index] && options[:index].empty?
         path << "/#{Array(options[:type]).collect { |t| escape(t) }.join(",")}" if options[:type] && !options[:type].empty?
         path << "/#{Array(options[:id]).collect { |id| escape(id) }.join(",")}" if options[:id] && !options[:id].to_s.empty?
         path << "/#{options[:op]}" if options[:op]

data/lib/elasticsearch/version.rb

@@ -1,9 +1,3 @@
 module ElasticSearch
-  module Version
-    MAJOR = 0
-    MINOR = 0
-    PATCH = 10
-
-    STRING = [MAJOR, MINOR, PATCH].compact.join('.')
-  end
+  VERSION = "0.0.12"
 end

data/rubberband.gemspec

@@ -1,119 +1,37 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "elasticsearch/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{rubberband}
-  s.version = "0.0.10"
+  s.name = "rubberband"
+  s.version = ElasticSearch::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["grantr"]
-  s.date = %q{2011-03-25}
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Grant Rodgers"]
+  s.email       = ["grantr@gmail.com"]
+  s.homepage    = "http://github.com/grantr/rubberband"
+  s.summary     = %q{An ElasticSearch client with ThriftClient-like failover handling.}
   s.description = %q{An ElasticSearch client with ThriftClient-like failover handling.}
-  s.email = %q{grantr@gmail.com}
+
+  s.rubyforge_project = "rubberband"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc",
-    "TODO"
-  ]
-  s.files = [
-    ".autotest",
-    ".rspec",
-    "CONTRIBUTORS",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "TODO",
-    "lib/elasticsearch.rb",
-    "lib/elasticsearch/client.rb",
-    "lib/elasticsearch/client/abstract_client.rb",
-    "lib/elasticsearch/client/admin_cluster.rb",
-    "lib/elasticsearch/client/admin_index.rb",
-    "lib/elasticsearch/client/auto_discovering_client.rb",
-    "lib/elasticsearch/client/default_scope.rb",
-    "lib/elasticsearch/client/hits.rb",
-    "lib/elasticsearch/client/index.rb",
-    "lib/elasticsearch/client/retrying_client.rb",
-    "lib/elasticsearch/encoding.rb",
-    "lib/elasticsearch/encoding/base.rb",
-    "lib/elasticsearch/encoding/json.rb",
-    "lib/elasticsearch/transport.rb",
-    "lib/elasticsearch/transport/base.rb",
-    "lib/elasticsearch/transport/base_protocol.rb",
-    "lib/elasticsearch/transport/http.rb",
-    "lib/elasticsearch/transport/memcached.rb",
-    "lib/elasticsearch/transport/thrift.rb",
-    "lib/elasticsearch/transport/thrift/elasticsearch_constants.rb",
-    "lib/elasticsearch/transport/thrift/elasticsearch_types.rb",
-    "lib/elasticsearch/transport/thrift/rest.rb",
-    "lib/elasticsearch/version.rb",
-    "lib/rubberband.rb",
-    "rubberband.gemspec",
-    "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}
-  s.licenses = ["Apache v2.0"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{An ElasticSearch client.}
-  s.test_files = [
-    "spec/admin_spec.rb",
-    "spec/bulk_spec.rb",
-    "spec/hits_spec.rb",
-    "spec/index_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/type_spec.rb"
+    "README.rdoc"
   ]
+  s.licenses = ["Apache v2"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.add_runtime_dependency("patron", [">= 0"])
+  s.add_runtime_dependency("yajl-ruby", [">= 0"])
+  s.add_development_dependency("rspec", ["~> 2"])
+  s.add_development_dependency("yard", ["~> 0.6"])
+  s.add_development_dependency("bundler", ["~> 1"])
+  s.add_development_dependency("simplecov", [">= 0.3.8"])
+  s.add_development_dependency("mocha", ["~> 0.9"])
 
-    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<bundler>, ["~> 1.0.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<bundler>, ["~> 1.0.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<bundler>, ["~> 1.0.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/connect_spec.rb

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

data/spec/hits_spec.rb

@@ -7,8 +7,6 @@ describe ElasticSearch::Api::Hit do
 
   its(:id) { should == response["_id"] }
 
-  its(:attributes) { should be_frozen }
-
   it "should set hit attributes" do
     subject.foo.should == response["_source"]["foo"]
   end
@@ -37,16 +35,6 @@ describe ElasticSearch::Api::Hits do
       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

metadata

@@ -1,20 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rubberband
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
-- grantr
+- Grant Rodgers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-25 00:00:00.000000000 -07:00
-default_executable: 
+date: 2011-04-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: &10610880 !ruby/object:Gem::Requirement
+  requirement: &20994820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10610880
+  version_requirements: *20994820
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &10609760 !ruby/object:Gem::Requirement
+  requirement: &20994280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,54 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10609760
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &10608320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *10608320
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &10598620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *10598620
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &10585740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.8
-  type: :development
-  prerelease: false
-  version_requirements: *10585740
+  version_requirements: *20994280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10582680 !ruby/object:Gem::Requirement
+  requirement: &20993760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2'
   type: :development
   prerelease: false
-  version_requirements: *10582680
+  version_requirements: *20993760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &10579800 !ruby/object:Gem::Requirement
+  requirement: &20993280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,61 +54,51 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *10579800
+  version_requirements: *20993280
 - !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &10578640 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: &20992760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: '1'
   type: :development
   prerelease: false
-  version_requirements: *10578640
-- !ruby/object:Gem::Dependency
-  name: patron
-  requirement: &10577460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *10577460
+  version_requirements: *20992760
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &10576200 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &20992240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 0.3.8
+  type: :development
   prerelease: false
-  version_requirements: *10576200
+  version_requirements: *20992240
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &10574660 !ruby/object:Gem::Requirement
+  name: mocha
+  requirement: &20991720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *10574660
+  version_requirements: *20991720
 description: An ElasticSearch client with ThriftClient-like failover handling.
-email: grantr@gmail.com
+email:
+- grantr@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
 - README.rdoc
-- TODO
 files:
 - .autotest
+- .gitignore
 - .rspec
 - CONTRIBUTORS
 - Gemfile
@@ -178,15 +134,15 @@ files:
 - rubberband.gemspec
 - spec/admin_spec.rb
 - spec/bulk_spec.rb
+- spec/connect_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
 licenses:
-- Apache v2.0
+- Apache v2
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -197,9 +153,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3653460652269889711
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -207,15 +160,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.6.2
+rubyforge_project: rubberband
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: An ElasticSearch client.
+summary: An ElasticSearch client with ThriftClient-like failover handling.
 test_files:
 - spec/admin_spec.rb
 - spec/bulk_spec.rb
+- spec/connect_spec.rb
 - spec/hits_spec.rb
 - spec/index_spec.rb
 - spec/spec_helper.rb
 - spec/type_spec.rb
+has_rdoc: