bonsai-elasticsearch-rails 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f48a0171a0973f1ef02157d1e92077986a080e6
-  data.tar.gz: 02b6d110cfa04774046c2ac8573240883db2d9ba
+  metadata.gz: fe04901a601b65d48908d1dd20fe2af94533dc25
+  data.tar.gz: 1bd87fbd2a8bb7bb19f176b2f613ae1b4ec2c7ec
 SHA512:
-  metadata.gz: 773acedb2d176d60ed96f6313aa3352d2295e7ea87da02d989b11bd241396cb59bedd0b68adc4aeb33c7903d20a3cac41a1e674a648c31e4a963daed41375b7c
-  data.tar.gz: 9b7ba251a37ddbee2f3ec8aaf739b258b8614c4c432c51c46227c7179db428849c685b34608bc770eadfb442a5ba96102699bb736f70b0ec35d0ea7f28a636c7
+  metadata.gz: bfee26a39ef0a57ea98c367dabea99f73552348856cd4270ce1966c5e5aa35a3546dcb4dc47c428b02a14df7032cec74e37de56ddfe5564b7b24cbf458d043e9
+  data.tar.gz: ba496d5cfe65ada972689e98dbc7809480f8b7dbe5b24750405ee2ba310395b58d2562604325efeea7a7fff1389155e79a3d2ff45270ed3bd5c02017487f359c

data/lib/bonsai-elasticsearch-rails.rb

@@ -1,13 +1,3 @@
-require 'elasticsearch/model'
-require 'elasticsearch/rails'
-
-Rails.logger = Logger.new(STDOUT) if Rails.logger.nil?
-url    = ENV['BONSAI_URL'] || ENV['ELASTICSEARCH_URL']
-
-unless url.nil?
-  url_safe = url.gsub(/\:[a-z0-9]{1,}@/, ":redacted@")
-  Rails.logger.info("Starting up a new Bonsai Elasticsearch client with url: #{url_safe}")
-  Elasticsearch::Model.client = Elasticsearch::Client.new url: url
-else
-  Rails.logger.warn('Could not find a `BONSAI_URL` environment variable with a cluster URL. The bonsai-elasticsearch-rails can not create an Elasticsearch client. Please contact support at: support@bonsai.io')
+if defined?(Rails)
+  require File.expand_path('bonsai/elasticsearch/rails/railtie', File.dirname(__FILE__))
 end

data/lib/bonsai/elasticsearch/rails/railtie.rb

@@ -0,0 +1,32 @@
+module Bonsai
+  module Elasticsearch
+    module Rails
+      class Railtie < ::Rails::Railtie
+
+        config.after_initialize do
+
+          require 'elasticsearch/model'
+          require 'elasticsearch/rails'
+
+          logger = ::Rails.logger
+          url = ENV['BONSAI_URL'] || ENV['ELASTICSEARCH_URL']
+
+          begin
+            if url && URI.parse(url)
+              filtered_url = url.sub(%r{:[^:@]+@}, ':FILTERED@')
+              logger.debug("Bonsai: Initializing default Elasticsearch client with #{filtered_url}")
+              ::Elasticsearch::Model.client = ::Elasticsearch::Client.new(
+                url: url
+              )
+            elsif ::Rails.env.production?
+              logger.debug("BONSAI_URL not present, proceeding with Elasticsearch defaults.")
+            end
+          rescue URI::InvalidURIError => e
+            logger.error("Elasticsearch cluster URL is invalid: #{e.message}")
+          end
+        end
+
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bonsai-elasticsearch-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Rob Sears
+- Nick Zadrozny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
@@ -99,11 +100,13 @@ description: |2
                             The cluster URL is available via the Bonsai dashboard.
 email:
 - rob@onemorecloud.com
+- nick@onemorecloud.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/bonsai-elasticsearch-rails.rb
+- lib/bonsai/elasticsearch/rails/railtie.rb
 homepage: https://github.com/omc/bonsai-elasticsearch-rails
 licenses:
 - MIT