elastic_record 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a714ff20d541076d35d98b247d8c17ba209e3457
-  data.tar.gz: da6686b3b17d505b6feee40df4e5d2117a2b5d4d
+  metadata.gz: f659725ca3b959336aaf4a3b8e5964ad5bb9a645
+  data.tar.gz: ecd8c9c725a0e20d9d36f9273fb8cb211f173f1d
 SHA512:
-  metadata.gz: 4fb0d680f0fe4d5e6a04a36d7db82ddb4973b11affa10da5507c4c4dc6c8d35cacf536809003591d1a98d64b3d5b38f299e0b5954c169e7a77b2aca7312bacaa
-  data.tar.gz: 42d4f1e6f844186ec743818c983936d32cd95d8d7de3eddfce780bab94c1f267c95762b5aa108ec34f4c90e052eeffab4ff523caae9bacc3c4c9fd3cbf6bbbaf
+  metadata.gz: 6185d059786865130f6f51128dd99523d01762fd46752874c1b253d0c1794b90ecf77f06ac1a1394f29588b259db107e2b1da33cc1c67849c8d3edc391584986
+  data.tar.gz: b4ca5642f7db62e9a6cdf619c6808802f5adddbf079f1900f7387de0753a459b4737d7447080c1cffd4c6c4915460be74be690ec95afbe4d3d608c2d35db65ae

data/.gitignore

@@ -1 +1,2 @@
-Gemfile.lock
+Gemfile.lock
+test/dummy/log/*.log

data/.travis.yml

@@ -1,5 +1,8 @@
 services:
   - elasticsearch
+before_script:
+  - bundle exec rake app:db:create
+  - bundle exec rake app:index:reset
 rvm:
   - 2.1.2
 env:

data/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'activerecord', '~> 4.1.0'
+gem 'rails', '~> 4.2.0'
 gem 'fakeweb'
 gem 'rake'
+gem 'arelastic', path: '~/code/arelastic'
 
 gem 'mysql2'
 gem 'pg'

data/Rakefile

@@ -1,13 +1,21 @@
-require 'rake'
-require 'rake/testtask'
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
 
-desc 'Default: run unit tests.'
-task default: :test
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
 
-desc 'Test.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  t.pattern = 'test/elastic_record/**/*_test.rb'
-  t.verbose = true
-end
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
+task default: :test

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '2.0.1'
+  s.version = '2.0.2'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 
@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test}/*`.split("\n")
 
-  s.add_dependency 'arelastic', '>= 0.6.0'
+  s.add_dependency 'arelastic', '>= 0.7.0'
   s.add_dependency 'activemodel'
 end

data/lib/elastic_record/index/configurator.rb

@@ -9,6 +9,10 @@ module ElasticRecord
       def property(name, options)
         index.mapping[:properties][name.to_sym] = options
       end
+
+      def has_percolator!
+        index.has_percolator = true
+      end
     end
   end
-end
+end

data/lib/elastic_record/index/percolator.rb

@@ -2,9 +2,6 @@ module ElasticRecord
   class Index
     module Percolator
       def create_percolator(name, elastic_query)
-        unless exists? percolator_name
-          create percolator_name
-        end
         connection.json_put "/#{percolator_name}/.percolator/#{name}", elastic_query
       end
 
@@ -23,7 +20,7 @@ module ElasticRecord
 
       def percolate(document)
         hits = connection.json_get("/#{percolator_name}/#{type}/_percolate", 'doc' => document)['matches']
-        hits.map { |hits| hits['_id']}
+        hits.map { |hits| hits['_id'] }
       end
 
       def all_percolators
@@ -32,9 +29,17 @@ module ElasticRecord
         end
       end
 
-      def reset_percolators
+      def create_percolator_index
+        create(percolator_name) unless exists?(percolator_name)
+      end
+
+      def delete_percolator_index
         delete(percolator_name) if exists?(percolator_name)
-        create(percolator_name)
+      end
+
+      def reset_percolators
+        delete_percolator_index
+        create_percolator_index
       end
 
       def percolator_name

data/lib/elastic_record/index.rb

@@ -41,6 +41,7 @@ module ElasticRecord
 
     attr_accessor :model
     attr_accessor :disabled
+    attr_accessor :has_percolator
 
     def initialize(model)
       @model = model
@@ -81,8 +82,10 @@ module ElasticRecord
     end
 
     private
+
       def new_index_name
         "#{alias_name}_#{(Time.now.to_f * 100).to_i}"
       end
+
   end
 end

data/lib/elastic_record/relation/search_methods.rb

@@ -160,12 +160,10 @@ module ElasticRecord
         def build_query_and_filter(query, filters)
           query = build_query(query)
           filter = build_filter(filters)
-          if query && filter
-            arelastic.query.filtered(query, filter)
+          if filter
+            arelastic.query.filtered(filter: filter, query: query)
           elsif query
             Arelastic::Searches::Query.new(query)
-          elsif filter
-            arelastic.query.constant_score(Arelastic::Searches::Filter.new(filter))
           else
             arelastic.query.match_all
           end

data/lib/elastic_record/tasks/index.rake

@@ -14,16 +14,28 @@ namespace :index do
   desc "Create index for CLASS or all models."
   task create: :environment do
     ElasticRecord::Task.get_models.each do |model|
-      index_name = model.elastic_index.create_and_deploy
+      index = model.elastic_index
+      index_name = index.create_and_deploy
       puts "Created #{model.name} index (#{index_name})"
+
+      if index.has_percolator
+        index_name = index.create_percolator_index
+        puts "Created #{model.name} percolator index (#{index_name})"
+      end
     end
   end
 
   desc "Drop index for CLASS or all models."
   task drop: :environment do
     ElasticRecord::Task.get_models.each do |model|
-      model.elastic_index.delete_all
+      index = model.elastic_index
+      index.delete_all
       puts "Dropped #{model.name} index"
+
+      if index.has_percolator
+        index_name = index.delete_percolator_index
+        puts "Dropped #{model.name} percolator index (#{index.percolator_name})"
+      end
     end
   end
 

data/test/dummy/README.rdoc

@@ -0,0 +1,28 @@
+== README
+
+This README would normally document whatever steps are necessary to get the
+application up and running.
+
+Things you may want to cover:
+
+* Ruby version
+
+* System dependencies
+
+* Configuration
+
+* Database creation
+
+* Database initialization
+
+* How to run the test suite
+
+* Services (job queues, cache servers, search engines, etc.)
+
+* Deployment instructions
+
+* ...
+
+
+Please feel free to use a different markup language if you do not plan to run
+<tt>rake doc:app</tt>.

data/test/dummy/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/test/dummy/app/assets/javascripts/application.js

@@ -0,0 +1,13 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require_tree .

data/test/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

data/test/dummy/app/controllers/application_controller.rb

@@ -0,0 +1,5 @@
+class ApplicationController < ActionController::Base
+  # Prevent CSRF attacks by raising an exception.
+  # For APIs, you may want to use :null_session instead.
+  protect_from_forgery with: :exception
+end

data/test/dummy/app/helpers/application_helper.rb

@@ -0,0 +1,2 @@
+module ApplicationHelper
+end

data/test/dummy/app/models/project.rb

@@ -0,0 +1,7 @@
+class Project < ActiveRecord::Base
+  include ElasticRecord::Model
+
+  self.elastic_index.mapping[:properties].update(
+  name: { type: 'string', index: 'not_analyzed' }
+  )
+end

data/test/{support → dummy/app}/models/widget.rb

@@ -5,6 +5,8 @@ class Widget
 
   define_attributes [:name, :color, :warehouse_id]
 
+  self.elastic_index.has_percolator = true
+
   self.elastic_index.mapping[:properties].update(
     name: {
       type: 'multi_field',

data/test/dummy/app/views/layouts/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Dummy</title>
+  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/test/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/test/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/test/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/test/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/test/dummy/config/application.rb

@@ -0,0 +1,26 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(*Rails.groups)
+require "elastic_record"
+
+module Dummy
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
+  end
+end
+

data/test/dummy/config/boot.rb

@@ -0,0 +1,5 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/test/dummy/config/database.yml

@@ -0,0 +1,15 @@
+development:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: elastic_record_development
+  pool: 5
+  username: root
+  password:
+
+test:
+  adapter: mysql2
+  encoding: utf8
+  database: elastic_record_test
+  username: root
+  password:

data/test/dummy/config/elasticsearch.yml

@@ -0,0 +1,4 @@
+development:
+  servers: 127.0.0.1:9200
+test:
+  servers: 127.0.0.1:9200

data/test/dummy/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the Rails application.
+Rails.application.initialize!

data/test/dummy/config/environments/development.rb

@@ -0,0 +1,41 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # In the development environment your application's code is reloaded on
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
+  config.cache_classes = false
+
+  # Do not eager load code on boot.
+  config.eager_load = false
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send.
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger.
+  config.active_support.deprecation = :log
+
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
+
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end

data/test/dummy/config/environments/production.rb

@@ -0,0 +1,79 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # Code is not reloaded between requests.
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
+
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
+  config.assets.compile = false
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
+
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
+
+  # Prepend all log lines with the following tags.
+  # config.log_tags = [ :subdomain, :uuid ]
+
+  # Use a different logger for distributed setups.
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
+
+  # Use a different cache store in production.
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
+
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation cannot be found).
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners.
+  config.active_support.deprecation = :notify
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+end

data/test/dummy/config/environments/test.rb

@@ -0,0 +1,42 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
+
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
+
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+end

data/test/dummy/config/initializers/assets.rb

@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )

data/test/dummy/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/test/dummy/config/initializers/cookies_serializer.rb

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :json

data/test/dummy/config/initializers/elastic_record.rb

@@ -0,0 +1,3 @@
+ElasticRecord.configure do |config|
+  config.model_names = %w(Warehouse Widget)
+end

data/test/dummy/config/initializers/filter_parameter_logging.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]