elasticsearch-rails 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6acf0a64b1de80131443fe7818364e938af6e466
-  data.tar.gz: f234b64f5d8eda579694406c216bffb37d08a991
+  metadata.gz: 056008177dc6455f594126c6d1402930964812d9
+  data.tar.gz: 07c8b5cfaaa536c67648df8d9d24ecee62f5eed4
 SHA512:
-  metadata.gz: efc3dc4312de0805bd9742029a4b1e09b1b03fffbb3460e4bfb25b7e897d21d7d3f3a5c5bb28f4606ec24438584d45d096a1d51c1f9cf2403508cfd42a3190f7
-  data.tar.gz: e50eee5092e29fa9c24fcf96ad64ccc791008ce1b2eb9d2df1e5ddad860150b468d66451ea77c79f220159aa3432d9e7c34d338e6c2a64394d5f549817dba93c
+  metadata.gz: d43e2b96ba3873e5b70652469d55a311537fba4cf9f020e6eec6638d816d3dc8e87c9b288b3fe9c1a5b285d1e57e022d09af23023d455902d9d8920e176a0395
+  data.tar.gz: a26d5d3fa224e6a7c7ff2752df9cf0c6ed8ec12a18a996c5d081ffa71437e3794fbede55cd010ab64647cd432953c7eedec45d52a4af967b222ee14d6f3359ed

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-# 0.1.7
+## 0.1.8
+
+* Added an example application template that loads settings from a file
+* Added missing require in the seeds.rb file for the expert template
+* Fixed double include of the aliased method (execute_without_instrumentation)
+* Fixed the error when getting the search_controller_test.rb asset in `03-expert.rb` template
+* Updated URLs for getting raw assets from Github in the `03-expert.rb` template
+
+## 0.1.7
 
 * Updated dependencies for the gem and example applications
 * Fixed various small errors in the `01-basic.rb` template

data/lib/elasticsearch/rails/instrumentation/publishers.rb

@@ -12,25 +12,23 @@ module Elasticsearch
 
           def self.included(base)
             base.class_eval do
-              alias_method :execute_without_instrumentation!, :execute!
-
-              def execute!
-                execute_with_instrumentation!
-              end
-
-              # Wrap `Search#execute!` and perform instrumentation
-              #
-              def execute_with_instrumentation!
-                ActiveSupport::Notifications.instrument "search.elasticsearch",
-                  name:   'Search',
-                  klass:  (self.klass.is_a?(Elasticsearch::Model::Proxy::ClassMethodsProxy) ? self.klass.target.to_s : self.klass.to_s),
-                  search: self.definition do
-                  execute_without_instrumentation!
-                end
+              unless method_defined?(:execute_without_instrumentation!)
+                alias_method :execute_without_instrumentation!, :execute!
+                alias_method :execute!, :execute_with_instrumentation!
               end
             end
           end
 
+          # Wrap `Search#execute!` and perform instrumentation
+          #
+          def execute_with_instrumentation!
+            ActiveSupport::Notifications.instrument "search.elasticsearch",
+              name:   'Search',
+              klass:  (self.klass.is_a?(Elasticsearch::Model::Proxy::ClassMethodsProxy) ? self.klass.target.to_s : self.klass.to_s),
+              search: self.definition do
+              execute_without_instrumentation!
+            end
+          end
         end
       end
     end

data/lib/elasticsearch/rails/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Rails
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/lib/rails/templates/03-expert.rb

@@ -157,7 +157,7 @@ CODE
 gsub_file "#{Rails::VERSION::STRING > '4' ? 'test/models' : 'test/unit' }/article_test.rb", %r{assert_equal 'foo', definition\[:query\]\[:multi_match\]\[:query\]}, "assert_equal 'foo', definition.to_hash[:query][:bool][:should][0][:multi_match][:query]"
 
 # copy_file File.expand_path('../searchable.rb', __FILE__), 'app/models/concerns/searchable.rb'
-get 'https://raw.github.com/elasticsearch/elasticsearch-rails/templates/elasticsearch-rails/lib/rails/templates/searchable.rb',
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/searchable.rb',
     'app/models/concerns/searchable.rb'
 
 insert_into_file "app/models/article.rb", after: "ActiveRecord::Base" do
@@ -186,7 +186,7 @@ gem "sidekiq"
 run "bundle install"
 
 # copy_file File.expand_path('../indexer.rb', __FILE__), 'app/workers/indexer.rb'
-get 'https://raw.github.com/elasticsearch/elasticsearch-rails/templates/elasticsearch-rails/lib/rails/templates/indexer.rb',
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/indexer.rb',
     'app/workers/indexer.rb'
 
 git add:    "Gemfile* app/workers/"
@@ -217,19 +217,19 @@ create_file 'app/controllers/search_controller.rb' do
   CODE
 end
 
-copy_file File.expand_path('../search_controller_test.rb', __FILE__), 'test/controllers/search_controller_test.rb'
-# get 'https://raw.github.com/elasticsearch/elasticsearch-rails/templates/elasticsearch-rails/lib/rails/templates/search_controller_test.rb',
+# copy_file File.expand_path('../search_controller_test.rb', __FILE__), 'test/controllers/search_controller_test.rb'
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/search_controller_test.rb',
     'test/controllers/search_controller_test.rb'
 
 route "get '/search', to: 'search#index', as: 'search'"
 gsub_file 'config/routes.rb', %r{root to: 'articles#index'$}, "root to: 'search#index'"
 
 # copy_file File.expand_path('../index.html.erb', __FILE__), 'app/views/search/index.html.erb'
