esearch 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9b692861635b707f91c0371e112ecb747b3fe13
-  data.tar.gz: 9503faf8f4b82942200e6839050b2718b8d2050f
+  metadata.gz: acafe41081092b280de121a3e1aa8a6a3813c6c2
+  data.tar.gz: 099294a0951e736419480912c320339b909a1f7a
 SHA512:
-  metadata.gz: ad35c0ed296e7156c5ede3098b315b93567419a41a1fe91ef770120086472f8e61b4bcee9e8dec53ba1edf1576b5d89df616a2911fe31416f7119bd15246b06e
-  data.tar.gz: a3bae467d4bab97f35a0a29db064ca3e56751710fff870a11311b9b82a460ed35a8686c7f8cbdea239c0d1e086490dfaacf21b7289066e0d1bf5403c6d1a3e69
+  metadata.gz: cc1e336abde1a44a9f80d3317963eed6a6257cb3cd0f7e37cf32f067e312a071b8118d6dc3034cc958dd55d4c1db93d6f6de68f0a29e52bde0a0a2172d7832ad
+  data.tar.gz: 6067f7779ff252a74aefc24350ed215748be3382fc399c1d938d77b152e7d67fff3705be46829fe25f65e3ecd0ad70969d6d30976476d2fd02403603e3298435

data/.rubocop.yml

@@ -0,0 +1,6 @@
+AllCops:
+  Includes:
+    - 'Gemfile'
+  Excludes:
+    - 'Gemfile.devtools'
+    - 'vendor/**'

data/.travis.yml

@@ -3,13 +3,10 @@ script: 'bundle exec rake ci'
 services:
   - elasticsearch
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ruby-head
-  - jruby-19mode
-  - jruby-head
-  - rbx-19mode
+  - rbx
+  - jruby
 notifications:
   irc:
     channels:

data/Changelog.md

@@ -1,3 +1,8 @@
+# v0.2.2 2014-03-29
+
+* Bump dependencies
+* Full mutation coverage
+
 # v0.2.1 2014-01-06
 
 * Bump adamantium and multi_json deps.

data/Gemfile

@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'devtools', :git => 'https://github.com/rom-rb/devtools.git'
+gem 'devtools', git: 'https://github.com/rom-rb/devtools.git'
 eval File.read('Gemfile.devtools')

data/Gemfile.devtools

@@ -1,9 +1,10 @@
 # encoding: utf-8
 
 group :development do
-  gem 'rake',  '~> 10.1.0'
-  gem 'rspec', '~> 2.14.1'
-  gem 'yard',  '~> 0.8.7'
+  gem 'rake',       '~> 10.2.1'
+  gem 'rspec',      '~> 2.14.1'
+  gem 'rspec-core', '~> 2.14.8'
+  gem 'yard',       '~> 0.8.7.4'
 
   platform :rbx do
     gem 'rubysl-singleton', '~> 2.0.0'
@@ -11,23 +12,23 @@ group :development do
 end
 
 group :yard do
-  gem 'kramdown', '~> 1.3.0'
+  gem 'kramdown', '~> 1.3.3'
 end
 
 group :guard do
-  gem 'guard',         '~> 2.2.4'
+  gem 'guard',         '~> 2.6.0'
   gem 'guard-bundler', '~> 2.0.0'
-  gem 'guard-rspec',   '~> 4.2.0'
-  gem 'guard-rubocop', '~> 1.0.0'
+  gem 'guard-rspec',   '~> 4.2.8'
+  gem 'guard-rubocop', '~> 1.0.2'
 
   # file system change event handling
-  gem 'listen',     '~> 2.4.0'
+  gem 'listen',     '~> 2.7.1'
   gem 'rb-fchange', '~> 0.0.6', require: false
-  gem 'rb-fsevent', '~> 0.9.3', require: false
-  gem 'rb-inotify', '~> 0.9.0', require: false
+  gem 'rb-fsevent', '~> 0.9.4', require: false
+  gem 'rb-inotify', '~> 0.9.3', require: false
 
   # notification handling
-  gem 'libnotify',               '~> 0.8.0', require: false
+  gem 'libnotify',               '~> 0.8.2', require: false
   gem 'rb-notifu',               '~> 0.0.4', require: false
   gem 'terminal-notifier-guard', '~> 1.5.3', require: false
 end
@@ -36,23 +37,26 @@ group :metrics do
   gem 'coveralls', '~> 0.7.0'
   gem 'flay',      '~> 2.4.0'
   gem 'flog',      '~> 4.2.0'
-  gem 'reek',      '~> 1.3.2'
-  gem 'rubocop',   '~> 0.16.0'
+  gem 'reek',      '~> 1.3.7'
+  gem 'rubocop',   '~> 0.19.1'
   gem 'simplecov', '~> 0.8.2'
-  gem 'yardstick', '~> 0.9.7', git: 'https://github.com/dkubb/yardstick.git'
+  gem 'yardstick', '~> 0.9.9'
+
+  platforms :mri do
+    gem 'mutant',       '~> 0.5.9'
+    gem 'mutant-rspec', '~> 0.5.3'
+  end
 
   platforms :ruby_19, :ruby_20 do
-    gem 'mutant',          '~> 0.3.0', git: 'https://github.com/mbj/mutant.git'
-    gem 'unparser',        '~> 0.1.5', git: 'https://github.com/mbj/unparser.git'
     gem 'yard-spellcheck', '~> 0.1.5'
   end
 
   platform :rbx do
     gem 'json',               '~> 1.8.1'
-    gem 'racc',               '~> 1.4.10'
+    gem 'racc',               '~> 1.4.11'
     gem 'rubysl-logger',      '~> 2.0.0'
     gem 'rubysl-open-uri',    '~> 2.0.0'
-    gem 'rubysl-prettyprint', '~> 2.0.2'
+    gem 'rubysl-prettyprint', '~> 2.0.3'
   end
 end
 

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
-threshold: 12 
-total_score: 189
+threshold: 12
+total_score: 195

data/config/reek.yml

@@ -23,7 +23,7 @@ UncommunicativeMethodName:
   - !ruby/regexp /[0-9]$/
   - !ruby/regexp /[A-Z]/
 LongParameterList:
-  max_params: 2 
+  max_params: 2
   exclude:
   - Esearch::Request#initialize # 4 parameters, acceptable it is a DTO
   enabled: true
@@ -55,10 +55,11 @@ NestedIterators:
   max_allowed_nesting: 1
 TooManyStatements:
   max_statements: 5
-  exclude: []
+  exclude:
+  - Esearch::Connection#run
   enabled: true
 DuplicateMethodCall:
-  allow_calls: 
+  allow_calls:
   - util.debug
   exclude: []
   enabled: true
@@ -88,7 +89,7 @@ DataClump:
   max_copies: 1
   min_clump_size: 3
 ControlParameter:
-  exclude: 
+  exclude:
   - Esearch::Index#read
   enabled: true
 LongYieldList:

data/config/rubocop.yml

