elastic_record 1.1.8 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51cb1409dc9723d93f90460254076361b76d06d9
-  data.tar.gz: 04cc38fec1620e2f2858758d8a8b6c9c34fd619d
+  metadata.gz: 87cc4a4cf72e33d968d2d7ffaa9a28eab62e3bfb
+  data.tar.gz: ca646f6157b72b51cd77c0886c71bc935418e456
 SHA512:
-  metadata.gz: fe950144e596ed58fbd5cd3944d4a25868ddae217e84ed61bcd319a259a63eab201ca2d3e19caee798c609dbf21277ff149fb56368ab7289636d9228e38570a3
-  data.tar.gz: 4908924df6ed4e420dd9dbba400b9155f2557020d8e91b24a549c16b07afd78bf1685942f6cf00bca3e83eb7996a7c5278687541a6ea5d281a9ebd75ece210ca
+  metadata.gz: d64bd38ead974d0e42b65b1fa472779661f0a48f3e9c7aea831228f87655cf1c3e63f1b1277fc69df3c806cd5ca6c5491debba14029c64e99d125c5a0887d1ea
+  data.tar.gz: bed6b22da214f2aadccb6f01a7a39afe02ce3faf8bd0da29348d03562f9769b5daff9b0e7b95f69f875338467fe7617e8ae2d4132efeeb651ee6ab24d32bf855

data/.travis.yml

@@ -1,4 +1,7 @@
 services:
   - elasticsearch
 rvm:
-  - 2.0.0
+  - 2.0.0
+env:
+  - "GEM=ar:mysql2"
+  - "GEM=ar:postgresql"

data/Gemfile

@@ -3,6 +3,8 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'activerecord'
-gem 'mysql2'
 gem 'fakeweb'
 gem 'rake'
+
+gem 'mysql2'
+gem 'pg'

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '1.1.8'
+  s.version = '1.2.1'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 

data/lib/elastic_record/callbacks.rb

@@ -1,6 +1,8 @@
 module ElasticRecord
   module Callbacks
     def self.included(base)
+      return unless base.respond_to?(:after_save) &&  base.respond_to?(:after_destroy)
+
       base.class_eval do
         after_save if: :changed? do
           self.class.elastic_index.index_record self

data/lib/elastic_record/connection.rb

@@ -7,11 +7,7 @@ module ElasticRecord
     attr_accessor :max_request_count
     attr_accessor :bulk_stack
     def initialize(servers, options = {})
-      if servers.is_a?(Array)
-        self.servers = servers
-      else
-        self.servers = servers.split(',')
-      end
+      self.servers = Array(servers)
 
       self.current_server     = next_server
       self.request_count      = 0
@@ -51,10 +47,10 @@ module ElasticRecord
     end
 
     METHODS = {
-      head: Net::HTTP::Head,
-      get: Net::HTTP::Get,
-      post: Net::HTTP::Post,
-      put: Net::HTTP::Put,
+      head:   Net::HTTP::Head,
+      get:    Net::HTTP::Get,
+      post:   Net::HTTP::Post,
+      put:    Net::HTTP::Put,
       delete: Net::HTTP::Delete
     }
 

data/lib/elastic_record/index/mapping.rb

@@ -1,8 +1,8 @@
 module ElasticRecord
   class Index
     module Mapping
-      def mapping=(mapping)
-        mapping.deep_merge!(mapping)
+      def mapping=(custom_mapping)
+        mapping.deep_merge!(custom_mapping)
       end
 
       def update_mapping(index_name = alias_name)

data/lib/elastic_record/model.rb

@@ -4,7 +4,7 @@ module ElasticRecord
       base.class_eval do
         extend Searching
         extend ClassMethods
-        include SearchesMany
+        include Callbacks
 
         class_attribute :elastic_connection
         self.elastic_connection = ElasticRecord::Connection.new(ElasticRecord::Config.servers, ElasticRecord::Config.connection_options)

data/lib/elastic_record/relation/search_methods.rb

@@ -47,15 +47,6 @@ module ElasticRecord
         filter(*args).first!
       end
 
-      def eager_load!(*args)
-        self.eager_load_values += args.flatten
-        self
-      end
-
-      def eager_load(*args)
-        clone.eager_load! *args
-      end
-
       def limit!(value)
         self.limit_value = value
         self

data/lib/elastic_record/relation/value_methods.rb

@@ -1,6 +1,6 @@
 module ElasticRecord
   class Relation
-    MULTI_VALUE_METHODS  = [:extending, :facet, :filter, :order, :select, :eager_load]
+    MULTI_VALUE_METHODS  = [:extending, :facet, :filter, :order, :select]
     SINGLE_VALUE_METHODS = [:query, :limit, :offset, :reverse_order]
   end
 end

data/lib/elastic_record/relation.rb

@@ -35,16 +35,8 @@ module ElasticRecord
       reset
     end
 
-    def eager_loading?
-      @should_eager_load ||= eager_load_values.any?
-    end
-
     def to_a
-      @records ||= begin
-        records = load_hits(to_ids)
-        eager_load_associations(records) if eager_loading?
-        records
-      end
+      @records ||= load_hits(to_ids)
     end
 
     def to_ids
@@ -69,7 +61,6 @@ module ElasticRecord
     private
       def reset
         @search_results = @records = nil
-        @should_eager_load = nil
       end
 
       def search_hits
@@ -83,24 +74,14 @@ module ElasticRecord
       def load_hits(ids)
         scope = select_values.any? ? klass.select(select_values) : klass
         if defined?(ActiveRecord::Base) && klass < ActiveRecord::Base
-          scope = scope.order("FIELD(#{connection.quote_column_name(primary_key)}, #{ids.join(',')})")
-        end
-        scope.find(ids)
-      end
-
-      def eager_load_associations(records)
-        records = records.reject(&:marked_for_destruction?)
-        ids = records.map(&:id)
-        eager_load_values.each do |to_load|
-          reflection = klass.searches_many_reflections[to_load] ||(raise "searches_many #{to_load} does not exist on #{klass}")
-          foreign_key = reflection.foreign_key.to_sym
-          grouped_children = reflection.klass.elastic_search.filter(foreign_key => ids).limit(1000000).group_by(&foreign_key)
-          records.each do |record|
-            children = grouped_children.fetch(record.id, [])
-            record.send(to_load).eager_loaded(children)
+          case klass.connection.adapter_name
+          when /Mysql/
+            scope = scope.order("FIELD(#{connection.quote_column_name(primary_key)}, #{ids.join(',')})")
+          when /Pos/
+            scope = scope.order(ids.map { |id| "ID=#{connection.quote(id)} DESC" }.join(','))
           end
         end
-        records
+        scope.find(ids)
       end
   end
 end

data/lib/elastic_record.rb

@@ -11,7 +11,6 @@ module ElasticRecord
   autoload :Lucene, 'elastic_record/lucene'
   autoload :Model, 'elastic_record/model'
   autoload :Relation, 'elastic_record/relation'
-  autoload :SearchesMany, 'elastic_record/searches_many'
   autoload :Searching, 'elastic_record/searching'
 
   class << self

data/test/elastic_record/config_test.rb

@@ -8,6 +8,6 @@ class ElasticRecord::ConfigTest < MiniTest::Unit::TestCase
   def test_models
     ElasticRecord::Config.model_names = %w(Widget)
 
-    assert_equal [Warehouse, Widget, Option], ElasticRecord::Config.models
+    assert_equal [Warehouse, Widget], ElasticRecord::Config.models
   end
 end

data/test/elastic_record/connection_test.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class ElasticRecord::ConnectionTest < MiniTest::Unit::TestCase
   def test_servers
-    assert_equal ['foo', 'bar'], ElasticRecord::Connection.new('foo,bar').servers
+    assert_equal ['foo'], ElasticRecord::Connection.new('foo').servers
     assert_equal ['foo', 'bar'], ElasticRecord::Connection.new(['foo', 'bar']).servers
   end
 
@@ -43,7 +43,7 @@ class ElasticRecord::ConnectionTest < MiniTest::Unit::TestCase
 
     ElasticRecord::Connection.new(ElasticRecord::Config.servers, retries: 0).tap do |connection|
       FakeWeb.register_uri :get, %r[/error], responses
-      assert_raises(Errno::ECONNREFUSED) { connection.json_get("/error") }      
+      assert_raises(Errno::ECONNREFUSED) { connection.json_get("/error") }
     end
 
     ElasticRecord::Connection.new(ElasticRecord::Config.servers, retries: 1).tap do |connection|

data/test/elastic_record/index/mapping_test.rb

@@ -6,7 +6,7 @@ class ElasticRecord::Index::MappingTest < MiniTest::Unit::TestCase
     index.get_mapping(index_name)
 
     index.delete_mapping(index_name)
-    
+
     assert_raises ElasticRecord::ConnectionError do
       index.get_mapping(index_name)
     end
@@ -19,6 +19,16 @@ class ElasticRecord::Index::MappingTest < MiniTest::Unit::TestCase
     refute_nil mapping[:properties]
   end
 
+  def test_merge_mapping
+    index.mapping.clear
+    index.mapping[:properties] = {color: {type: 'string'}}
+
+    custom = {properties: {color: {type: 'integer'}}, other: 'stuff'}
+    index.mapping = custom
+
+    assert_equal custom, index.mapping
+  end
+
   private
     def index
       @index ||= ElasticRecord::Index.new(Widget)

data/test/elastic_record/integration/active_record_test.rb

@@ -1,45 +1,82 @@
 require 'helper'
 
 require 'active_record'
-require 'mysql2'
-
-ActiveSupport.on_load :active_record do
-  ActiveRecord::Base.establish_connection(
-    adapter: 'mysql2',
-    host: "localhost",
-    database: "elastic_record_test",
-    username: "root"
-  )
 
-  `mysqladmin -u root -f drop elastic_record_test`
-  `mysqladmin -u root create elastic_record_test`
-
-  ActiveRecord::Migration.create_table :projects do |t|
-    t.string :name, null: false
-  end
-end
+require 'mysql2'
+require 'pg'
 
 class Project < ActiveRecord::Base
   include ElasticRecord::Model
-  include ElasticRecord::Callbacks
 
   self.elastic_index.mapping[:properties].update(
     name: { type: 'string', index: 'not_analyzed' }
   )
 end
 
-class ElasticRecord::ActiveRecordTest < MiniTest::Unit::TestCase
+module ElasticRecord
+  module ActiveRecordIntegration
+    def setup_project_database(config)
+      ActiveRecord::Tasks::DatabaseTasks.drop config
+      ActiveRecord::Tasks::DatabaseTasks.create config
+      ActiveRecord::Base.establish_connection config
+
+      quietly do
+        ActiveRecord::Migration.create_table :projects do |t|
+          t.string :name, null: false
+        end
+      end
+
+      Project.elastic_index.create_and_deploy if Project.elastic_index.all_names.empty?
+    end
+
+    def test_ordering
+      poo_product = Project.create! name: "Poo"
+      bear_product = Project.create! name: "Bear"
+      Project.elastic_index.refresh
+
+      assert_equal [bear_product, poo_product], Project.elastic_relation.order(name: 'asc')
+      assert_equal [poo_product, bear_product], Project.elastic_relation.order(name: 'desc')
+    end
+
+    def test_update_callback
+      project = Project.create! name: "Ideas"
+      Project.elastic_index.refresh
+      project.update! name: 'Terrible Stuff'
+      Project.elastic_index.refresh
+
+      assert_equal [project], Project.elastic_relation.filter(name: 'Terrible Stuff')
+    end
+  end
+end
+
+class ElasticRecord::Mysql2Test < MiniTest::Unit::TestCase
+  include ElasticRecord::ActiveRecordIntegration
+
   def setup
     super
-    Project.elastic_index.create_and_deploy if Project.elastic_index.all_names.empty?
+
+    setup_project_database(
+      'adapter'   => 'mysql2',
+      'host'      => "localhost",
+      'database'  => 'elastic_record_test',
+      'username'  => 'root'
+    )
   end
+end
+
+class ElasticRecord::PostgresqlTest < MiniTest::Unit::TestCase
+  include ElasticRecord::ActiveRecordIntegration
 
-  def test_ordering
-    poo_product = Project.create! name: "Poo"
-    bear_product = Project.create! name: "Bear"
-    Project.elastic_index.refresh
+  def setup
+    super
 
-    assert_equal [bear_product, poo_product], Project.elastic_relation.order(name: 'asc')
-    assert_equal [poo_product, bear_product], Project.elastic_relation.order(name: 'desc')
+    setup_project_database(
+      'adapter'   => 'postgresql',
+      'encoding'  => 'unicode',
+      'database'  => 'content_system_development',
+      'pool'      => 5,
+      'username'  => 'postgres',
+      'password'  => ''
+    )
   end
 end

data/test/elastic_record/relation_test.rb

@@ -25,53 +25,6 @@ class ElasticRecord::RelationTest < MiniTest::Unit::TestCase
     # assert Widget.elastic_relation.search_results.is_a?(ElasticSearch::Api::Hits)
   end
 
-  def test_eager_loading?
-    assert Widget.elastic_relation.eager_load(:options).eager_loading?
-  end
-
-  def test_eager_loading_is_not_default
-    assert !Widget.elastic_relation.eager_loading?
-  end
-
-  def test_eager_load_on_collection_proxy
-
-    warehouse = Warehouse.new
-    widget = Widget.new(warehouse_id: warehouse.id)
-    Widget.elastic_index.bulk_add [ widget ]
-
-    Option.elastic_index.bulk_add [
-      Option.new(id:  5, widget_id: widget.id),
-      Option.new(id: 10, widget_id: widget.id),
-    ]
-
-    widgets = warehouse.widgets.eager_load(:options)
-    widgets = widgets.to_a
-
-    assert_no_queries do
-      assert_equal ["5", "10"].to_set, widgets.first.options.map(&:id).to_set
-    end
-
-  end
-
-  def test_eager_load_on_relation
-
-    widget = Widget.new
-    Widget.elastic_index.bulk_add [ widget ]
-
-    Option.elastic_index.bulk_add [
-      Option.new(id:  5, widget_id: widget.id),
-      Option.new(id: 10, widget_id: widget.id),
-    ]
-
-    widgets = Widget.elastic_relation.eager_load(:options)
-    widgets = widgets.to_a
-
-    assert_no_queries do
-      assert_equal ["5", "10"].to_set, widgets.first.options.map(&:id).to_set
-    end
-
-  end
-
   def test_to_ids
     create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
 

data/test/helper.rb

@@ -4,14 +4,11 @@ Bundler.require
 require 'minitest/autorun'
 
 require 'support/connect'
-require 'support/query_counter'
 require 'support/models/test_model'
 require 'support/models/warehouse'
 require 'support/models/widget'
-require 'support/models/option'
-require 'pp'
 
-ElasticRecord::Config.model_names = %w(Warehouse Widget Option)
+ElasticRecord::Config.model_names = %w(Warehouse Widget)
 
 FakeWeb.allow_net_connect = %r[^https?://127.0.0.1]
 
@@ -19,9 +16,6 @@ module MiniTest
   class Unit
     class TestCase
       def setup
-        Widget._test_cache.clear
-        Option._test_cache.clear
-
         FakeWeb.clean_registry
 
         ElasticRecord::Config.models.each do |model|

data/test/support/models/test_model.rb

@@ -10,25 +10,11 @@ module TestModel
     include ActiveModel::Validations
 
     include ElasticRecord::Model
-    include ElasticRecord::Callbacks
-
   end
 
   module ClassMethods
-
-    def _test_cache
-      @_test_cache ||= []
-    end
-
-    def load_elastic_record_hits(*args)
-      find(*args)
-    end
-
     def find(ids)
-      ids.map do |id|
-        record = _test_cache.detect { |m| m.id.to_s == id.to_s }
-        record.nil? ? new(id: id, color: 'red') : record.clone
-      end
+      ids.map { |id| new(id: id) }
     end
 
     def primary_key
@@ -67,10 +53,6 @@ module TestModel
 
   def initialize(attrs = {})
     self.attributes = attrs
-    cloned = self.clone
-    cloned.id = cloned.id.to_s
-    self.class._test_cache.delete_if { |record| record.id == cloned.id }
-    self.class._test_cache << cloned
   end
 
   def attributes=(attrs)

data/test/support/models/warehouse.rb

@@ -2,5 +2,4 @@ class Warehouse
   include TestModel
 
   define_attributes [:name]
-  searches_many :widgets, :autosave => true
 end

data/test/support/models/widget.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.1
 platform: ruby
 authors:
 - Infogroup
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Find your records with elastic search
@@ -46,8 +46,8 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -81,12 +81,6 @@ files:
 - lib/elastic_record/relation/none.rb
 - lib/elastic_record/relation/search_methods.rb
 - lib/elastic_record/relation/value_methods.rb
-- lib/elastic_record/searches_many.rb
-- lib/elastic_record/searches_many/association.rb
-- lib/elastic_record/searches_many/autosave.rb
-- lib/elastic_record/searches_many/builder.rb
-- lib/elastic_record/searches_many/collection_proxy.rb
-- lib/elastic_record/searches_many/reflection.rb
 - lib/elastic_record/searching.rb
 - lib/elastic_record/tasks/index.rake
 - test/elastic_record/callbacks_test.rb
@@ -113,19 +107,12 @@ files:
 - test/elastic_record/relation/none_test.rb
 - test/elastic_record/relation/search_methods_test.rb
 - test/elastic_record/relation_test.rb
-- test/elastic_record/searches_many/association_test.rb
-- test/elastic_record/searches_many/autosave_test.rb
-- test/elastic_record/searches_many/collection_proxy_test.rb
-- test/elastic_record/searches_many/reflection_test.rb
-- test/elastic_record/searches_many_test.rb
 - test/elastic_record/searching_test.rb
 - test/helper.rb
 - test/support/connect.rb
-- test/support/models/option.rb
 - test/support/models/test_model.rb
 - test/support/models/warehouse.rb
 - test/support/models/widget.rb
-- test/support/query_counter.rb
 homepage: http://github.com/data-axle/elastic_record
 licenses:
 - MIT
@@ -136,17 +123,17 @@ 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: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Use Elastic Search with your objects