elasticsearch-model 0.1.0.rc1 → 0.1.0

data/.gitignore

@@ -16,5 +16,5 @@ test/tmp
 test/version_tmp
 tmp
 
-gemfiles/3.gemfile.lock
-gemfiles/4.gemfile.lock
+gemfiles/3.0.gemfile.lock
+gemfiles/4.0.gemfile.lock

data/README.md

@@ -13,7 +13,7 @@ The library is compatible with Ruby 1.9.3 and higher.
 
 Install the package from [Rubygems](https://rubygems.org):
 
-    gem install elasticsearch-model --pre
+    gem install elasticsearch-model
 
 To use an unreleased version, either add it to your `Gemfile` for [Bundler](http://bundler.io):
 

data/elasticsearch-model.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files  = [ "README.md", "LICENSE.txt" ]
   s.rdoc_options      = [ "--charset=UTF-8" ]
 
-  s.add_dependency "elasticsearch",       '~> 0.4'
+  s.add_dependency "elasticsearch",       '> 0.4'
+  s.add_dependency "activesupport",       '> 3'
   s.add_dependency "hashie"
 
   s.add_development_dependency "bundler", "~> 1.3"
@@ -30,12 +31,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency "elasticsearch-extensions"
 
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "activesupport", "> 3.0"
   s.add_development_dependency "activemodel",   "> 3.0"
   s.add_development_dependency "activerecord",  "> 4.0"
 
   s.add_development_dependency "oj"
   s.add_development_dependency "kaminari"
+  # NOTE: Do not add Mongoid here, keep only in 3/4 files
 
   s.add_development_dependency "shoulda-context"
   s.add_development_dependency "mocha"

data/examples/activerecord_associations.rb

@@ -3,6 +3,11 @@
 #
 # https://github.com/rails/rails/tree/master/activerecord
 # http://guides.rubyonrails.org/association_basics.html
+#
+# Run me with:
+#
+#     ruby -I lib examples/activerecord_associations.rb
+#
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
@@ -81,6 +86,8 @@ class Article < ActiveRecord::Base
   has_many                :comments
 end
 
+class Article < ActiveRecord::Base; delegate :size, to: :comments, prefix: true; end
+
 class Comment < ActiveRecord::Base
   belongs_to :article, touch: true
 end

data/gemfiles/3.0.gemfile

@@ -0,0 +1,12 @@
+# Usage:
+#
+# $ BUNDLE_GEMFILE=./gemfiles/3.0.gemfile bundle install
+# $ BUNDLE_GEMFILE=./gemfiles/3.0.gemfile bundle exec rake test:integration
+
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activemodel',  '>= 3.0'
+gem 'activerecord', '~> 3.2'
+gem 'mongoid',      '>= 3.0'

data/gemfiles/4.0.gemfile

@@ -0,0 +1,12 @@
+# Usage:
+#
+# $ BUNDLE_GEMFILE=./gemfiles/4.0.gemfile bundle install
+# $ BUNDLE_GEMFILE=./gemfiles/4.0.gemfile bundle exec rake test:integration
+
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activemodel',  '~> 4'
+gem 'activerecord', '~> 4'
+gem 'mongoid',      '~> 4.0.0.beta1'

data/lib/elasticsearch/model.rb

@@ -1,10 +1,10 @@
-require 'forwardable'
-
 require 'elasticsearch'
 
 require 'hashie'
 
-require 'elasticsearch/model/support/forwardable'
+require 'active_support/core_ext/module/delegation'
+
+require 'elasticsearch/model/version'
 
 require 'elasticsearch/model/client'
 
@@ -29,7 +29,7 @@ require 'elasticsearch/model/response/results'
 require 'elasticsearch/model/response/records'
 require 'elasticsearch/model/response/pagination'
 
-require 'elasticsearch/model/version'
+require 'elasticsearch/model/ext/active_record'
 
 if defined?(::Kaminari)
   Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
@@ -103,14 +103,15 @@ module Elasticsearch
 
         # Delegate important methods to the `__elasticsearch__` proxy, unless they are defined already
         #
-        extend  Support::Forwardable
-        forward :'self.__elasticsearch__', :search        unless respond_to?(:search)
-        forward :'self.__elasticsearch__', :mapping       unless respond_to?(:mapping)
-        forward :'self.__elasticsearch__', :mappings      unless respond_to?(:mappings)
-        forward :'self.__elasticsearch__', :settings      unless respond_to?(:settings)
-        forward :'self.__elasticsearch__', :index_name    unless respond_to?(:index_name)
-        forward :'self.__elasticsearch__', :document_type unless respond_to?(:document_type)
-        forward :'self.__elasticsearch__', :import        unless respond_to?(:import)
+        class << self
+          delegate :search,        to: :__elasticsearch__ unless respond_to?(:search)
+          delegate :mapping,       to: :__elasticsearch__ unless respond_to?(:mapping)
+          delegate :mappings,      to: :__elasticsearch__ unless respond_to?(:mappings)
+          delegate :settings,      to: :__elasticsearch__ unless respond_to?(:settings)
+          delegate :index_name,    to: :__elasticsearch__ unless respond_to?(:index_name)
+          delegate :document_type, to: :__elasticsearch__ unless respond_to?(:document_type)
+          delegate :import,        to: :__elasticsearch__ unless respond_to?(:import)
+        end
 
         # Mix the importing module into the proxy
         #

data/lib/elasticsearch/model/adapters/active_record.rb

@@ -13,7 +13,7 @@ module Elasticsearch
           # Returns an `ActiveRecord::Relation` instance
           #
           def records
-            sql_records = klass.where(id: ids)
+            sql_records = klass.where(klass.primary_key => ids)
 
             # Re-order records based on the order from Elasticsearch hits
             # by redefining `to_a`, unless the user has called `order()`

data/lib/elasticsearch/model/ext/active_record.rb

@@ -0,0 +1,14 @@
+# Prevent `MyModel.inspect` failing with `ActiveRecord::ConnectionNotEstablished`
+# (triggered by elasticsearch-model/lib/elasticsearch/model.rb:79:in `included')
+#
+ActiveRecord::Base.instance_eval do
+  class << self
+    def inspect_with_rescue
+      inspect_without_rescue
+    rescue ActiveRecord::ConnectionNotEstablished
+      "#{self}(no database connection)"
+    end
+
+    alias_method_chain :inspect, :rescue
+  end
+end if defined?(ActiveRecord) && ActiveRecord::VERSION::STRING < '4'

data/lib/elasticsearch/model/importing.rb

@@ -60,20 +60,24 @@ module Elasticsearch
         #
         #    Article.import refresh: true
         #
+        # @example Import the records into a different index/type than the default one
+        #
+        #    Article.import index: 'my-new-index', type: 'my-other-type'
         #
         def import(options={}, &block)
-          errors = 0
+          errors       = 0
+          refresh      = options.delete(:refresh) || false
+          target_index = options.delete(:index)   || index_name
+          target_type  = options.delete(:type)    || document_type
 
           if options.delete(:force)
-            self.create_index! force: true
+            self.create_index! force: true, index: target_index
           end
 
-          refresh = options.delete(:refresh) || false
-
           __find_in_batches(options) do |batch|
             response = client.bulk \
-                         index:   index_name,
-                         type:    document_type,
+                         index:   target_index,
+                         type:    target_type,
                          body:    batch
 
             yield response if block_given?

data/lib/elasticsearch/model/indexing.rb

@@ -175,15 +175,21 @@ module Elasticsearch
         #
         #     Article.__elasticsearch__.create_index! force: true
         #
+        # @example Pass a specific index name
+        #
+        #     Article.__elasticsearch__.create_index! index: 'my-index'
+        #
         def create_index!(options={})
-          delete_index!(options) if options[:force]
+          target_index = options.delete(:index) || self.index_name
+
+          delete_index!(options.merge index: target_index) if options[:force]
 
-          unless ( self.client.indices.exists(index: self.index_name) rescue false )
+          unless ( self.client.indices.exists(index: target_index) rescue false )
             begin
-              self.client.indices.create index: self.index_name,
-                                                           body: {
-                                                             settings: self.settings.to_hash,
-                                                             mappings: self.mappings.to_hash }
+              self.client.indices.create index: target_index,
+                                         body: {
+                                           settings: self.settings.to_hash,
+                                           mappings: self.mappings.to_hash }
             rescue Exception => e
               unless e.class.to_s =~ /NotFound/ && options[:force]
                 STDERR.puts "[!!!] Error when creating the index: #{e.class}", "#{e.message}"
@@ -199,9 +205,15 @@ module Elasticsearch
         #
         #     Article.__elasticsearch__.delete_index!
         #
+        # @example Pass a specific index name
+        #
+        #     Article.__elasticsearch__.delete_index! index: 'my-index'
+        #
         def delete_index!(options={})
+          target_index = options.delete(:index) || self.index_name
+
           begin
-            self.client.indices.delete index: self.index_name
+            self.client.indices.delete index: target_index
           rescue Exception => e
             unless e.class.to_s =~ /NotFound/ && options[:force]
               STDERR.puts "[!!!] Error when deleting the index: #{e.class}", "#{e.message}"
@@ -215,11 +227,17 @@ module Elasticsearch
         #
         #     Article.__elasticsearch__.refresh_index!
         #
+        # @example Pass a specific index name
+        #
+        #     Article.__elasticsearch__.refresh_index! index: 'my-index'
+        #
         # @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-refresh.html
         #
         def refresh_index!(options={})
+          target_index = options.delete(:index) || self.index_name
+
           begin
-            self.client.indices.refresh index: self.index_name
+            self.client.indices.refresh index: target_index
           rescue Exception => e
             unless e.class.to_s =~ /NotFound/ && options[:force]
               STDERR.puts "[!!!] Error when refreshing the index: #{e.class}", "#{e.message}"

data/lib/elasticsearch/model/response.rb

@@ -14,9 +14,8 @@ module Elasticsearch
                     :took, :timed_out, :shards
 
         include Enumerable
-        extend  Support::Forwardable
 
-        forward :results, :each, :empty?, :size, :slice, :[], :to_ary
+        delegate :each, :empty?, :size, :slice, :[], :to_ary, to: :results
 
         def initialize(klass, search, options={})
           @klass     = klass

data/lib/elasticsearch/model/response/pagination.rb

@@ -20,8 +20,8 @@ module Elasticsearch
             Elasticsearch::Model::Response::Results.__send__ :include, ::Kaminari::PageScopeMethods
             Elasticsearch::Model::Response::Records.__send__ :include, ::Kaminari::PageScopeMethods
 
-            Elasticsearch::Model::Response::Results.__send__ :forward, :response, :limit_value, :offset_value, :total_count
-            Elasticsearch::Model::Response::Records.__send__ :forward, :response, :limit_value, :offset_value, :total_count
+            Elasticsearch::Model::Response::Results.__send__ :delegate, :limit_value, :offset_value, :total_count, to: :response
+            Elasticsearch::Model::Response::Records.__send__ :delegate, :limit_value, :offset_value, :total_count, to: :response
 
             base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
               # Define the `page` Kaminari method

data/lib/elasticsearch/model/response/records.rb

@@ -10,8 +10,7 @@ module Elasticsearch
       class Records
         include Enumerable
 
-        extend  Support::Forwardable
-        forward :records, :each, :empty?, :size, :slice, :[], :to_a, :to_ary
+        delegate :each, :empty?, :size, :slice, :[], :to_a, :to_ary, to: :records
 
         include Base
 

data/lib/elasticsearch/model/response/results.rb

@@ -10,8 +10,7 @@ module Elasticsearch
         include Base
         include Enumerable
 
-        extend  Support::Forwardable
-        forward :results, :each, :empty?, :size, :slice, :[], :to_a, :to_ary
+        delegate :each, :empty?, :size, :slice, :[], :to_a, :to_ary, to: :results
 
         # @see Base#initialize
         #

data/lib/elasticsearch/model/searching.rb

@@ -95,7 +95,7 @@ module Elasticsearch
         #     Article.search '{"query" : { "match_all" : {} }}'
         #
         def search(query_or_payload, options={})
-          search   = SearchRequest.new(self, query_or_payload, options={})
+          search   = SearchRequest.new(self, query_or_payload, options)
 
           Response::Response.new(self, search)
         end

data/lib/elasticsearch/model/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Model
-    VERSION = "0.1.0.rc1"
+    VERSION = "0.1.0"
   end
 end

data/test/integration/mongoid_basic_test.rb

@@ -1,17 +1,18 @@
 require 'test_helper'
 
 begin
-  require "mongoid"
+  require 'mongoid'
   session = Moped::Connection.new("localhost", 27017, 0.5)
   session.connect
   ENV["MONGODB_AVAILABLE"] = 'yes'
 rescue LoadError, Moped::Errors::ConnectionFailure => e
+  $stderr.puts "MongoDB not installed or running: #{e}"
 end
 
 if ENV["MONGODB_AVAILABLE"]
-  puts "Mongoid #{Mongoid::VERSION}", '-'*80
+  $stderr.puts "Mongoid #{Mongoid::VERSION}", '-'*80
 
-  logger = ::Logger.new(STDERR)
+  logger = ::Logger.new($stderr)
   logger.formatter = lambda { |s, d, p, m| " #{m.ansi(:faint, :cyan)}\n" }
   logger.level = ::Logger::DEBUG
 

data/test/test_helper.rb

@@ -49,7 +49,7 @@ module Elasticsearch
         tracer = ::Logger.new(STDERR)
         tracer.formatter = lambda { |s, d, p, m| "#{m.gsub(/^.*$/) { |n| '   ' + n }.ansi(:faint)}\n" }
 
-        Elasticsearch::Model.client = Elasticsearch::Client.new host: 'localhost:9250',
+        Elasticsearch::Model.client = Elasticsearch::Client.new host: "localhost:#{(ENV['TEST_CLUSTER_PORT'] || 9250)}",
                                                                 tracer: (ENV['QUIET'] ? nil : tracer)
       end
     end

data/test/unit/adapter_active_record_test.rb

@@ -23,6 +23,7 @@ class Elasticsearch::Model::AdapterActiveRecordTest < Test::Unit::TestCase
     setup do
       @records = [ stub(id: 1, inspect: '<Model-1>'), stub(id: 2, inspect: '<Model-2>') ]
       @records.stubs(:load).returns(true)
+      @records.stubs(:exec_queries).returns(true)
     end
 
     should "have the register condition" do
@@ -39,7 +40,7 @@ class Elasticsearch::Model::AdapterActiveRecordTest < Test::Unit::TestCase
         assert_instance_of Module, Elasticsearch::Model::Adapter::ActiveRecord::Records
 
         instance = DummyClassForActiveRecord.new
-        instance.expects(:klass).returns(mock('class', where: @records))
+        instance.expects(:klass).returns(mock('class', primary_key: :some_key, where: @records)).at_least_once
 
         assert_equal @records, instance.records
       end
@@ -54,7 +55,7 @@ class Elasticsearch::Model::AdapterActiveRecordTest < Test::Unit::TestCase
         @records.instance_variable_set(:@records, @records)
 
         instance = DummyClassForActiveRecord.new
-        instance.expects(:klass).returns(mock('class', where: @records))
+        instance.expects(:klass).returns(mock('class', primary_key: :some_key, where: @records)).at_least_once
 
         assert_equal [1, 2], @records.        to_a.map(&:id)
         assert_equal [2, 1], instance.records.to_a.map(&:id)
@@ -64,7 +65,7 @@ class Elasticsearch::Model::AdapterActiveRecordTest < Test::Unit::TestCase
         @records.instance_variable_set(:@records, @records)
 
         instance = DummyClassForActiveRecord.new
-        instance.expects(:klass).returns(stub('class', where: @records)).at_least_once
+        instance.expects(:klass).returns(stub('class', primary_key: :some_key, where: @records)).at_least_once
         instance.records.expects(:order).returns(@records)
 
         assert_equal [2, 1], instance.records.    to_a.map(&:id)

data/test/unit/importing_test.rb

@@ -91,7 +91,33 @@ class Elasticsearch::Model::ImportingTest < Test::Unit::TestCase
         assert_equal true, options[:force]
       end
 
+      DummyImportingModel.expects(:index_name).returns('foo')
+      DummyImportingModel.expects(:document_type).returns('foo')
+
       DummyImportingModel.import force: true, foo: 'bar'
     end
+
+    should "allow passing a different index / type" do
+      Elasticsearch::Model::Adapter.expects(:from_class)
+                                   .with(DummyImportingModel)
+                                   .returns(DummyImportingAdapter)
+
+      DummyImportingModel.__send__ :include, Elasticsearch::Model::Importing
+
+      client = mock('client')
+
+      client
+        .expects(:bulk)
+          .with do |options|
+            assert_equal 'my-new-index',  options[:index]
+            assert_equal 'my-other-type', options[:type]
+            true
+          end
+        .returns({'items' => [ {'index' => {} }]})
+
+      DummyImportingModel.stubs(:client).returns(client)
+
+      DummyImportingModel.import index: 'my-new-index', type: 'my-other-type'
+    end
   end
 end

data/test/unit/indexing_test.rb

@@ -358,6 +358,43 @@ class Elasticsearch::Model::IndexingTest < Test::Unit::TestCase
           DummyIndexingModelForRecreate.refresh_index!
         end
       end
+
+      context "with a custom index name" do
+        setup do
+          @client  = stub('client')
+          @indices = stub('indices')
+          @client.stubs(:indices).returns(@indices)
+          DummyIndexingModelForRecreate.expects(:client).returns(@client).at_least_once
+        end
+
+        should "create the custom index" do
+          @indices.expects(:exists).with do |arguments|
+            assert_equal 'custom-foo', arguments[:index]
+          end
+
+          @indices.expects(:create).with do |arguments|
+            assert_equal 'custom-foo', arguments[:index]
+          end
+
+          DummyIndexingModelForRecreate.create_index! index: 'custom-foo'
+        end
+
+        should "delete the custom index" do
+          @indices.expects(:delete).with do |arguments|
+            assert_equal 'custom-foo', arguments[:index]
+          end
+
+          DummyIndexingModelForRecreate.delete_index! index: 'custom-foo'
+        end
+
+        should "refresh the custom index" do
+          @indices.expects(:refresh).with do |arguments|
+            assert_equal 'custom-foo', arguments[:index]
+          end
+
+          DummyIndexingModelForRecreate.refresh_index! index: 'custom-foo'
+        end
+      end
     end
 
   end

data/test/unit/response_records_test.rb

@@ -20,7 +20,7 @@ class Elasticsearch::Model::RecordsTest < Test::Unit::TestCase
       end
     end
 
-    RESPONSE = { 'hits' => { 'total' => 123, 'max_score' => 456, 'hits' => [{'foo' => 'bar'}] } }
+    RESPONSE = { 'hits' => { 'total' => 123, 'max_score' => 456, 'hits' => [{'_id' => '1', 'foo' => 'bar'}] } }
     RESULTS  = Elasticsearch::Model::Response::Results.new DummyModel, RESPONSE
 
     setup do
@@ -28,7 +28,7 @@ class Elasticsearch::Model::RecordsTest < Test::Unit::TestCase
       search.stubs(:execute!).returns RESPONSE
 
       response = Elasticsearch::Model::Response::Response.new DummyModel, search
-      @records = Elasticsearch::Model::Response::Records.new DummyModel, response
+      @records = Elasticsearch::Model::Response::Records.new  DummyModel, response
     end
 
     should "access the records" do
@@ -58,6 +58,10 @@ class Elasticsearch::Model::RecordsTest < Test::Unit::TestCase
       assert_equal ['FOO---bar'], @records.map_with_hit { |record, hit| "#{record}---#{hit.foo}" }
     end
 
+    should "return the IDs" do
+      assert_equal ['1'], @records.ids
+    end
+
     context "with adapter" do
       module DummyAdapter
         module RecordsMixin

data/test/unit/searching_test.rb

@@ -23,10 +23,11 @@ class Elasticsearch::Model::SearchingTest < Test::Unit::TestCase
         .expects(:new).with do |klass, query, options|
           assert_equal DummySearchingModel, klass
           assert_equal 'foo', query
+          assert_equal({default_operator: 'AND'}, options)
         end
         .returns( stub('search') )
 
-      DummySearchingModel.search 'foo'
+      DummySearchingModel.search 'foo', default_operator: 'AND'
     end
 
     should "not execute the search" do

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-model
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc1
-  prerelease: 6
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
@@ -24,9 +24,25 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -107,22 +123,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -385,8 +385,8 @@ files:
 - examples/mongoid_article.rb
 - examples/ohm_article.rb
 - examples/riak_article.rb
-- gemfiles/3.gemfile
-- gemfiles/4.gemfile
+- gemfiles/3.0.gemfile
+- gemfiles/4.0.gemfile
 - lib/elasticsearch/model.rb
 - lib/elasticsearch/model/adapter.rb
 - lib/elasticsearch/model/adapters/active_record.rb
@@ -394,6 +394,7 @@ files:
 - lib/elasticsearch/model/adapters/mongoid.rb
 - lib/elasticsearch/model/callbacks.rb
 - lib/elasticsearch/model/client.rb
+- lib/elasticsearch/model/ext/active_record.rb
 - lib/elasticsearch/model/importing.rb
 - lib/elasticsearch/model/indexing.rb
 - lib/elasticsearch/model/naming.rb
@@ -406,7 +407,6 @@ files:
 - lib/elasticsearch/model/response/results.rb
 - lib/elasticsearch/model/searching.rb
 - lib/elasticsearch/model/serializing.rb
-- lib/elasticsearch/model/support/forwardable.rb
 - lib/elasticsearch/model/version.rb
 - test/integration/active_record_associations_parent_child.rb
 - test/integration/active_record_associations_test.rb
@@ -453,9 +453,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/gemfiles/3.gemfile

@@ -1,11 +0,0 @@
-# Usage:
-#
-# $ BUNDLE_GEMFILE=./gemfiles/3.gemfile bundle install
-# $ BUNDLE_GEMFILE=./gemfiles/3.gemfile bundle exec rake test:integration
-
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 3.2'
-gem 'mongoid',      '>= 3.0'
-
-gemspec path: '../'

data/gemfiles/4.gemfile

@@ -1,11 +0,0 @@
-# Usage:
-#
-# $ BUNDLE_GEMFILE=./gemfiles/4.gemfile bundle install
-# $ BUNDLE_GEMFILE=./gemfiles/4.gemfile bundle exec rake test:integration
-
-source 'https://rubygems.org'
-
-gem 'activerecord', '~> 4'
-gem 'mongoid',      '~> 4.0.0.alpha1'
-
-gemspec path: '../'

data/lib/elasticsearch/model/support/forwardable.rb

@@ -1,44 +0,0 @@
-module Elasticsearch
-  module Model
-    module Support
-
-      # Lightweight wrapper around "forwardable.rb" interface,
-      # to allow easy implementation changes in the future.
-      #
-      # Cf. https://github.com/mongoid/origin/blob/master/lib/origin/forwardable.rb
-      #
-      module Forwardable
-        def self.extended(base)
-          base.__send__ :extend, ::Forwardable
-          base.__send__ :extend, ::SingleForwardable
-        end
-
-        # Forwards specific method(s) to the provided receiver
-        #
-        # @example Forward the `each` method to `results` object
-        #
-        #   MyClass.forward(:results, :each)
-        #
-        # @example Forward the `include?` method to `ancestors` class method
-        #
-        #   MyClass.forward(:'self.ancestors', :include?)
-        #
-        # @param [ Symbol ] receiver        The name of the receiver method
-        # @param [ Symbol, Array ] methods  The forwarded methods
-        #
-        # @api private
-        #
-        def forward(receiver, *methods)
-          methods = Array(methods).flatten
-          target  = self.__send__ :eval, receiver.to_s rescue nil
-
-          if target
-            single_delegate   methods => receiver
-          else
-            instance_delegate methods => receiver
-          end
-        end; module_function :forward
-      end
-    end
-  end
-end