From e9cf75071154bf92dc04326947a22dbc98bdfddf Mon Sep 17 00:00:00 2001 From: adham90 Date: Sat, 17 Jun 2017 01:13:57 +0200 Subject: [PATCH] :fire: Config Elasticsearch with ElasticsearchReader --- .gitignore | 2 ++ Gemfile | 10 ---------- elasticsearch_reader.gemspec | 9 ++++++++- lib/elasticsearch_reader.rb | 27 ++++++++++++--------------- spec/elasticsearch_reader_spec.rb | 4 ++++ spec/spec_helper.rb | 6 ++++++ 6 files changed, 32 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 8eb3b06..66ea033 100644 --- a/.gitignore +++ b/.gitignore @@ -8,5 +8,7 @@ /spec/reports/ /tmp/ +.byebug_history + # rspec failure tracking .rspec_status diff --git a/Gemfile b/Gemfile index 1a4f543..7f4f5e9 100644 --- a/Gemfile +++ b/Gemfile @@ -2,14 +2,4 @@ source 'https://rubygems.org' -# Specify your gem's dependencies in elasticsearch_reader.gemspec gemspec - -gem 'activesupport' - -gem 'guard' -gem 'guard-bundler', require: false -gem 'guard-rspec' - -gem 'redcarpet' -gem 'yard' diff --git a/elasticsearch_reader.gemspec b/elasticsearch_reader.gemspec index 3b4c8b6..e582ca6 100644 --- a/elasticsearch_reader.gemspec +++ b/elasticsearch_reader.gemspec @@ -23,7 +23,13 @@ Gem::Specification.new do |spec| spec.require_paths = ['lib'] spec.metadata['yard.run'] = 'yri' - spec.add_development_dependency 'bundler', '~> 1.14' + spec.add_development_dependency 'bundler' + spec.add_development_dependency 'byebug' + spec.add_development_dependency 'guard' + spec.add_development_dependency 'guard-rspec' + spec.add_development_dependency 'guard-bundler' + spec.add_development_dependency 'redcarpet' + spec.add_development_dependency 'yard' spec.add_development_dependency 'rake', '~> 10.0' spec.add_development_dependency 'rspec', '~> 3.0' spec.add_development_dependency 'rspec-its' @@ -31,6 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rspec-collection_matchers' spec.add_development_dependency 'appraisal' + spec.add_dependency 'activesupport' spec.add_dependency 'elasticsearch', '>= 5.0.0' spec.add_dependency 'elasticsearch-dsl' end diff --git a/lib/elasticsearch_reader.rb b/lib/elasticsearch_reader.rb index 766a5f2..50c7fa5 100644 --- a/lib/elasticsearch_reader.rb +++ b/lib/elasticsearch_reader.rb @@ -1,27 +1,24 @@ # frozen_string_literal: true -require 'active_support/concern' -require 'active_support/deprecation' -require 'active_support/json' -require 'active_support/log_subscriber' +require 'singleton' +require 'elasticsearch' -require 'active_support/core_ext/array/access' -require 'active_support/core_ext/array/wrap' -require 'active_support/core_ext/enumerable' -require 'active_support/core_ext/hash/reverse_merge' -require 'active_support/core_ext/numeric/time' -require 'active_support/core_ext/numeric/bytes' -require 'active_support/core_ext/object/blank' -require 'active_support/core_ext/object/inclusion' -require 'active_support/core_ext/string/inflections' +require 'active_support/core_ext/hash/keys' +require 'active_support/core_ext/module/delegation' -require 'singleton' require 'elasticsearch_reader/version' require 'elasticsearch_reader/config' +# You Know What It Is :D module ElasticsearchReader - # Your code goes here... + # ElasticsearchReader Main Class class << self + # Main elasticsearch-ruby client instance + # + def client + ::Elasticsearch::Client.new(configuration) + end + def config ElasticsearchReader::Config.instance end diff --git a/spec/elasticsearch_reader_spec.rb b/spec/elasticsearch_reader_spec.rb index ccf3671..dd1e39f 100644 --- a/spec/elasticsearch_reader_spec.rb +++ b/spec/elasticsearch_reader_spec.rb @@ -6,4 +6,8 @@ it 'has a version number' do expect(ElasticsearchReader::VERSION).not_to be nil end + + # TODO: write test cases for .client method + context '.client' do + end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cb00d6f..c5342bd 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,11 +3,17 @@ require 'bundler/setup' require 'elasticsearch_reader' require 'rspec/its' +require 'byebug' RSpec.configure do |config| # Enable flags like --only-failures and --next-failure config.example_status_persistence_file_path = '.rspec_status' + config.mock_with :rspec + config.order = :random + config.filter_run focus: true + config.run_all_when_everything_filtered = true + config.expect_with :rspec do |c| c.syntax = :expect end