elasticsearch-rails 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGQ1YzEyMTY2NDgyYjg1YjU3ZDFkYTZkMjIyZmVkNzdmMjBmMTgxZA==
-  data.tar.gz: !binary |-
-    ZDU0MTUzZDc1NzlhOGYyYzE3ODRlNTlkZGVlMjdkNjAyOTlhZjYzMw==
+SHA1:
+  metadata.gz: 702e99d736daeaca35a28b5c9b0410c22076eee2
+  data.tar.gz: f0bcd67eb479b7eff5b9324ca5b3c646dc6931c9
 SHA512:
-  metadata.gz: !binary |-
-    MWMwMjg4MGU4NWU4OWZlMTJlNjI4M2UwMTM0ZDY3NjQyNWJiNmEwMDZmOWQy
-    OWNmYzU2NTFhNzkyMmZhZDU1YzA3ZThlMmZmMzYzZWJlMjU1NWM5MTJkNTUx
-    MzU1OGExYmZjMWZjYjRhZmNjODRhOTllNjg3NzM1NWRmMjRjNjU=
-  data.tar.gz: !binary |-
-    NzlkMjM5ZjlhMTI4YTM2OTRkOTVjN2IwZmE1MzRhNzk3OWNiZDE1NjI2NTRh
-    YzcyMjVkOTU5ZmI2OThlYWE4NTYzYTVmZjk2OTQxMzZiNjhiNzBiODkyM2Yy
-    YzMyYWU5ZjIxOWI2YjNkNTRkN2IxNTI0NDQyMGI2NmY4ZGQ5MTk=
+  metadata.gz: 8191b30a62f1f5dffa9d4efa6b0a0c1b08beb9992f8cc52036c427886f7da1ff51e191a8e39df62e5f29c63d0495c47860d7c2724050a119eb7534adf2f0c08a
+  data.tar.gz: 91710af6b69d1bf1360b01994949f7e6cb5515006cb78242c9986bf66c7acc69a943563d841dec322d7cc4a93e556ec9f809441318f6501e7e7f073f836fe887

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.6
+
+* Fixed errors in templates for the Rails example applications
+* Fixed errors in the importing Rake task
+* Refactored and updated the instrumentation support to allow integration with `Persistence::Model`
+
 ## 0.1.5
 
 * Fixed an exception when no suggestions were returned in the `03-expert` example application template

data/elasticsearch-rails.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "lograge"
 
-  s.add_development_dependency "minitest", "~> 4"
+  s.add_development_dependency "minitest", "~> 4.2"
   s.add_development_dependency "test-unit" if defined?(RUBY_VERSION) && RUBY_VERSION > '2.2'
   s.add_development_dependency "shoulda-context"
   s.add_development_dependency "mocha"

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

@@ -9,22 +9,28 @@ module Elasticsearch
         # @see http://api.rubyonrails.org/classes/ActiveSupport/Notifications.html
         #
         module SearchRequest
-          extend ActiveSupport::Concern
 
-          included do
-            alias_method_chain :execute!, :instrumentation
-          end
+          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!
+              # 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
       end
     end

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

@@ -14,7 +14,11 @@ module Elasticsearch
 
           Elasticsearch::Model::Searching::SearchRequest.class_eval do
             include Elasticsearch::Rails::Instrumentation::Publishers::SearchRequest
-          end
+          end if defined?(Elasticsearch::Model::Searching::SearchRequest)
+
+          Elasticsearch::Persistence::Model::Find::SearchRequest.class_eval do
+            include Elasticsearch::Rails::Instrumentation::Publishers::SearchRequest
+          end if defined?(Elasticsearch::Persistence::Model::Find::SearchRequest)
 
           ActiveSupport.on_load(:action_controller) do
             include Elasticsearch::Rails::Instrumentation::ControllerRuntime

data/lib/elasticsearch/rails/lograge.rb

@@ -21,17 +21,21 @@ module Elasticsearch
           require 'elasticsearch/rails/instrumentation/log_subscriber'
           require 'elasticsearch/rails/instrumentation/controller_runtime'
 
-          config.lograge.custom_options = lambda do |event|
-            { es: event.payload[:elasticsearch_runtime].to_f.round(2) }
-          end
-
           Elasticsearch::Model::Searching::SearchRequest.class_eval do
             include Elasticsearch::Rails::Instrumentation::Publishers::SearchRequest
-          end
+          end if defined?(Elasticsearch::Model::Searching::SearchRequest)
+
+          Elasticsearch::Persistence::Model::Find::SearchRequest.class_eval do
+            include Elasticsearch::Rails::Instrumentation::Publishers::SearchRequest
+          end if defined?(Elasticsearch::Persistence::Model::Find::SearchRequest)
 
           ActiveSupport.on_load(:action_controller) do
             include Elasticsearch::Rails::Instrumentation::ControllerRuntime
           end
+
+          config.lograge.custom_options = lambda do |event|
+            { es: event.payload[:elasticsearch_runtime].to_f.round(2) }
+          end
         end
       end
 

data/lib/elasticsearch/rails/tasks/import.rb

@@ -22,7 +22,7 @@ namespace :elasticsearch do
   task :import => 'import:model'
 
   namespace :import do
-    desc <<-DESC.gsub(/    /, '')
+    import_model_desc = <<-DESC.gsub(/    /, '')
       Import data from your model (pass name as CLASS environment variable).
 
         $ rake environment elasticsearch:import:model CLASS='MyModel'
@@ -39,6 +39,7 @@ namespace :elasticsearch do
       Pass an ActiveRecord scope to limit the imported records:
         $ rake environment elasticsearch:import:model CLASS='Article' SCOPE='published'
     DESC
+    desc import_model_desc
     task :model do
       if ENV['CLASS'].to_s == ''
         puts '='*90, 'USAGE', '='*90, import_model_desc, ""
@@ -59,7 +60,7 @@ namespace :elasticsearch do
         rescue NoMethodError; end
       end
 
-      total_errors = klass.import force:      ENV.fetch('FORCE', false),
+      total_errors = klass.__elasticsearch__.import force:      ENV.fetch('FORCE', false),
                                   batch_size: ENV.fetch('BATCH', 1000).to_i,
                                   index:      ENV.fetch('INDEX', nil),
                                   type:       ENV.fetch('TYPE',  nil),

data/lib/elasticsearch/rails/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Rails
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/lib/rails/templates/02-pretty.rb

@@ -218,7 +218,7 @@ insert_into_file 'app/views/articles/index.html.erb', after: '</table>' do
   CODE
 end
 
-generate "kaminari:views", "bootstrap", "--force"
+generate "kaminari:views", "bootstrap2", "--force"
 
 gsub_file 'app/views/kaminari/_paginator.html.erb', %r{<ul>}, '<ul class="pagination">'
 

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

@@ -1,4 +1,4 @@
-#     $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/03-complex.rb
+#     $ rails new searchapp --skip --skip-bundle --template https://raw.github.com/elasticsearch/elasticsearch-rails/master/elasticsearch-rails/lib/rails/templates/03-expert.rb
 
 # (See: 01-basic.rb, 02-pretty.rb)
 

metadata

@@ -1,265 +1,265 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: lograge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: require-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby on Rails integrations for Elasticsearch.
@@ -271,7 +271,7 @@ extra_rdoc_files:
 - README.md
 - LICENSE.txt
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -305,17 +305,17 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []