elastic_record 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f00def1bf454a01cf7db164569a256fa3872f12
-  data.tar.gz: 3674835adb8a4d2b803f8b00b1f71e9239e3cf15
+  metadata.gz: 4f4401dda11a00875bd98fb93aa20968e6026db3
+  data.tar.gz: 0d1ec26e07c6138e08c1d6037a2f7a201e391031
 SHA512:
-  metadata.gz: cbe0b1f75dc593b47372e0b4d8da74398747dfd87c520e3286baf459e349f8665a6c9863111b3c3415da749c97f1a503a66356a58104cda647008dfd5351ccd2
-  data.tar.gz: a5d239eab2b96cab5aa461bd06671d6e46f7c22ff85ba688b7e0a5e22b4688c385446ba37af750e1b3476488f0028fd2d4da90b034afda842b35e8cfb053ebe4
+  metadata.gz: d62018904effb980ea3b52f3de380324b37a559ad53eba9b833d1849d59fc35e9918a950f1d5a9eb519086ed3e59dcf1cd52beaa76739a88ce3cfae5536cbe26
+  data.tar.gz: 6d0860961a41249853a96366c8fcafef952c5ac367df43c09a59623e587d14837503f33628e43dff2925a0ae97bf98980a6a97a036c7518874ce41fda17fd456

data/elastic_record.gemspec

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

data/lib/elastic_record/railtie.rb

@@ -15,15 +15,5 @@ module ElasticRecord
         include ElasticRecord::Railties::ControllerRuntime
       end
     end
-
-    initializer "elastic_record.orm" do |app|
-      ActiveSupport.on_load(:active_record) do
-        require 'elastic_record/integration/active_record'
-      end
-
-      ActiveSupport.on_load(:cassandra_object) do
-        require 'elastic_record/integration/cassandra_object'
-      end
-    end
   end
 end

data/lib/elastic_record/relation.rb

@@ -41,8 +41,7 @@ module ElasticRecord
 
     def to_a
       @records ||= begin
-        scope = select_values.any? ? klass.select(select_values) : klass
-        records = scope.load_elastic_record_hits(to_ids)
+        records = load_hits(to_ids)
         eager_load_associations(records) if eager_loading?
         records
       end
@@ -81,6 +80,14 @@ module ElasticRecord
         @search_results ||= klass.elastic_index.search(as_elastic)
       end
 
+      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)

data/test/elastic_record/integration/active_record_test.rb

@@ -19,9 +19,9 @@ ActiveSupport.on_load :active_record do
   end
 end
 
-require 'elastic_record/integration/active_record'
 class Project < ActiveRecord::Base
   include ElasticRecord::Model
+  include ElasticRecord::Callbacks
 
   self.elastic_index.mapping[:properties].update(
     name: { type: 'string', index: 'not_analyzed' }
@@ -29,11 +29,17 @@ class Project < ActiveRecord::Base
 end
 
 class ElasticRecord::ActiveRecordTest < MiniTest::Unit::TestCase
-  def test_load_elastic_record_hits
+  def setup
+    super
+    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 [poo_product, bear_product], Project.load_elastic_record_hits([poo_product.id, bear_product.id])
-    assert_equal [bear_product, poo_product], Project.load_elastic_record_hits([bear_product.id, poo_product.id])
+    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
 end

data/test/helper.rb

@@ -24,9 +24,8 @@ module MiniTest
 
         FakeWeb.clean_registry
 
-        Widget.elastic_index.create_and_deploy if Widget.elastic_index.all_names.empty?
-
         ElasticRecord::Config.models.each do |model|
+          model.elastic_index.create_and_deploy if model.elastic_index.all_names.empty?
           model.elastic_index.enable_deferring!
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -67,8 +67,6 @@ files:
 - lib/elastic_record/index/percolator.rb
 - lib/elastic_record/index/settings.rb
 - lib/elastic_record/index/warmer.rb
-- lib/elastic_record/integration/active_record.rb
-- lib/elastic_record/integration/cassandra_object.rb
 - lib/elastic_record/log_subscriber.rb
 - lib/elastic_record/lucene.rb
 - lib/elastic_record/model.rb

data/lib/elastic_record/integration/active_record.rb

@@ -1,7 +0,0 @@
-module ActiveRecord
-  class Base
-    def self.load_elastic_record_hits(ids)
-      order("FIELD(#{connection.quote_column_name(primary_key)}, #{ids.join(',')})").find(ids)
-    end
-  end
-end

data/lib/elastic_record/integration/cassandra_object.rb

@@ -1,7 +0,0 @@
-module CassandraObject
-  class Base
-    def self.load_elastic_record_hits(ids)
-      find(ids)
-    end
-  end
-end