chewy 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bfe79b7a76d86426e6b1f67389d386e85ee33bc
-  data.tar.gz: 65102eba1137183f68dc167ef1c91f77abae9758
+  metadata.gz: f677d05031da075087c0fb9942f31741766ce341
+  data.tar.gz: 5759eead057c0e533a988ce96e5dd1c77ab9ccd2
 SHA512:
-  metadata.gz: 6b366d1a609fdd330e46e5f4937187e3fdbc697c65869927deb578d7bb58ea170c3e4fcb6bf3a178fba0a29fe8c5c560e3229314da70b2b180ee19eed9084b9c
-  data.tar.gz: 7e76c1cc833e2884b1c48d3c1dbb197a8bae08a90b099ea87aea5ffb36249a51f08ca37bb1f575f3b6786551c3897b9cb4e443764cc46bd86904e096ad4f3126
+  metadata.gz: 76d493cea3e5fd380fc455e53fe886a16e48a1d1050f619668617f719d7721dd3cd93ae1b815bec5785142a5bf7f3d327e3dbc2e4db3a8a8cee521ed61ee93fc
+  data.tar.gz: 3091372369882b60d33b5b2ca8928a81ff1b9e7f5c7d8ff38fb0518bbb4a8d4e431746594e78d34a193c58c4aebff0bc245bc6be2ee27f046ca863e2988027a8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # master
 
+# Version 0.4.1
+
+  * config/chewy.yml ERB support.
+
 # Version 0.4.0
 
   * Changed `update_index` matcher behavior. Now it compare array attributes position-independantly.

data/README.md

@@ -7,8 +7,6 @@ Chewy is ODM and wrapper for official elasticsearch client (https://github.com/e
 
 ## Why chewy?
 
-
-
 * Multi-model indexes.
 
   Index classes are independant from ORM/ODM models. Now implementing, e.g. cross-model autocomplete is much easier. You can just define index and work with it in object-oriented style. You can define several types for index - one per indexed model.
@@ -64,7 +62,7 @@ The result config merges both hashes. Client options are passed as is to Elastic
 
 ```ruby
   Chewy.configuration = {prefix: 'testing'}
-  UsersIndex.index_name # => 'testing_users'
+  UsersIndex.index_name # => 'test_users'
 ```
 
 Also logger might be set explicitly:
@@ -73,6 +71,8 @@ Also logger might be set explicitly:
 Chewy.logger = Logger.new
 ```
 
+See [config.rb](lib/chewy/config.rb) for more details.
+
 ### Index definition
 
 1. Create `/app/chewy/users_index.rb`
@@ -229,7 +229,9 @@ See [actions.rb](lib/chewy/index/actions.rb) for more details.
 
 ### Observing strategies
 
-There are 3 strategies for index updating: do not update index at all, update right after save and cummulative update. The first is by default.
+There are 3 strategies for index updating: do not update index at all, update right after save and cumulative update. The first is by default.
+
+**WARN: It is preferred to use `Chewy.atomic` block in most cases due to performance restrictions of the urgent updates!**
 
 #### Updating index on-demand
 

data/lib/chewy/config.rb

@@ -63,6 +63,49 @@ module Chewy
     #
     repository :char_filter
 
+    # Chewy core configurations. There is two ways to set it up:
+    # use `Chewy.configuration=` method or, for Rails application,
+    # create `config/chewy.yml` file. Btw, `config/chewy.yml` supports
+    # ERB the same way as ActiveRecord's config.
+    #
+    # Configuration options:
+    #
+    #   1. Chewy client options. All the options Elasticsearch::Client
+    #      supports.
+    #
+    #        test:
+    #          host: 'localhost:9250'
+    #
+    #   2. Chewy self-configuration:
+    #
+    #      :prefix - used as prefix for any index created.
+    #
+    #        test:
+    #          host: 'localhost:9250'
+    #          prefix: test<%= ENV['TEST_ENV_NUMBER'] %>
+    #
+    #      Then UsersIndex.index_name will be "test42_users"
+    #      in case TEST_ENV_NUMBER=42
+    #
+    #      :wait_for_status - if this option set - chewy actions such
+    #      as creating or deleting index, importing data will wait for
+    #      the status specified. Extremely useful for tests under havy
+    #      indexes manipulations.
+    #
+    #        test:
+    #          host: 'localhost:9250'
+    #          wait_for_status: green
+    #
+    #   3. Index settings. All the possible ElasticSearch index settings.
+    #      Will be merged as defaults with index settings on every index
+    #      creation.
+    #
+    #        test: &test
+    #        host: 'localhost:9250'
+    #        index:
+    #          number_of_shards: 1
+    #          number_of_replicas: 0
+    #
     def configuration
       options = @configuration.deep_symbolize_keys.merge(yaml_options)
       options.merge!(logger: logger) if logger
@@ -105,7 +148,10 @@ module Chewy
       @yaml_options ||= begin
         if defined?(Rails)
           file = Rails.root.join(*%w(config chewy.yml))
-          YAML.load_file(file)[Rails.env].try(:deep_symbolize_keys) if File.exists?(file)
+          if File.exists?(file)
+            yaml = ERB.new(File.read(file)).result
+            YAML.load(yaml)[Rails.env].try(:deep_symbolize_keys)
+          end
         end || {}
       end
     end

data/lib/chewy/version.rb

@@ -1,3 +1,3 @@
 module Chewy
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chewy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - pyromaniac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake