load_balanced_tire 0.1 → 0.11

data/examples/rails-application-template.rb

@@ -27,17 +27,17 @@
 require 'rubygems'
 
 begin
-  require 'restclient'
+  require 'loadbalanceclient'
 rescue LoadError
   puts        "\n"
-  say_status  "ERROR", "Rubygem 'rest-client' not installed\n", :red
+  say_status  "ERROR", "Rubygem 'load_balance_client' not installed\n", :red
   puts        '-'*80
-  say_status  "", "gem install rest-client"
+  say_status  "", "gem install load_balance_client"
   puts        "\n"
 
   if yes?("Should I install it for you?", :bold)
-    say_status "gem", "install rest-client", :yellow
-    system "gem install rest-client"
+    say_status "gem", "install load_balance_client", :yellow
+    system "gem install load_balance_client"
   else
     exit(1)
   end
@@ -69,7 +69,7 @@ git :init
 git :add => '.'
 git :commit => "-m 'Initial commit: Clean application'"
 
-unless (RestClient.get('http://localhost:9200') rescue false)
+unless (LoadBalanceClient.get('http://localhost:9200') rescue false)
   COMMAND = <<-COMMAND.gsub(/^    /, '')
     curl -k -L -# -o elasticsearch-0.19.0.tar.gz \
       "http://github.com/downloads/elasticsearch/elasticsearch/elasticsearch-0.19.0.tar.gz"
@@ -232,7 +232,7 @@ puts        '-'*80, ''
 
 run "git log --reverse --pretty=format:'%Cblue%h%Creset | %s'"
 
-if (begin; RestClient.get('http://localhost:3000'); rescue Errno::ECONNREFUSED; false; rescue Exception; true; end)
+if (begin; LoadBalanceClient.get('http://localhost:3000'); rescue Errno::ECONNREFUSED; false; rescue Exception; true; end)
   puts        "\n"
   say_status  "ERROR", "Some other application is running on port 3000!\n", :red
   puts        '-'*80

data/examples/tire-dsl.rb

@@ -41,7 +41,7 @@ require 'tire'
 #### Prerequisites
 
 # We'll need a working and running _ElasticSearch_ server, of course. Thankfully, that's easy.
-( puts <<-"INSTALL" ; exit(1) ) unless (RestClient.get('http://localhost:9200') rescue false)
+( puts <<-"INSTALL" ; exit(1) ) unless (LoadBalanceClient.get('http://localhost:9200') rescue false)
 
  [ERROR] You don’t appear to have ElasticSearch installed. Please install and launch it with the following commands:
 

data/lib/tire.rb

@@ -1,4 +1,4 @@
-require 'rest_client'
+require 'load_balance_client'
 require 'multi_json'
 require 'active_model'
 require 'hashr'

data/lib/tire/configuration.rb

@@ -7,7 +7,7 @@ module Tire
     end
 
     def self.client(klass=nil)
-      @client = klass || @client || HTTP::Client::RestClient
+      @client = klass || @client || HTTP::Client::LoadBalanceClient
     end
 
     def self.wrapper(klass=nil)

data/lib/tire/http/client.rb

@@ -4,46 +4,46 @@ module Tire
 
     module Client
 
-      class RestClient
-        ConnectionExceptions = [::RestClient::ServerBrokeConnection, ::RestClient::RequestTimeout]
+      class LoadBalanceClient
+        ConnectionExceptions = [::LoadBalanceClient::ServerBrokeConnection, ::LoadBalanceClient::RequestTimeout]
 
         def self.get(url, data=nil)
-          perform ::RestClient::Request.new(:method => :get, :url => url, :payload => data).execute
+          perform ::LoadBalanceClient::Request.new(:method => :get, :url => url, :payload => data).execute
         rescue *ConnectionExceptions
           raise
-        rescue ::RestClient::Exception => e
+        rescue ::LoadBalanceClient::Exception => e
           Response.new e.http_body, e.http_code
         end
 
         def self.post(url, data)
-          perform ::RestClient.post(url, data)
+          perform ::LoadBalanceClient.post(url, data)
         rescue *ConnectionExceptions
           raise
-        rescue ::RestClient::Exception => e
+        rescue ::LoadBalanceClient::Exception => e
           Response.new e.http_body, e.http_code
         end
 
         def self.put(url, data)
-          perform ::RestClient.put(url, data)
+          perform ::LoadBalanceClient.put(url, data)
         rescue *ConnectionExceptions
           raise
