elastic_queue 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6e669dd2eb27b5ca9f483235d30ad5ec96d084b
-  data.tar.gz: 9d52ff8a5a841d10fe77b5a74786eea687bbb494
+  metadata.gz: f4c5e7969e666d97393d4dda88afce326f467ef2
+  data.tar.gz: cd5ebc5dbed6cbee1b642b594c7b1bbd130977ef
 SHA512:
-  metadata.gz: 24f5f08d5e042d2c4bfe8d7d063d2f2b3aebd81251d2fb494dc7c1088e809b9d5a99f296f7feaeb1260d7052e392fdf0c1ade304af51ec4a90dc0b7ba9ee1007
-  data.tar.gz: 6b548e8ffe120b156ab211d8260acca28f2ebfb6e2ed3ef873f4492cdefc3984d70e080c506addf3298c3eedb657c8cc424d9cfca7441c689de861b4388c6c64
+  metadata.gz: 30b1d172e4eff5a61a59ec5e95c16761dda768ce369bf319806a9fb2535d3321012530cc61784930e8e6e4276f8740f731bb84ab333c9b6d87141497835a12c5
+  data.tar.gz: 87df7401e65a5453a1f9c0d338a2f8c23ea39c1d545fb399930a72247d191af0c7a255500564dd68641bc9930cb75718757dea6596f1616586afb626fc74a62b

data/lib/elastic_queue/railtie.rb

@@ -1,12 +1,14 @@
 module ElasticQueue
   class Railtie < ::Rails::Railtie
     initializer 'ElasticQueue options initializer', after: :after_initialize do
-      elastic_queue_default_options = { elasticsearch_hosts: [{ host: 'localhost', port: 9200, protocol: 'http' }] }.with_indifferent_access
+      default_config_options = { elasticsearch_hosts: [{ host: 'localhost', port: 9200, protocol: 'http' }] }.with_indifferent_access
       if defined?(Rails) && File.exists?(Rails.root.join('config', 'elastic_queue.yml').to_s)
-        ElasticQueue::OPTIONS = elastic_queue_default_options.merge(YAML.load_file(Rails.root.join('config', 'elastic_queue.yml').to_s)[Rails.env].with_indifferent_access)
-      else
-        ElasticQueue::OPTIONS = elastic_queue_default_options
+        config_options = YAML.load_file(Rails.root.join('config', 'elastic_queue.yml').to_s)[Rails.env]
+        unless config_options.nil?
+          ElasticQueue::OPTIONS = default_config_options.merge(config_options.with_indifferent_access)
+        end
       end
+        ElasticQueue::OPTIONS = default_config_options unless defined? ElasticQueue::OPTIONS
     end
   end
 end

data/lib/elastic_queue/version.rb

@@ -1,3 +1,3 @@
 module ElasticQueue
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_queue
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ruth Thompson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport