elasticsearch-extensions 0.0.3 → 0.0.4

data/Rakefile

@@ -22,7 +22,7 @@ namespace :test do
   Rake::TestTask.new(:unit) do |test|
     Rake::Task['test:ci_reporter'].invoke if ENV['CI']
     test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/unit/**/*_test.rb"]
+    test.test_files = FileList["test/**/unit/**/*_test.rb"]
     # test.verbose = true
     # test.warning = true
   end
@@ -30,13 +30,13 @@ namespace :test do
   Rake::TestTask.new(:integration) do |test|
     Rake::Task['test:ci_reporter'].invoke if ENV['CI']
     test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/integration/**/*_test.rb"]
+    test.test_files = FileList["test/**/integration/**/*_test.rb"]
   end
 
   Rake::TestTask.new(:all) do |test|
     Rake::Task['test:ci_reporter'].invoke if ENV['CI']
     test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/unit/**/*_test.rb", "test/integration/**/*_test.rb"]
+    test.test_files = FileList["test/**/unit/**/*_test.rb", "test/**/unit/**/*_test.rb"]
   end
 
   Rake::TestTask.new(:profile) do |test|

data/elasticsearch-extensions.gemspec

@@ -18,13 +18,14 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency "elasticsearch", '~> 0.4.0'
+  s.add_dependency "elasticsearch", '~> 0.4'
   s.add_dependency "ansi"
 
-
   s.add_development_dependency "bundler", "> 1"
   s.add_development_dependency "rake"
 
+  s.add_development_dependency "awesome_print"
+
   s.add_development_dependency "shoulda-context"
   s.add_development_dependency "mocha"
   s.add_development_dependency "turn"
@@ -35,7 +36,5 @@ Gem::Specification.new do |s|
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
     s.add_development_dependency "simplecov"
     s.add_development_dependency "cane"
-    s.add_development_dependency "require-prof"
-    s.add_development_dependency "coveralls"
   end
 end

data/lib/elasticsearch/extensions/ansi/actions.rb

@@ -157,6 +157,33 @@ module Elasticsearch
           output.join("\n")
         end
 
+        # Display histogram facets
+        #
+        def display_histogram_facets(json, options={})
+          return unless json['facets']
+
+          output = [] << ''
+
+          facets = json['facets'].select { |name, values| values['_type'] == 'histogram' }
+          facets.each do |name, values|
+            max     = values['entries'].map { |t| t['count'] }.max
+            padding = 27
+            ratio   = ((Helpers.width)-padding)/max.to_f
+
+            histogram = values['entries']
+            histogram.each_with_index do |segment, i|
+              key = (i == 0) ? "<#{histogram[1]['key']}ms" : "#{segment['key']}ms"
+
+              output << key.rjust(7) +
+                        ' ' +
+                        '█' * (segment['count']*ratio).ceil +
+                        " [#{segment['count']}]"
+            end
+          end
+
+          output.join("\n")
+        end
+
         # Display statistical facets
         #
         def display_statistical_facets(json, options={})

data/lib/elasticsearch/extensions/ansi/response.rb

@@ -13,7 +13,7 @@ module Elasticsearch
         # representation of the Elasticsearch response for:
         #
         # * Search results (hits and highlights)
-        # * Facets (terms, statistical, date_histogram)
+        # * Facets (terms, statistical, histogram, date_histogram)
         # * Analyze API output
         # * Shard allocation
         #
@@ -31,7 +31,11 @@ module Elasticsearch
             Actions.send(m, self, options)
           end
 
-          output.compact.join("\n")
+          unless output.compact.empty?
+            output.compact.join("\n")
+          else
+            self.respond_to?(:awesome_inspect) ? self.awesome_inspect : self.inspect
+          end
         end
       end
 

data/lib/elasticsearch/extensions/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Extensions
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/test/ansi/unit/ansi_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+require 'elasticsearch/extensions/ansi'
+
+class Elasticsearch::Extensions::AnsiTest < Test::Unit::TestCase
+  context "The ANSI extension" do
+    setup do
+      @client = Elasticsearch::Client.new
+      @client.stubs(:perform_request).returns \
+        Elasticsearch::Transport::Transport::Response.new(200, { "ok" => true, "status" => 200, "name" => "Hit-Maker",
+            "version" => { "number"     => "0.90.7",
+                           "build_hash" => "abc123",
+                           "build_timestamp"=>"2013-11-13T12:06:54Z", "build_snapshot"=>false, "lucene_version"=>"4.5.1" },
+            "tagline"=>"You Know, for Search" })
+    end
+
+    should "wrap the response" do
+      response = @client.info
+
+      assert_instance_of Elasticsearch::Extensions::ANSI::ResponseBody, response
+      assert_instance_of Hash, response.to_hash
+    end
+
+    should "extend the response object with `to_ansi`" do
+      response = @client.info
+
+      assert_respond_to response, :to_ansi
+      assert_instance_of String, response.to_ansi
+    end
+
+    should "call the 'awesome_inspect' method when available and no handler found" do
+      @client.stubs(:perform_request).returns \
+        Elasticsearch::Transport::Transport::Response.new(200, {"index-1"=>{"aliases"=>{}}})
+      response = @client.indices.get_aliases
+
+      response.instance_eval do
+        def awesome_inspect; "---PRETTY---"; end
+      end
+      assert_equal '---PRETTY---', response.to_ansi
+    end
+
+    should "call `to_s` method when no pretty printer or handler found" do
+      @client.stubs(:perform_request).returns \
+        Elasticsearch::Transport::Transport::Response.new(200, {"index-1"=>{"aliases"=>{}}})
+      response = @client.indices.get_aliases
+
+      assert_equal '{"index-1"=>{"aliases"=>{}}}', response.to_ansi
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,20 @@
+RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
+
+exit(0) if RUBY_1_8
+
+require 'simplecov' and SimpleCov.start { add_filter "/test|test_/" } if ENV["COVERAGE"]
+
+require 'test/unit'
+require 'shoulda-context'
+require 'mocha/setup'
+require 'ansi/code'
+require 'turn' unless ENV["TM_FILEPATH"] || ENV["NOTURN"] || RUBY_1_8
+
+require 'elasticsearch/extensions'
+
+module Elasticsearch
+  module Test
+    class IntegrationTestCase < ::Test::Unit::TestCase
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,23 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: turn
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: turn
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,7 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -172,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -188,7 +172,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -204,7 +188,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: require-prof
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -220,7 +204,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -255,6 +239,8 @@ files:
 - lib/elasticsearch/extensions/ansi/helpers.rb
 - lib/elasticsearch/extensions/ansi/response.rb
 - lib/elasticsearch/extensions/version.rb
+- test/ansi/unit/ansi_test.rb
+- test/test_helper.rb
 homepage: ''
 licenses:
 - Apache 2
@@ -280,5 +266,7 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Extensions for the Elasticsearch Rubygem
-test_files: []
+test_files:
+- test/ansi/unit/ansi_test.rb
+- test/test_helper.rb
 has_rdoc: