sunspot_mongoid2 0.5.1.5 → 0.5.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819da31a85723db82618fafa0c5e3afc5ae6b68d
-  data.tar.gz: 5f050e56fdd23c886619a327a887cd93498da183
+  metadata.gz: 887730f8410e42b1acace349cfd05efdae5a76bd
+  data.tar.gz: 4c135ea6545f21801acef13704de67eed2f9c2f4
 SHA512:
-  metadata.gz: 73eb200b759b8bf2eb7e3dab39089e4b42ee125fa6fcc6a6007cf652f263c85bef6f7f5de61c9d30f2a16652e4d7af78f8131e6c9f5ffdc8b3219b44e85fae93
-  data.tar.gz: dbf935fb20c72b0582352d688fcde25a8ba7db4fc861fc32a63b1e3d1d8d840be2abef973efd89c5c49acb4999ef6885ffd0e9b88e1c7da9faef569252536e81
+  metadata.gz: 5b0f274024b8217cec6bbfe73bf81fb8d205433006518766e908c486c49b2be67c3f6d2d3382af71a677f0e61cba990d25d75cd36c14693e3348d7e6b1c3de7d
+  data.tar.gz: fb7c7f5385f6080ae74c5fa3017f4402517a9907e9f43019592da2fd11b4072b56164463b53060f637d930f62ac4e0be7620bf498b87f237a51ef1a422135adc

data/README.md

@@ -41,6 +41,7 @@ A Simple Example
 
       searchable do
         text :title
+        integer :foo_totals, multiple: true
       end
 
       field :title

data/Rakefile

@@ -5,13 +5,13 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "sunspot_mongoid2"
-    gem.version = '0.5.1.5'
+    gem.version = '0.5.1.7'
     gem.summary = %Q{A Sunspot wrapper for Mongoid 2 or newer.}
     gem.description = %Q{A Sunspot wrapper for Mongoid that is like sunspot_rails.}
     gem.email = "jugyo.org@gmail.com aq1018@gmail.com hlegius@gmail.com"
     gem.homepage = "http://github.com/hlegius/sunspot_mongoid"
     gem.authors = ["jugyo", "aq1018", 'hlegius']
-    gem.add_runtime_dependency "mongoid", ">= 0"
+    gem.add_runtime_dependency "mongoid", ">= 2"
     gem.add_runtime_dependency "sunspot", ">= 2"
     gem.add_runtime_dependency "sunspot_rails", ">= 2"
     gem.add_development_dependency "shoulda", ">= 0"

data/lib/sunspot/mongoid2.rb

@@ -16,8 +16,8 @@ module Sunspot
     module ActsAsMethods
       # ClassMethods isn't loaded until searchable is called so we need
       # call it, then extend our own ClassMethods.
-      def searchable (opt = {}, &block)
-        super 
+      def searchable(opt = {}, &block)
+        super
         extend ClassMethods
       end
     end
@@ -39,11 +39,19 @@ module Sunspot
 
     class DataAccessor < Sunspot::Adapters::DataAccessor
       def load(id)
-        @clazz.find(::Moped::BSON::ObjectId.from_string(id)) rescue nil
+        @clazz.find(bson_id(id)) rescue nil
       end
 
       def load_all(ids)
-        @clazz.where(:_id.in => ids.map { |id| ::Moped::BSON::ObjectId.from_string(id) })
+        @clazz.where(:_id.in => ids.map { |id| bson_id(id) })
+      end
+
+      def bson_id(id)
+        if Gem::Version.new(Mongoid::VERSION) >= Gem::Version.new('3')
+          ::Moped::BSON::ObjectId.from_string(id)
+        else
+          ::BSON::ObjectId.from_string(id)
+        end
       end
     end
   end

data/sunspot_mongoid2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sunspot_mongoid2"
-  s.version = "0.5.1.5"
+  s.version = "0.5.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo", "aq1018", "hlegius"]
-  s.date = "2013-05-27"
+  s.date = "2013-08-29"
   s.description = "A Sunspot wrapper for Mongoid that is like sunspot_rails."
   s.email = "jugyo.org@gmail.com aq1018@gmail.com hlegius@gmail.com"
   s.extra_rdoc_files = [
@@ -41,20 +41,20 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 0"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 2"])
       s.add_runtime_dependency(%q<sunspot>, [">= 2"])
       s.add_runtime_dependency(%q<sunspot_rails>, [">= 2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rr>, [">= 0"])
     else
-      s.add_dependency(%q<mongoid>, [">= 0"])
+      s.add_dependency(%q<mongoid>, [">= 2"])
       s.add_dependency(%q<sunspot>, [">= 2"])
       s.add_dependency(%q<sunspot_rails>, [">= 2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rr>, [">= 0"])
     end
   else
-    s.add_dependency(%q<mongoid>, [">= 0"])
+    s.add_dependency(%q<mongoid>, [">= 2"])
     s.add_dependency(%q<sunspot>, [">= 2"])
     s.add_dependency(%q<sunspot_rails>, [">= 2"])
     s.add_dependency(%q<shoulda>, [">= 0"])

data/test/helper.rb

@@ -1,12 +1,6 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
+require 'minitest/autorun'
+require 'pry'
 require 'rr'
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'sunspot_mongoid'
-
-class Test::Unit::TestCase
-  include RR::Adapters::TestUnit
-end
+require 'sunspot_mongoid2'

data/test/test_sunspot_mongoid.rb

@@ -1,16 +1,14 @@
 require 'helper'
 
-#
-# NOTE: I think tests are too few...
-#
-class TestSunspotMongoid < Test::Unit::TestCase
+describe Sunspot::Mongoid2 do
   class Foo
     include Mongoid::Document
     field :title
 
-    include Sunspot::Mongoid
+    include Sunspot::Mongoid2
     searchable do
       text :title
+      integer :counting, multiple: false
     end
   end
 
@@ -18,30 +16,37 @@ class TestSunspotMongoid < Test::Unit::TestCase
     include Mongoid::Document
     field :title
 
-    include Sunspot::Mongoid
+    include Sunspot::Mongoid2
     searchable(:auto_index => false, :auto_remove => false) do
       text :title
     end
   end
 
-  context 'default' do
-    should 'sunspot_options is specified' do
-      assert Foo.sunspot_options == {:include => []}
-      assert Bar.sunspot_options == {:auto_index=>false, :auto_remove=>false, :include=>[]}
+  describe 'initial' do
+    it 'sunspot_options is specified' do
+      Foo.sunspot_options.must_equal({include: []})
+      Bar.sunspot_options.must_equal({auto_index: false, auto_remove: false, include: []})
     end
 
-    should 'be called Sunspot.setup when call Foo.searchable' do
-      mock(Sunspot).setup(Foo)
-      Foo.searchable
+    it 'get as text_fields from Sunspot::Setup' do
+      text_field = Sunspot::Setup.for(Foo).all_text_fields.first
+      text_field.type.must_be_instance_of Sunspot::Type::TextType
+      text_field.name.must_equal :title
+      text_field.multiple?.must_equal true
     end
 
-    should 'get as text_fields from Sunspot::Setup' do
-      text_field = Sunspot::Setup.for(Foo).all_text_fields.first
-      assert text_field.type == Sunspot::Type::TextType.instance
-      assert text_field.name == :title
+    it "Sunspot field must support the 'multiple' attribute" do
+      integer_field = Sunspot::Setup.for(Foo).fields.last
+      integer_field.name.must_equal :counting
+      integer_field.multiple?.must_equal false
+    end
+
+    it 'be called Sunspot.setup when call Foo.searchable' do
+      mock(Sunspot).setup(Foo)
+      Foo.searchable
     end
 
-    should 'search' do
+    it '#search' do
       options = {}
       mock.proxy(Foo).solr_execute_search(options)
       mock(Sunspot).new_search(Foo) { mock(Object.new).execute }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_mongoid2
 version: !ruby/object:Gem::Version
-  version: 0.5.1.5
+  version: 0.5.1.7
 platform: ruby
 authors:
 - jugyo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: sunspot
   requirement: !ruby/object:Gem::Requirement