-        rescue ::RestClient::Exception => e
+        rescue ::LoadBalanceClient::Exception => e
           Response.new e.http_body, e.http_code
         end
 
         def self.delete(url)
-          perform ::RestClient.delete(url)
+          perform ::LoadBalanceClient.delete(url)
         rescue *ConnectionExceptions
           raise
-        rescue ::RestClient::Exception => e
+        rescue ::LoadBalanceClient::Exception => e
           Response.new e.http_body, e.http_code
         end
 
         def self.head(url)
-          perform ::RestClient.head(url)
+          perform ::LoadBalanceClient.head(url)
         rescue *ConnectionExceptions
           raise
-        rescue ::RestClient::Exception => e
+        rescue ::LoadBalanceClient::Exception => e
           Response.new e.http_body, e.http_code
         end
 

data/lib/tire/search.rb

@@ -168,7 +168,7 @@ module Tire
           code = @response.code rescue nil
 
           if Configuration.logger.level.to_s == 'debug'
-            # FIXME: Depends on RestClient implementation
+            # FIXME: Depends on LoadBalanceClient implementation
             body = if @json
               defined?(Yajl) ? Yajl::Encoder.encode(@json, :pretty => true) : MultiJson.encode(@json)
             else

data/test/test_helper.rb

@@ -58,20 +58,20 @@ module Test::Integration
     begin; Object.send(:remove_const, :Rails); rescue; end
 
     begin
-      ::RestClient.get URL
+      ::LoadBalanceClient.get URL
     rescue Errno::ECONNREFUSED
       abort "\n\n#{'-'*87}\n[ABORTED] You have to run ElasticSearch on #{URL} for integration tests\n#{'-'*87}\n\n"
     end
 
-    ::RestClient.delete "#{URL}/articles-test"     rescue nil
-    ::RestClient.post   "#{URL}/articles-test", ''
+    ::LoadBalanceClient.delete "#{URL}/articles-test"     rescue nil
+    ::LoadBalanceClient.post   "#{URL}/articles-test", ''
     fixtures_path.join('articles').entries.each do |f|
       filename = f.to_s
       next if filename =~ /^\./
-      ::RestClient.put "#{URL}/articles-test/article/#{File.basename(filename, '.*')}",
+      ::LoadBalanceClient.put "#{URL}/articles-test/article/#{File.basename(filename, '.*')}",
                        fixtures_path.join('articles').join(f).read
     end
-    ::RestClient.post "#{URL}/articles-test/_refresh", ''
+    ::LoadBalanceClient.post "#{URL}/articles-test/_refresh", ''
 
     Dir[File.dirname(__FILE__) + '/models/**/*.rb'].each { |m| load m }
   end
@@ -87,7 +87,7 @@ module Test::Integration
       supermodel_articles
       dynamic_index
       model_with_nested_documents ].each do |index|
-        ::RestClient.delete "#{URL}/#{index}" rescue nil
+        ::LoadBalanceClient.delete "#{URL}/#{index}" rescue nil
     end
   end
 end

data/test/unit/configuration_test.rb

@@ -39,7 +39,7 @@ module Tire
       end
 
       should "return default client" do
-        assert_equal HTTP::Client::RestClient, Configuration.client
+        assert_equal HTTP::Client::LoadBalanceClient, Configuration.client
       end
 
       should "return nil as logger by default" do
@@ -65,7 +65,7 @@ module Tire
         assert_equal          'http://example.com', Configuration.url
         Configuration.reset
         assert_equal          'http://localhost:9200', Configuration.url
-        assert_equal          HTTP::Client::RestClient, Configuration.client
+        assert_equal          HTTP::Client::LoadBalanceClient, Configuration.client
       end
     end
 

data/test/unit/http_client_test.rb

@@ -6,41 +6,41 @@ module Tire
 
     class ClientTest < Test::Unit::TestCase
 
-      context "RestClient" do
+      context "LoadBalanceClient" do
 
         should "be default" do
-          assert_equal Client::RestClient, Configuration.client
+          assert_equal Client::LoadBalanceClient, Configuration.client
         end
 
         should "respond to HTTP methods" do
-          assert_respond_to Client::RestClient, :get
-          assert_respond_to Client::RestClient, :post
-          assert_respond_to Client::RestClient, :put
-          assert_respond_to Client::RestClient, :delete
-          assert_respond_to Client::RestClient, :head
+          assert_respond_to Client::LoadBalanceClient, :get
+          assert_respond_to Client::LoadBalanceClient, :post
+          assert_respond_to Client::LoadBalanceClient, :put
+          assert_respond_to Client::LoadBalanceClient, :delete
+          assert_respond_to Client::LoadBalanceClient, :head
         end
 
         should "not rescue generic exceptions" do
-          Client::RestClient.expects(:get).raises(RuntimeError, "Something bad happened in YOUR code")
+          Client::LoadBalanceClient.expects(:get).raises(RuntimeError, "Something bad happened in YOUR code")
 
           assert_raise(RuntimeError) do
-            Client::RestClient.get 'http://example.com'
+            Client::LoadBalanceClient.get 'http://example.com'
           end
         end
 
         should "not rescue ServerBrokeConnection errors" do
-          Client::RestClient.expects(:get).raises(RestClient::ServerBrokeConnection)
+          Client::LoadBalanceClient.expects(:get).raises(LoadBalanceClient::ServerBrokeConnection)
 
-          assert_raise(RestClient::ServerBrokeConnection) do
-            Client::RestClient.get 'http://example.com'
+          assert_raise(LoadBalanceClient::ServerBrokeConnection) do
+            Client::LoadBalanceClient.get 'http://example.com'
           end
         end
 
         should "not rescue RequestTimeout errors" do
-          Client::RestClient.expects(:get).raises(RestClient::RequestTimeout)
+          Client::LoadBalanceClient.expects(:get).raises(LoadBalanceClient::RequestTimeout)
 
-          assert_raise(RestClient::RequestTimeout) do
-            Client::RestClient.get 'http://example.com'
+          assert_raise(LoadBalanceClient::RequestTimeout) do
+            Client::LoadBalanceClient.get 'http://example.com'
           end
         end
 
@@ -52,7 +52,7 @@ module Tire
         end
 
         teardown do
-          Configuration.client Client::RestClient
+          Configuration.client Client::LoadBalanceClient
         end
 
         should "use POST method if request body passed" do

data/test/unit/search_test.rb

@@ -172,9 +172,9 @@ module Tire
       end
 
       should "print debugging information on exception and return false" do
-        ::RestClient::Request.any_instance.
+        ::LoadBalanceClient::Request.any_instance.
                               expects(:execute).
-                              raises(::RestClient::InternalServerError)
+                              raises(::LoadBalanceClient::InternalServerError)
         STDERR.expects(:puts)
 
         s = Search::Search.new('index')

data/tire.gemspec

@@ -4,7 +4,7 @@ require "tire/version"
 
 Gem::Specification.new do |s|
   s.name        = "load_balanced_tire"
-  s.version     = 0.1
+  s.version     = 0.11
   s.platform    = Gem::Platform::RUBY
   s.summary       = "Ruby client for ElasticSearch w/ load balancing via load_balance_client"
   s.homepage      = "http://github.com/themattray/tire"
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
   # = Library dependencies
   #
   s.add_dependency "rake"
-  #s.add_dependency "rest-client", "~> 1.6"
   s.add_dependency "load_balance_client"
   s.add_dependency "multi_json",  "~> 1.0"
   s.add_dependency "activemodel", ">= 3.0"
@@ -83,7 +82,7 @@ Gem::Specification.new do |s|
   --------------------------------------------------------------------------------
 
 #{Tire::CHANGELOG}
-    See the full changelog at <http://github.com/karmi/tire/commits/v#{Tire::VERSION}>.
+    See the full changelog at <http://github.com/themattray/tire/commits/0.1.1>.
 
   --------------------------------------------------------------------------------
   CHANGELOG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: load_balanced_tire
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.11'
   prerelease: 
 platform: ruby
 authors:
@@ -449,7 +449,7 @@ post_install_message: ! "=======================================================
   1.8 compatibility\n\n  Version 0.4.2\n  -------------\n  * Fixed incorrect handling
   of PUT requests in the Curb client\n  * Fixed, that blocks passed to `Tire::Index.new`
   or `Tire.index` losed the scope\n  * Added `Tire::Alias`, interface and DSL to manage
-  aliases as resources\n\n  See the full changelog at <http://github.com/karmi/tire/commits/v0.4.2>.\n\n--------------------------------------------------------------------------------\n"
+  aliases as resources\n\n  See the full changelog at <http://github.com/themattray/tire/commits/0.1.1>.\n\n--------------------------------------------------------------------------------\n"
 rdoc_options:
 - --charset=UTF-8
 require_paths: