elasticsearch-api 0.4.6 → 0.4.7

data/Rakefile

@@ -46,12 +46,12 @@ namespace :test do
 
     branches = `git --git-dir=#{__current__.join('../support/elasticsearch/.git')} --work-tree=#{__current__.join('../support/elasticsearch')} branch --no-color`
 
-    current_branch = branches
-      .split("\n")
-      .select { |b| b =~ /^\*/ }
-      .reject { |b| b =~ /detached/ }
-      .map    { |b| b.gsub(/^\*\s*/, '') }
-      .first
+    current_branch = branches.
+      split("\n").
+      select { |b| b =~ /^\*/ }.
+      reject { |b| b =~ /detached/ }.
+      map    { |b| b.gsub(/^\*\s*/, '') }.
+      first
 
     unless current_branch
       STDERR.puts "[!] Unable to determine current branch, defaulting to 'master'"
@@ -67,7 +67,7 @@ namespace :test do
 
     # Check if a test cluster is running
     begin
-      client = Elasticsearch::Client.new host: "localhost:#{ENV['TEST_CLUSTER_PORT'] || 9250}"
+      client = Elasticsearch::Client.new :host => "localhost:#{ENV['TEST_CLUSTER_PORT'] || 9250}"
       es_version_info = client.info['version']
       build_hash      = es_version_info['build_hash']
       cluster_running = true

data/elasticsearch-api.gemspec

@@ -27,7 +27,10 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "elasticsearch"
   s.add_development_dependency "elasticsearch-transport"
-  s.add_development_dependency "elasticsearch-extensions"
+
+  if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
+    s.add_development_dependency "elasticsearch-extensions"
+  end
 
   s.add_development_dependency "ansi"
   s.add_development_dependency "shoulda-context"
@@ -38,7 +41,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "ci_reporter"
 
   # Gems for testing integrations
-  s.add_development_dependency "jbuilder"
   s.add_development_dependency "jsonify"
   s.add_development_dependency "hashie"
 
@@ -51,6 +53,7 @@ Gem::Specification.new do |s|
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
     s.add_development_dependency "ruby-prof"
+    s.add_development_dependency "jbuilder"
     s.add_development_dependency "escape_utils"
     s.add_development_dependency "simplecov"
     s.add_development_dependency "cane"

data/lib/elasticsearch/api/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module API
-    VERSION = "0.4.6"
+    VERSION = "0.4.7"
   end
 end

data/test/test_helper.rb

@@ -24,9 +24,11 @@ require 'require-prof' if ENV["REQUIRE_PROF"]
 require 'elasticsearch/api'
 RequireProf.print_timing_infos if ENV["REQUIRE_PROF"]
 
-require 'elasticsearch/extensions/test/cluster'
-require 'elasticsearch/extensions/test/startup_shutdown'
-require 'elasticsearch/extensions/test/profiling'
+if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
+  require 'elasticsearch/extensions/test/cluster'
+  require 'elasticsearch/extensions/test/startup_shutdown'
+  require 'elasticsearch/extensions/test/profiling'
+end
 
 module Elasticsearch
   module Test

data/test/unit/json_builders_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-require 'jbuilder'
+require 'jbuilder' if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
 require 'jsonify'
 
 module Elasticsearch
@@ -31,7 +31,7 @@ module Elasticsearch
 
           subject.search :body => json
         end
-      end
+      end if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
 
       context "Jsonify" do
         subject { FakeClient.new }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-api
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -220,7 +220,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jbuilder
+  name: jsonify
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -236,7 +236,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jsonify
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -252,7 +252,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -268,7 +268,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: