activesearch 0.0.16 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDRmYzczZTA2MjhjZGQ5NGYzOWVmOTdhOGI4NTg5YjkzZmVjNWI0MQ==
+    MWYxYmEyMGYzMWUzYzQyNTM1ZGU0Y2NhNTdmMGM3OWQ5OWQyNzk5NQ==
   data.tar.gz: !binary |-
-    MzAwZTIxNDE5MmFlNTZlOTQxYWI0YTEwM2U0MGZlMDU5YzllYWIyMw==
+    ZWEzMWFlYjcyMGY0NTI3NTMwZTQ4MGEzY2E3M2JiYmNkYmM1YzJjZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTRhMzQxMzU5ZmQ2NTkzOTI2NTE4M2I4NDAyMDJlY2VhODg1YjNjZDFiMGIy
-    YjFiYmM4N2U4MDIyNTllOGZkZDczYjA0YmU3MGEzZTQxZDBmNTMwOTM4Zjk2
-    OTg1YmNlNTQyYzdjZTkyNDg0NWZhYjgxZjMxNjdhODk4ZTJkNzQ=
+    MDUzMDk0ZjBlZjUwOWY1YzIwN2U1MzRkYTQzNWViODc2OTEyOTg3ZDU0ODE1
+    Yjk5ODkyN2U1Mzk4N2M1MWYwNjExYzMwZDM0ZjYyNzI1ZmQ1ZjU4ZGNjYzEy
+    Y2QyMTkxNjYzOTMxYTBkN2JiMjA5YzcyMWYwZTE2NmNlMzYwZWQ=
   data.tar.gz: !binary |-
-    YzQ0YTQyNGQwY2VjMTg1ZDAyYjg3ZjJhYTJjZDQzZWM0ZWRiZTRkMWM5M2Zi
-    M2Q3Mjc3NTNjOWFiMzIzYTM2M2ZhODllYjliMTJkYzVhNGJlMGM2ODEyMTY5
-    YzdlN2IzYmU4ZmFhODZlNjk1MDNkNDQ1YjQxMTUxZDVkYTM1YTg=
+    YTE2ZDA5OTI3NzMzOTI3NWUyZTljZTFhNmRjZDUyNmI4NWY1YWE0MWJiNGY3
+    Yzc3ZjJlYmY2NzQ4MDJiN2E1MzBjYzE3N2M1ZGJhYzUxNjI1ZmEyYTc0Mzgx
+    MGEyMmYxNDJiYjlkYmQ1OTc1MGNmYTc3Mzg5NmJlNzU3YTcwYWM=

data/README.md

@@ -6,6 +6,11 @@ This gem allows any class to be indexed by the chosen fulltext search engine.
 
 Depending on the chosen engine, you need to require a dependency and then activesearch on your Gemfile:
 
+## Mongoid 2.x users
+
+If you are using mongoid 2.x, you should use ```gem 'activesearch', '~> 0.0.16'```.
+What lies below is for mongoid 3.x.
+
 ###Mongoid
 
     gem 'mongoid'

data/activesearch.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |gem|
   
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rspec-mocks"
-  gem.add_development_dependency "bson_ext"
   gem.add_development_dependency "active_attr"
-  gem.add_development_dependency "mongoid", "~> 2"
+  gem.add_development_dependency "mongoid", "~> 3"
   gem.add_development_dependency "tire"
   gem.add_development_dependency "parallel_tests"
   gem.add_development_dependency "httparty"
+  gem.add_development_dependency "multi_json", "1.7.2" # to avoid annoyinh warning on 1.7.3
 end

data/lib/activesearch/mongoid/model.rb

@@ -4,13 +4,13 @@ module ActiveSearch
       include ::Mongoid::Document
       
       field :_original_type, type: String
-      field :_original_id, type: BSON::ObjectId
+      field :_original_id, type: Moped::BSON::ObjectId
       field :_keywords
       field :_stored, type: Hash, default: {}
       alias_method :to_hash, :_stored
       
-      index :_keywords
-      index [:_original_type, :_original_id], unique: true
+      index({_keywords: 1})
+      index({_original_type: 1, _original_id: 1}, unique: true)
       
       def store_fields(original, fields, options)
         if options && options[:store]

data/lib/activesearch/version.rb

@@ -1,3 +1,3 @@
 module ActiveSearch
-  VERSION = "0.0.16"
+  VERSION = "0.1.0"
 end

data/spec/engines_spec.rb

@@ -13,7 +13,7 @@ def cleanup(engine)
     Tire::Configuration.client.delete "#{Tire::Configuration.url}/_all"
     load File.join(File.dirname(__FILE__), 'models', 'elastic_search.rb')
   when "Mongoid"
-    Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)
+    Mongoid.purge!
   end
 end
 

data/spec/models/mongoid.rb

@@ -1,7 +1,9 @@
 require 'mongoid'
 require 'activesearch/mongoid'
 
-Mongoid.database = Mongo::Connection.new("localhost").db("activesearch_test")
+Mongoid.configure do |config|
+  config.sessions = {:default => {:hosts => ["localhost"], :database => "activesearch_test"}}
+end
 
 class MongoidModel
   include Mongoid::Document

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activesearch
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.1.0
 platform: ruby
 authors:
 - Rodrigo Alvarez
@@ -52,20 +52,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: tire
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +122,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 description: ORM agnostic full text search
 email:
 - papipo@gmail.com