@@ -0,0 +1,81 @@
+inherit_from: ../.rubocop.yml
+
+# Avoid parameter lists longer than five parameters.
+ParameterLists:
+  Max: 5 # For DSL method. Subject specific exclude not available
+  CountKeywordArgs: true
+
+# Avoid more than `Max` levels of nesting.
+BlockNesting:
+  Max: 3
+
+# Align with the style guide.
+CollectionMethods:
+  PreferredMethods:
+    collect:  'map'
+    inject:   'reduce'
+    find:     'detect'
+    find_all: 'select'
+
+# Do not force public/protected/private keyword to be indented at the same
+# level as the def keyword. My personal preference is to outdent these keywords
+# because I think when scanning code it makes it easier to identify the
+# sections of code and visually separate them. When the keyword is at the same
+# level I think it sort of blends in with the def keywords and makes it harder
+# to scan the code and see where the sections are.
+AccessModifierIndentation:
+  Enabled: false
+
+MethodLength:
+  CountComments: false
+  Max: 17 # TODO: Bring down to 10
+
+RegexpLiteral: # I do not agree %r(\A) is more readable than /\A/
+  Enabled: false
+
+Eval:
+  Enabled: false # Mutant must use Kernel#eval to inject mutated source
+
+# Limit line length
+LineLength:
+  Max: 124  # TODO: lower to 79
+
+# Disable documentation checking until a class needs to be documented once
+Documentation:
+  Enabled: false
+
+# Do not favor modifier if/unless usage when you have a single-line body
+IfUnlessModifier:
+  Enabled: false
+
+# Mutant needs to define methods like def bar; end in specs
+Semicolon:
+  Enabled: false
+
+# Mutant needs to define multiple methods on same line in specs
+EmptyLineBetweenDefs:
+  Enabled: false
+
+# Mutant needs to define singleton methods like Foo.bar in specs
+ClassMethods:
+  Enabled: false
+
+# Allow case equality operator (in limited use within the specs)
+CaseEquality:
+  Enabled: false
+
+# Constants do not always have to use SCREAMING_SNAKE_CASE
+ConstantName:
+  Enabled: false
+
+# Not all trivial readers/writers can be defined with attr_* methods
+TrivialAccessors:
+  Enabled: false
+
+# And also have a differend opinion here
+AndOr:
+  Enabled: false
+
+# Allow empty lines around body
+EmptyLinesAroundBody:
+  Enabled: false

data/esearch.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name        = 'esearch'
-  gem.version     = '0.2.1'
+  gem.version     = '0.2.2'
   gem.authors     = [ 'Markus Schirp' ]
   gem.email       = [ 'mbj@schirp-dso.com' ]
   gem.description = 'Esearch driver for ruby'
@@ -16,11 +16,11 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files = %w[TODO]
 
   gem.add_runtime_dependency('descendants_tracker', '~> 0.0.1')
-  gem.add_runtime_dependency('concord',             '~> 0.1.0')
-  gem.add_runtime_dependency('faraday',             '~> 0.8.4')
-  gem.add_runtime_dependency('adamantium',          '~> 0.1.0')
-  gem.add_runtime_dependency('equalizer',           '~> 0.0.5')
-  gem.add_runtime_dependency('abstract_type',       '~> 0.0.5')
-  gem.add_runtime_dependency('multi_json',          '~> 1.8.2')
+  gem.add_runtime_dependency('concord',             '~> 0.1.4')
+  gem.add_runtime_dependency('faraday',             '~> 0.9.0')
+  gem.add_runtime_dependency('adamantium',          '~> 0.2.0')
+  gem.add_runtime_dependency('equalizer',           '~> 0.0.9')
+  gem.add_runtime_dependency('abstract_type',       '~> 0.0.7')
+  gem.add_runtime_dependency('multi_json',          '~> 1.9.2')
   gem.add_runtime_dependency('null_logger',         '~> 0.0.1')
 end

data/lib/esearch.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'multi_json'
 require 'faraday'
 require 'adamantium'
@@ -13,7 +15,7 @@ module Esearch
   class RemoteError < StandardError; end
   # Error raised when protocol is violated
   class ProtocolError < StandardError; end
-end
+end # Esearch
 
 require 'esearch/request'
 require 'esearch/mixin'

data/lib/esearch/cluster.rb

@@ -1,6 +1,9 @@
+# encoding: UTF-8
+
 module Esearch
   # Handle for an elasticsearch cluster
   class Cluster
+    PATH = Pathname.new('/').freeze
 
     include Adamantium::Flat, Concord.new(:connection)
 
@@ -55,11 +58,9 @@ module Esearch
     # @api private
     #
     def path
-      self.class::PATH
+      PATH
     end
 
-    PATH = Pathname.new('/')
-
     # Return handler for all indices
     #
     # @return [Indices::All]
@@ -81,5 +82,5 @@ module Esearch
       new(Connection.build(*args))
     end
 
-  end
-end
+  end # Cluster
+end # Esearch

data/lib/esearch/command.rb

@@ -1,9 +1,11 @@
+# encoding: UTF-8
+
 module Esearch
   # Abstract base class for elasticsearch commands
-  class Command 
+  class Command
     include Adamantium::Flat, AbstractType, Concord.new(:context)
 
-    EXPECTED_STATI    = [ 200 ].freeze
+    EXPECTED_STATI    = [200].freeze
     JSON_CONTENT_TYPE = 'application/json; charset=UTF-8'.freeze
 
     # Run command
@@ -86,7 +88,7 @@ module Esearch
     # Return expected response stati
     #
     # @return [Enumerable<Fixnum>]
-    # 
+    #
     # @api private
     #
     def expected_response_stati
@@ -112,7 +114,13 @@ module Esearch
     # @api private
     #
     def raise_status_error
-      raise ProtocolError, "expected response stati: #{expected_response_stati.inspect} but got: #{response.status}, remote message: #{remote_message.inspect}"
+      message = format(
+        'expected response stati: %s but got: %s, remote message: %s',
+        expected_response_stati,
+        response.status,
+        remote_message.inspect
+      )
+      fail ProtocolError, message
     end
 
     # Return remote message
@@ -137,7 +145,7 @@ module Esearch
     #
     def parsed_json
       unless json_content_type?
-        raise ProtocolError, "Expected json content type, but got: #{content_type.inspect}"
+        fail ProtocolError, "Expected json content type, but got: #{content_type.inspect}"
       end
       MultiJson.load(response.body)
     end
@@ -154,5 +162,5 @@ module Esearch
     end
     memoize :response
 
-  end
-end
+  end # Command
+end # Esearch

data/lib/esearch/command/cluster.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Esearch
   class Command
     # Base class for cluster commands
@@ -21,8 +23,8 @@ module Esearch
           Request.get('/_cluster/health', {}, options)
         end
 
-      end
+      end # Health
 
-    end
-  end
-end
+    end # Cluster
+  end # Command
+end # Esearch

data/lib/esearch/command/document.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module Esearch
   class Command
 
@@ -8,7 +10,7 @@ module Esearch
       class Index < self
         include Concord.new(:context, :document, :options)
 
-        EXPECTED_STATI = [ 200, 201 ].freeze
+        EXPECTED_STATI = [200, 201].freeze
         PRESENTER = Presenter::Document::Operation::Index
 
         FORCE_OPTIONS = {}
@@ -37,21 +39,21 @@ module Esearch
 
         # Document index update command
         class Update < self
-          EXPECTED_STATI = [ 200 ].freeze
-          FORCE_OPTIONS = { :op_type => :index }.freeze
+          EXPECTED_STATI = [200].freeze
+          FORCE_OPTIONS = { op_type: :index }.freeze
         end
 
         # Document index create command
         class Create < self
-          EXPECTED_STATI = [ 201 ].freeze
-          FORCE_OPTIONS = { :op_type => :create }.freeze
+          EXPECTED_STATI = [201].freeze
+          FORCE_OPTIONS = { op_type: :create }.freeze
         end
       end
 
       # Present get document command result
       class Get < self
-        
-        EXPECTED_STATI = [ 200, 404 ].freeze
+
+        EXPECTED_STATI = [200, 404].freeze
         PRESENTER = Presenter::Document::Get
 
         # Return result
@@ -68,8 +70,6 @@ module Esearch
           assert_success
           if response.status == 200
             presenter.new(parsed_json)
-          else
-            nil
           end
         end
 
@@ -104,8 +104,8 @@ module Esearch
           Request.delete(context_path)
         end
 
-      end
+      end # Delete
 
-    end
-  end
-end
+    end # Document
+  end # Command
+end # Esearch