-get 'https://raw.github.com/elasticsearch/elasticsearch-rails/templates/elasticsearch-rails/lib/rails/templates/index.html.erb',
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/index.html.erb',
     'app/views/search/index.html.erb'
 
 # copy_file File.expand_path('../search.css', __FILE__), 'app/assets/stylesheets/search.css'
-get 'https://raw.github.com/elasticsearch/elasticsearch-rails/templates/elasticsearch-rails/lib/rails/templates/search.css',
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/search.css',
     'app/assets/stylesheets/search.css'
 
 git add:    "app/controllers/ test/controllers/ config/routes.rb"
@@ -281,12 +281,12 @@ say_status  "Database", "Re-creating the database with data and importing into E
 puts        '-'*80, ''; sleep 0.25
 
 # copy_file File.expand_path('../articles.yml.gz', __FILE__), 'db/articles.yml.gz'
-get 'https://raw.github.com/elasticsearch/elasticsearch-rails/templates/elasticsearch-rails/lib/rails/templates/articles.yml.gz',
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/articles.yml.gz',
     'db/articles.yml.gz'
 
 remove_file 'db/seeds.rb'
 # copy_file File.expand_path('../seeds.rb', __FILE__), 'db/seeds.rb'
-get 'https://raw.github.com/elasticsearch/elasticsearch-rails/templates/elasticsearch-rails/lib/rails/templates/seeds.rb',
+get 'https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/seeds.rb',
     'db/seeds.rb'
 
 rake "db:reset"

data/lib/rails/templates/05-settings-files.rb

@@ -0,0 +1,75 @@
+#     $ rails new searchapp --skip --skip-bundle --template https://raw.githubusercontent.com/elastic/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/05-settings-files.rb
+
+# (See: 01-basic.rb, 02-pretty.rb, 03-expert.rb, 04-dsl.rb)
+
+append_to_file 'README.rdoc', <<-README
+
+== [5] Settings Files
+
+The `settings-files` template refactors the `Searchable` module to load the index settings
+from an external file.
+
+README
+
+git add:    "README.rdoc"
+git commit: "-m '[05] Updated the application README'"
+
+# ----- Setup the Searchable module to load settings from config/elasticsearch/articles_settings.json
+
+gsub_file "app/models/concerns/searchable.rb",
+    /index: { number_of_shards: 1, number_of_replicas: 0 }/,
+    "File.open('config/elasticsearch/articles_settings.json')"
+
+git add:    "app/models/concerns/searchable.rb"
+git commit: "-m 'Setup the Searchable module to load settings from file'"
+
+# ----- Copy the articles_settings.json file -------------------------------------------------------
+
+copy_file File.expand_path('../articles_settings.json', __FILE__), 'config/elasticsearch/articles_settings.json'
+
+git add:    "config/elasticsearch/articles_settings.json"
+git commit: "-m 'Create the articles settings file'"
+
+# ----- Temporarily set local repo for testing ----------------------------------------------------
+
+gsub_file "Gemfile",
+    %r{gem 'elasticsearch-model', git: 'git://github.com/elasticsearch/elasticsearch-rails.git'},
+    "gem 'elasticsearch-model', path: File.expand_path('../../../../../../elasticsearch-model', __FILE__)"
+
+# ----- Run bundle install ------------------------------------------------------------------------
+
+run "bundle install"
+
+# ----- Recreate the index ------------------------------------------------------------------------
+
+rake "environment elasticsearch:import:model CLASS='Article' BATCH=100 FORCE=y"
+
+# ----- Print Git log -----------------------------------------------------------------------------
+
+puts
+say_status  "Git", "Details about the application:", :yellow
+puts        '-'*80, ''
+
+git tag: "settings-files"
+git log: "--reverse --oneline HEAD...dsl"
+
+# ----- Start the application ---------------------------------------------------------------------
+
+unless ENV['RAILS_NO_SERVER_START']
+  require 'net/http'
+  if (begin; Net::HTTP.get(URI('http://localhost:3000')); rescue Errno::ECONNREFUSED; false; rescue Exception; true; end)
+    puts        "\n"
+    say_status  "ERROR", "Some other application is running on port 3000!\n", :red
+    puts        '-'*80
+
+    port = ask("Please provide free port:", :bold)
+  else
+    port = '3000'
+  end
+
+  puts  "", "="*80
+  say_status  "DONE", "\e[1mStarting the application. Open http://localhost:#{port}\e[0m", :yellow
+  puts  "="*80, ""
+
+  run  "rails server --port=#{port}"
+end

data/lib/rails/templates/articles_settings.json

@@ -0,0 +1 @@
+{ "number_of_shards": 1, "number_of_replicas": 0 }

data/lib/rails/templates/seeds.rb

@@ -53,4 +53,5 @@ end
 
 # Remove any jobs from the "elasticsearch" Sidekiq queue
 #
+require 'sidekiq/api'
 Sidekiq::Queue.new("elasticsearch").clear

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -291,7 +291,9 @@ files:
 - lib/rails/templates/02-pretty.rb
 - lib/rails/templates/03-expert.rb
 - lib/rails/templates/04-dsl.rb
+- lib/rails/templates/05-settings-files.rb
 - lib/rails/templates/articles.yml.gz
+- lib/rails/templates/articles_settings.json
 - lib/rails/templates/index.html.dsl.erb
 - lib/rails/templates/index.html.erb
 - lib/rails/templates/indexer.rb