elasticsearch-model 0.1.9 → 2.0.0

data/test/integration/active_record_pagination_test.rb

@@ -1,24 +1,29 @@
 require 'test_helper'
 require 'active_record'
 
+# Needed for ActiveRecord 3.x ?
+ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
+
+::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
+
 module Elasticsearch
   module Model
     class ActiveRecordPaginationTest < Elasticsearch::Test::IntegrationTestCase
-      context "ActiveRecord pagination" do
-        setup do
-          class ::ArticleForPagination < ActiveRecord::Base
-            include Elasticsearch::Model
+      class ::ArticleForPagination < ActiveRecord::Base
+        include Elasticsearch::Model
 
-            scope :published, -> { where(published: true) }
+        scope :published, -> { where(published: true) }
 
-            settings index: { number_of_shards: 1, number_of_replicas: 0 } do
-              mapping do
-                indexes :title,      type: 'string', analyzer: 'snowball'
-                indexes :created_at, type: 'date'
-              end
-            end
+        settings index: { number_of_shards: 1, number_of_replicas: 0 } do
+          mapping do
+            indexes :title,      type: 'string', analyzer: 'snowball'
+            indexes :created_at, type: 'date'
           end
+        end
+      end
 
+      context "ActiveRecord pagination" do
+        setup do
           ActiveRecord::Schema.define(:version => 1) do
             create_table ::ArticleForPagination.table_name do |t|
               t.string   :title
@@ -27,7 +32,7 @@ module Elasticsearch
             end
           end
 
-          Kaminari::Hooks.init
+          Kaminari::Hooks.init if defined?(Kaminari::Hooks)
 
           ArticleForPagination.delete_all
           ArticleForPagination.__elasticsearch__.create_index! force: true
@@ -87,12 +92,11 @@ module Elasticsearch
 
           assert_equal 0, records.size
           assert_equal 6, records.current_page
-          assert_equal 5, records.prev_page
+
           assert_equal nil, records.next_page
           assert_equal 3, records.total_pages
 
           assert ! records.first_page?,   "Should NOT be the first page"
-          assert   records.last_page?,    "Should be the last page"
           assert   records.out_of_range?, "Should be out of range"
         end
 

data/test/integration/dynamic_index_name_test.rb

@@ -1,6 +1,11 @@
 require 'test_helper'
 require 'active_record'
 
+# Needed for ActiveRecord 3.x ?
+ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
+
+::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
+
 module Elasticsearch
   module Model
     class DynamicIndexNameTest < Elasticsearch::Test::IntegrationTestCase

data/test/integration/multiple_models_test.rb

@@ -1,11 +1,40 @@
 require 'test_helper'
 require 'active_record'
 
+# Needed for ActiveRecord 3.x ?
+ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" ) unless ActiveRecord::Base.connected?
+
+::ActiveRecord::Base.raise_in_transactional_callbacks = true if ::ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks) && ::ActiveRecord::VERSION::MAJOR.to_s < '5'
+
 Mongo.setup!
 
 module Elasticsearch
   module Model
     class MultipleModelsIntegration < Elasticsearch::Test::IntegrationTestCase
+      module ::NameSearch
+        extend ActiveSupport::Concern
+
+        included do
+          include Elasticsearch::Model
+          include Elasticsearch::Model::Callbacks
+
+          settings index: {number_of_shards: 1, number_of_replicas: 0} do
+            mapping do
+              indexes :name, type: 'string', analyzer: 'snowball'
+              indexes :created_at, type: 'date'
+            end
+          end
+        end
+      end
+
+      class ::Episode < ActiveRecord::Base
+        include NameSearch
+      end
+
+      class ::Series < ActiveRecord::Base
+        include NameSearch
+      end
+
       context "Multiple models" do
         setup do
           ActiveRecord::Schema.define(:version => 1) do
@@ -20,30 +49,6 @@ module Elasticsearch
             end
           end
 
-          module ::NameSearch
-            extend ActiveSupport::Concern
-
-            included do
-              include Elasticsearch::Model
-              include Elasticsearch::Model::Callbacks
-
-              settings index: {number_of_shards: 1, number_of_replicas: 0} do
-                mapping do
-                  indexes :name, type: 'string', analyzer: 'snowball'
-                  indexes :created_at, type: 'date'
-                end
-              end
-            end
-          end
-
-          class ::Episode < ActiveRecord::Base
-            include NameSearch
-          end
-
-          class ::Series < ActiveRecord::Base
-            include NameSearch
-          end
-
           [::Episode, ::Series].each do |model|
             model.delete_all
             model.__elasticsearch__.create_index! force: true
@@ -52,7 +57,6 @@ module Elasticsearch
             model.create name: "The greatest #{model.name}"
             model.__elasticsearch__.refresh_index!
           end
-
         end
 
         should "find matching documents across multiple models" do

data/test/unit/indexing_test.rb

@@ -423,7 +423,7 @@ class Elasticsearch::Model::IndexingTest < Test::Unit::TestCase
     end
 
     context "Checking for index existence" do
-      context "the index exists" do
+      context "when the index exists" do
         should "return true" do
           indices = mock('indices', exists: true)
           client  = stub('client', indices: indices)
@@ -434,7 +434,7 @@ class Elasticsearch::Model::IndexingTest < Test::Unit::TestCase
         end
       end
 
-      context "the index does not exists" do
+      context "when the index does not exists" do
         should "return false" do
           indices = mock('indices', exists: false)
           client  = stub('client', indices: indices)
@@ -445,7 +445,7 @@ class Elasticsearch::Model::IndexingTest < Test::Unit::TestCase
         end
       end
 
-      context "the indices raises" do
+      context "when the indices API raises an error" do
         should "return false" do
           client  = stub('client')
           client.expects(:indices).raises(StandardError)
@@ -456,7 +456,7 @@ class Elasticsearch::Model::IndexingTest < Test::Unit::TestCase
         end
       end
 
-      context "the indices raises" do
+      context "the indices.exists API raises an error" do
         should "return false" do
           indices = stub('indices')
           client  = stub('client')

data/test/unit/module_test.rb

@@ -53,5 +53,16 @@ class Elasticsearch::Model::ModuleTest < Test::Unit::TestCase
       end
     end
 
+    context "settings" do
+        should "access the settings" do
+          assert_not_nil Elasticsearch::Model.settings
+        end
+
+        should "allow to set settings" do
+          assert_nothing_raised { Elasticsearch::Model.settings[:foo] = 'bar' }
+          assert_equal 'bar', Elasticsearch::Model.settings[:foo]
+        end
+    end
+
   end
 end

data/test/unit/naming_inheritance_test.rb

@@ -0,0 +1,94 @@
+require "test_helper"
+
+class Elasticsearch::Model::NamingInheritanceTest < Test::Unit::TestCase
+  def setup
+    Elasticsearch::Model.settings[:inheritance_enabled] = true
+  end
+
+  def teardown
+    Elasticsearch::Model.settings[:inheritance_enabled] = false
+  end
+
+  context "Naming module with inheritance" do
+    class ::TestBase
+      extend ActiveModel::Naming
+
+      extend  Elasticsearch::Model::Naming::ClassMethods
+      include Elasticsearch::Model::Naming::InstanceMethods
+    end
+
+    class ::Animal < ::TestBase
+      extend ActiveModel::Naming
+
+      extend  Elasticsearch::Model::Naming::ClassMethods
+      include Elasticsearch::Model::Naming::InstanceMethods
+
+      index_name "mammals"
+      document_type "mammal"
+    end
+
+    class ::Dog < ::Animal
+    end
+
+    module ::MyNamespace
+      class Dog < ::Animal
+      end
+    end
+
+    class ::Cat < ::Animal
+      extend ActiveModel::Naming
+
+      extend  Elasticsearch::Model::Naming::ClassMethods
+      include Elasticsearch::Model::Naming::InstanceMethods
+
+      index_name "cats"
+      document_type "cat"
+    end
+
+    should "return the default index_name" do
+      assert_equal "test_bases", TestBase.index_name
+      assert_equal "test_bases", TestBase.new.index_name
+    end
+
+    should "return the explicit index_name" do
+      assert_equal "mammals", Animal.index_name
+      assert_equal "mammals", Animal.new.index_name
+
+      assert_equal "cats", Cat.index_name
+      assert_equal "cats", Cat.new.index_name
+    end
+
+    should "return the ancestor index_name" do
+      assert_equal "mammals", Dog.index_name
+      assert_equal "mammals", Dog.new.index_name
+    end
+
+    should "return the ancestor index_name for namespaced model" do
+      assert_equal "mammals", ::MyNamespace::Dog.index_name
+      assert_equal "mammals", ::MyNamespace::Dog.new.index_name
+    end
+
+    should "return the default document_type" do
+      assert_equal "test_base", TestBase.document_type
+      assert_equal "test_base", TestBase.new.document_type
+    end
+
+    should "return the explicit document_type" do
+      assert_equal "mammal", Animal.document_type
+      assert_equal "mammal", Animal.new.document_type
+
+      assert_equal "cat", Cat.document_type
+      assert_equal "cat", Cat.new.document_type
+    end
+
+    should "return the ancestor document_type" do
+      assert_equal "mammal", Dog.document_type
+      assert_equal "mammal", Dog.new.document_type
+    end
+
+    should "return the ancestor document_type for namespaced model" do
+      assert_equal "mammal", ::MyNamespace::Dog.document_type
+      assert_equal "mammal", ::MyNamespace::Dog.new.document_type
+    end
+  end
+end

data/test/unit/response_aggregations_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+class Elasticsearch::Model::ResponseAggregationsTest < Test::Unit::TestCase
+  context "Response aggregations" do
+    class OriginClass
+      def self.index_name;    'foo'; end
+      def self.document_type; 'bar'; end
+    end
+
+    RESPONSE = {
+      'aggregations' => {
+        'foo' => {'bar' => 10 },
+        'price' => { 'doc_count' => 123,
+                     'min' => { 'value' => 1.0},
+                     'max' => { 'value' => 99 }
+                   }
+      }
+    }
+
+    setup do
+      @search  = Elasticsearch::Model::Searching::SearchRequest.new OriginClass, '*'
+      @search.stubs(:execute!).returns(RESPONSE)
+    end
+
+    should "access the aggregations" do
+      @search.expects(:execute!).returns(RESPONSE)
+
+      response = Elasticsearch::Model::Response::Response.new OriginClass, @search
+      assert_respond_to response, :aggregations
+      assert_kind_of Elasticsearch::Model::Response::Aggregations, response.aggregations
+      assert_kind_of Hashie::Mash, response.aggregations.foo
+      assert_equal 10, response.aggregations.foo.bar
+    end
+
+    should "properly return min and max values" do
+      @search.expects(:execute!).returns(RESPONSE)
+
+      response = Elasticsearch::Model::Response::Response.new OriginClass, @search
+
+      assert_equal 123, response.aggregations.price.doc_count
+      assert_equal 1,   response.aggregations.price.min.value
+      assert_equal 99,  response.aggregations.price.max.value
+    end
+
+  end
+end

data/test/unit/response_result_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'active_support/json/encoding'
 
 class Elasticsearch::Model::ResultTest < Test::Unit::TestCase
   context "Response result" do
@@ -80,7 +81,6 @@ class Elasticsearch::Model::ResultTest < Test::Unit::TestCase
     end
 
     should "delegate as_json to @result even when ActiveSupport changed half of Ruby" do
-      require 'active_support/json/encoding'
       result = Elasticsearch::Model::Response::Result.new foo: 'bar'
 
       result.instance_variable_get(:@result).expects(:as_json)

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 2.0.0
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -168,18 +168,18 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -235,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,19 +263,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +344,7 @@ files:
 - examples/riak_article.rb
 - gemfiles/3.0.gemfile
 - gemfiles/4.0.gemfile
+- gemfiles/5.0.gemfile
 - lib/elasticsearch/model.rb
 - lib/elasticsearch/model/adapter.rb
 - lib/elasticsearch/model/adapters/active_record.rb
@@ -359,6 +360,7 @@ files:
 - lib/elasticsearch/model/naming.rb
 - lib/elasticsearch/model/proxy.rb
 - lib/elasticsearch/model/response.rb
+- lib/elasticsearch/model/response/aggregations.rb
 - lib/elasticsearch/model/response/base.rb
 - lib/elasticsearch/model/response/pagination.rb
 - lib/elasticsearch/model/response/records.rb
@@ -392,8 +394,10 @@ files:
 - test/unit/indexing_test.rb
 - test/unit/module_test.rb
 - test/unit/multimodel_test.rb
+- test/unit/naming_inheritance_test.rb
 - test/unit/naming_test.rb
 - test/unit/proxy_test.rb
+- test/unit/response_aggregations_test.rb
 - test/unit/response_base_test.rb
 - test/unit/response_pagination_kaminari_test.rb
 - test/unit/response_pagination_will_paginate_test.rb
@@ -425,7 +429,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: ActiveModel/Record integrations for Elasticsearch.
@@ -454,8 +458,10 @@ test_files:
 - test/unit/indexing_test.rb
 - test/unit/module_test.rb
 - test/unit/multimodel_test.rb
+- test/unit/naming_inheritance_test.rb
 - test/unit/naming_test.rb
 - test/unit/proxy_test.rb
+- test/unit/response_aggregations_test.rb
 - test/unit/response_base_test.rb
 - test/unit/response_pagination_kaminari_test.rb
 - test/unit/response_pagination_will_paginate_test.rb
@@ -466,4 +472,3 @@ test_files:
 - test/unit/searching_search_request_test.rb
 - test/unit/searching_test.rb
 - test/unit/serializing_test.rb
-has_rdoc: