elastic_record 1.1.4 → 1.1.5

data/test/elastic_record/searching_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class ElasticRecord::SearchingTest < MiniTest::Spec
+class ElasticRecord::SearchingTest < MiniTest::Unit::TestCase
   def test_elastic_search
 
   end

data/test/helper.rb

@@ -4,30 +4,37 @@ 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)
+ElasticRecord::Config.model_names = %w(Warehouse Widget Option)
 
 FakeWeb.allow_net_connect = %r[^https?://127.0.0.1]
 
 module MiniTest
-  class Spec
-    def setup
-      super
-      FakeWeb.clean_registry
+  class Unit
+    class TestCase
+      def setup
+        Widget._test_cache.clear
+        Option._test_cache.clear
 
-      Widget.elastic_index.create_and_deploy if Widget.elastic_index.all_names.empty?
+        FakeWeb.clean_registry
 
-      ElasticRecord::Config.models.each do |model|
-        model.elastic_index.enable_deferring!
+        Widget.elastic_index.create_and_deploy if Widget.elastic_index.all_names.empty?
+
+        ElasticRecord::Config.models.each do |model|
+          model.elastic_index.enable_deferring!
+        end
       end
-    end
 
-    def teardown
-      ElasticRecord::Config.models.each do |model|
-        model.elastic_index.reset_deferring!
+      def teardown
+        ElasticRecord::Config.models.each do |model|
+          model.elastic_index.reset_deferring!
+        end
       end
     end
   end

data/test/support/models/option.rb

@@ -0,0 +1,24 @@
+class Option
+  include TestModel
+
+  define_attributes [:name, :widget_id]
+
+  searches_many :options
+
+  self.elastic_index.mapping[:properties].update(
+    name: {
+      type: 'multi_field',
+      fields: {
+        name: {type: 'string', index: 'not_analyzed'},
+        analyzed: {type: 'string', index: 'analyzed'}
+      }
+    },
+    widget_id: {
+      type: 'string', index: 'not_analyzed'
+    }
+  )
+
+  def widget=(other)
+    self.widget_id = other.id
+  end
+end

data/test/support/models/test_model.rb

@@ -11,11 +11,28 @@ module TestModel
 
     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 { |id| new(id: id, color: 'red') }
+      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
+    end
+
+    def primary_key
+      'id'
     end
 
     def base_class
@@ -50,6 +67,10 @@ 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,5 @@ class Warehouse
   include TestModel
 
   define_attributes [:name]
-  searches_many :widgets
-end
+  searches_many :widgets, :autosave => true
+end

data/test/support/models/widget.rb

@@ -5,9 +5,11 @@ class Widget
 
   define_attributes [:name, :color, :warehouse_id]
 
+  searches_many :options
+
   self.elastic_index.mapping[:properties].update(
     name: {
-      type: 'multi_field', 
+      type: 'multi_field',
       fields: {
         name: {type: 'string', index: 'not_analyzed'},
         analyzed: {type: 'string', index: 'analyzed'}
@@ -36,4 +38,4 @@ class Widget
   def warehouse=(other)
     self.warehouse_id = other.id
   end
-end
+end

data/test/support/query_counter.rb

@@ -0,0 +1,56 @@
+class ElasticSearchCounter
+  class << self
+    attr_accessor :ignored_elastic, :log, :log_all
+    def clear_log; self.log = []; self.log_all = []; end
+  end
+
+  self.clear_log
+
+  self.ignored_elastic = []
+
+  elastic_search_ignored = []
+
+  [elastic_search_ignored].each do |db_ignored_elastic|
+    ignored_elastic.concat db_ignored_elastic
+  end
+
+  attr_reader :ignore
+
+  def initialize(ignore = Regexp.union(self.class.ignored_elastic))
+    @ignore = ignore
+  end
+
+  def call(name, start, finish, message_id, values)
+    self.class.log_all << values
+    self.class.log << values unless ignore =~ values[:request].path
+  end
+end
+
+ActiveSupport::Notifications.subscribe('request.elastic_record', ElasticSearchCounter.new)
+
+module MiniTest
+  class Unit
+    class TestCase
+      def assert_queries(num = 1, options = {})
+        ignore_none = options.fetch(:ignore_none) { num == :any }
+        ElasticSearchCounter.clear_log
+        x = yield
+        the_log = ignore_none ? ElasticSearchCounter.log_all : ElasticSearchCounter.log
+        if num == :any
+          assert_operator the_log.size, :>=, 1, "1 or more queries expected, but none were executed."
+        else
+          queries = the_log.map { |event| "  #{event[:request].method} #{event[:request].path} #{event[:request].body}\n" }.join("\n")
+
+          mesg = "#{the_log.size} instead of #{num} queries were executed.#{the_log.size == 0 ? '' : "\nQueries:\n#{queries}"}"
+          assert_equal num, the_log.size, mesg
+        end
+
+        x
+      end
+
+      def assert_no_queries(&block)
+        assert_queries(0, :ignore_none => true, &block)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +57,7 @@ files:
 - lib/elastic_record/callbacks.rb
 - lib/elastic_record/config.rb
 - lib/elastic_record/connection.rb
+- lib/elastic_record/errors.rb
 - lib/elastic_record/index.rb
 - lib/elastic_record/index/configurator.rb
 - lib/elastic_record/index/deferred.rb
@@ -66,10 +67,11 @@ 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
-- lib/elastic_record/orm/active_record.rb
 - lib/elastic_record/railtie.rb
 - lib/elastic_record/railties/controller_runtime.rb
 - lib/elastic_record/relation.rb
@@ -100,6 +102,7 @@ files:
 - test/elastic_record/index/settings_test.rb
 - test/elastic_record/index/warmer_test.rb
 - test/elastic_record/index_test.rb
+- test/elastic_record/integration/active_record_test.rb
 - test/elastic_record/log_subscriber_test.rb
 - test/elastic_record/lucene_test.rb
 - test/elastic_record/model_test.rb
@@ -120,9 +123,11 @@ files:
 - 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

data/lib/elastic_record/orm/active_record.rb

@@ -1,7 +0,0 @@
-module ElasticRecord
-  module ActiveRecord
-    def initialize_from_elastic_search(results)
-      
-    end
-  end
-end