acts_as_solr_reloaded 1.1.0 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/acts_as_solr.rb

@@ -31,11 +31,14 @@ require File.dirname(__FILE__) + '/acts_as_solr/acts_methods'
 require File.dirname(__FILE__) + '/acts_as_solr/common_methods'
 require File.dirname(__FILE__) + '/acts_as_solr/parser_methods'
 require File.dirname(__FILE__) + '/acts_as_solr/class_methods'
+require File.dirname(__FILE__) + '/acts_as_solr/dynamic_attribute'
+require File.dirname(__FILE__) + '/acts_as_solr/local'
 require File.dirname(__FILE__) + '/acts_as_solr/instance_methods'
 require File.dirname(__FILE__) + '/acts_as_solr/common_methods'
 require File.dirname(__FILE__) + '/acts_as_solr/deprecation'
 require File.dirname(__FILE__) + '/acts_as_solr/search_results'
 require File.dirname(__FILE__) + '/acts_as_solr/lazy_document'
+require File.dirname(__FILE__) + '/acts_as_solr/mongo_mapper'
 module ActsAsSolr
   
   class Post    
@@ -62,4 +65,4 @@ module ActsAsSolr
 end
 
 # reopen ActiveRecord and include the acts_as_solr method
-ActiveRecord::Base.extend ActsAsSolr::ActsMethods
+ActiveRecord::Base.extend ActsAsSolr::ActsMethods

data/lib/acts_as_solr/acts_methods.rb

@@ -267,7 +267,7 @@ module ActsAsSolr #:nodoc:
       }
       self.solr_configuration = {
         :type_field => "type_s",
-        :primary_key_field => "pk_i",
+        :primary_key_field => "pk_s",
         :default_boost => 1.0
       }
 
@@ -349,15 +349,25 @@ module ActsAsSolr #:nodoc:
       if configuration[:facets] && configuration[:facets].include?(field)
         :facet
       elsif column = columns_hash[field.to_s]
-        case column.type
-        when :string then :text
-        when :datetime then :date
-        when :time then :date
-        else column.type
+        column_type = format_column_type(column.type)
+        
+        case column_type
+          when :string then :text
+          when :datetime then :date
+          when :time then :date
+          else column_type
         end
       else
         :text
       end
     end
+    
+    def format_column_type(type)
+      if type.class.eql? Symbol
+        type
+      else
+        type.to_s.eql?("ObjectId") ? :string : type.to_s.downcase.to_sym
+      end
+    end
   end
-end
+end

data/lib/acts_as_solr/common_methods.rb

@@ -83,7 +83,5 @@ module ActsAsSolr #:nodoc:
     def record_id(object)
       eval "object.#{object.class.primary_key}"
     end
-    
   end
-  
 end

data/lib/acts_as_solr/instance_methods.rb

@@ -1,6 +1,3 @@
-require 'acts_as_solr/dynamic_attribute'
-require 'acts_as_solr/local'
-
 module ActsAsSolr #:nodoc:
   
   module InstanceMethods
@@ -14,7 +11,7 @@ module ActsAsSolr #:nodoc:
     def solr_save
       return true if indexing_disabled?
       if evaluate_condition(:if, self) 
-        logger.debug "solr_save: #{self.class.name} : #{record_id(self)}"
+        debug "solr_save: #{self.class.name} : #{record_id(self)}"
         solr_add to_solr_doc
         solr_commit if configuration[:auto_commit]
         true
@@ -30,7 +27,7 @@ module ActsAsSolr #:nodoc:
     # remove from index
     def solr_destroy
       return true if indexing_disabled?
-      logger.debug "solr_destroy: #{self.class.name} : #{record_id(self)}"
+      debug "solr_destroy: #{self.class.name} : #{record_id(self)}"
       solr_delete solr_id
       solr_commit if configuration[:auto_commit]
       true
@@ -38,7 +35,7 @@ module ActsAsSolr #:nodoc:
 
     # convert instance to Solr document
     def to_solr_doc
-      logger.debug "to_solr_doc: creating doc for class: #{self.class.name}, id: #{record_id(self)}"
+      debug "to_solr_doc: creating doc for class: #{self.class.name}, id: #{record_id(self)}"
       doc = Solr::Document.new
       doc.boost = validate_boost(configuration[:boost]) if configuration[:boost]
       
@@ -81,11 +78,16 @@ module ActsAsSolr #:nodoc:
       add_tags(doc)
       add_space(doc)
       
-      logger.debug doc.to_xml
+      debug doc.to_xml
       doc
     end
     
     private
+    
+    def debug(text)
+      logger.debug text rescue nil
+    end
+    
     def add_space(doc)
       if configuration[:spatial] and local
         doc << Solr::Field.new("lat" => local.latitude)

data/lib/acts_as_solr/mongo_mapper.rb

@@ -0,0 +1,27 @@
+module ActsAsSolr
+  module MongoMapper
+    def self.included(clazz)
+      clazz.extend ActsAsSolr::ActsMethods
+      clazz.extend ClassMethods
+    end
+    
+    module ClassMethods
+      def columns_hash
+        keys
+      end
+      
+      def primary_key
+        'id'
+      end
+      
+      def find(*args)
+        if args.first.instance_of? Array
+          ids = args.first.map { |id| Mongo::ObjectID.from_string(id) }
+          super :all, :conditions => {primary_key => ids}
+        else
+          super *args
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_solr/parser_methods.rb

@@ -104,7 +104,7 @@ module ActsAsSolr #:nodoc:
     end
 
     def solr_type_condition
-      subclasses.inject("(#{solr_configuration[:type_field]}:#{self.name}") do |condition, subclass|
+      (subclasses || []).inject("(#{solr_configuration[:type_field]}:#{self.name}") do |condition, subclass|
         condition << " OR #{solr_configuration[:type_field]}:#{subclass.name}"
       end << ')'
     end
@@ -148,12 +148,11 @@ module ActsAsSolr #:nodoc:
       result = if configuration[:lazy] && configuration[:format] != :ids
         ids.collect {|id| ActsAsSolr::LazyDocument.new(id, self)}
       elsif configuration[:format] == :objects
-        conditions = [ "#{self.table_name}.#{primary_key} in (?)", ids ]
-        find_options = {:conditions => conditions}
+        find_options = {}
         find_options[:include] = options[:include] if options[:include]
         find_options[:select] = options[:select] if options[:select]
         find_options[:joins] = options[:joins] if options[:joins]
-        result = reorder(self.find(:all, find_options), ids)
+        result = reorder(self.find(ids, find_options), ids)
       else
         ids
       end
@@ -166,7 +165,7 @@ module ActsAsSolr #:nodoc:
       ordered_things = Array.new(things.size)
       raise "Out of sync! Found #{ids.size} items in index, but only #{things.size} were found in database!" unless things.size == ids.size
       things.each do |thing|
-        position = ids.index(thing.id)
+        position = ids.index(thing.id.to_s)
         ordered_things[position] = thing
       end
       ordered_things

data/test/functional/acts_as_solr_test.rb

@@ -4,6 +4,8 @@ require "#{File.dirname(File.expand_path(__FILE__))}/../test_helper"
 class ActsAsSolrTest < Test::Unit::TestCase
 
   fixtures :books, :movies, :electronics, :postings, :authors, :advertises
+  
+  Document.destroy_all
 
   DynamicAttribute.delete_all
   Advertise.first.dynamic_attributes.create! :name => 'Description', :value => 'A very cool bike'
@@ -118,7 +120,7 @@ class ActsAsSolrTest < Test::Unit::TestCase
       'author:peter AND ruby'].each do |term|
       records = Book.find_id_by_solr term
       assert_equal 1, records.docs.size
-      assert_equal [2], records.docs
+      assert_equal ['2'], records.docs
     end
   end
 
@@ -130,7 +132,7 @@ class ActsAsSolrTest < Test::Unit::TestCase
       'author:clancy AND splinter'].each do |term|
       records = Book.find_id_by_solr term
       assert_equal 1, records.docs.size
-      assert_equal [1], records.docs
+      assert_equal ['1'], records.docs
     end
   end
 
@@ -142,7 +144,7 @@ class ActsAsSolrTest < Test::Unit::TestCase
       'dummy OR cell'].each do |term|
       records = Book.find_id_by_solr term
       assert_equal 2, records.docs.size
-      assert_equal [1,2], records.docs
+      assert_equal ['1','2'], records.docs
     end
   end
 
@@ -460,4 +462,8 @@ class ActsAsSolrTest < Test::Unit::TestCase
     assert_equal expected, records.highlights.values.first
   end
 
+  def test_mongo_mappers_documents_are_found
+    Document.new(:name => "mapper").save
+    assert_equal "mapper", Document.search("mapper").docs.first.name
+  end
 end

data/test/models/document.rb

@@ -0,0 +1,6 @@
+class Document
+  include MongoMapper::Document
+  include ActsAsSolr::MongoMapper
+  key :name, String
+  acts_as_solr
+end

data/test/test_helper.rb

@@ -10,6 +10,10 @@ begin
 rescue
 end
 
+require 'mongo_mapper'
+
+MongoMapper.database = "acts_as_solr_reloaded-test"
+
 RAILS_ROOT = File.dirname(__FILE__) unless defined? RAILS_ROOT
 RAILS_ENV  = 'test' unless defined? RAILS_ENV
 ENV["RAILS_ENV"] = "test"

data/test/unit/acts_methods_shoulda.rb

@@ -47,6 +47,13 @@ class ActsMethodsTest < Test::Unit::TestCase
 
   class NotTaggable < Abstract
   end
+  
+  class Mapper
+    include MongoMapper::Document
+    include ActsAsSolr::MongoMapper
+    key :value1, String
+    acts_as_solr
+  end
 
   should "define the model as taggable if taggable is true" do
     assert Taggable.taggable?
@@ -55,6 +62,14 @@ class ActsMethodsTest < Test::Unit::TestCase
   should "not define the model as taggable if taggable is not true" do
     assert !NotTaggable.taggable?
   end
+  
+  should "define the type of a MongoMapper document id as text" do
+    assert_equal :text, Mapper.configuration[:solr_fields][:_id][:type]
+  end
+  
+  should "recognize the type String of a MongoMapper key as text" do
+    assert_equal :text, Mapper.configuration[:solr_fields][:value1][:type]
+  end
 
   context "when getting field values" do
     setup do

data/test/unit/common_methods_shoulda.rb

@@ -3,6 +3,16 @@ require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
 class CommonMethodsTest < Test::Unit::TestCase
   include ActsAsSolr::CommonMethods
   
+  class Mongo
+    include MongoMapper::Document
+    include ActsAsSolr::MongoMapper
+    acts_as_solr
+    
+    def id
+      '4b5e0119f3a4b02902000001'
+    end
+  end
+  
   class << self
     def primary_key
       "id"
@@ -104,8 +114,15 @@ class CommonMethodsTest < Test::Unit::TestCase
   end
   
   context "when determining the record id" do
-    should "return the primary key value" do
-      assert_equal 10, record_id(self)
+    context "on ActiveRecord" do
+      should "return the primary key value" do
+        assert_equal 10, record_id(self)
+      end
+    end
+    context "on MongoMapper" do
+      should "return the id value" do
+        assert_equal '4b5e0119f3a4b02902000001', record_id(Mongo.new)
+      end
     end
   end
 end

data/test/unit/parser_methods_shoulda.rb

@@ -39,7 +39,7 @@ class ParserMethodsTest < Test::Unit::TestCase
         end
 
         should "query with the record ids" do
-          @parser.expects(:find).with(:all, :conditions => ["documents.id in (?)", [1, 2]]).returns [1, 2]
+          @parser.expects(:find).with([1, 2], {}).returns [1, 2]
           @parser.parse_results(@results)
         end
 
@@ -49,7 +49,7 @@ class ParserMethodsTest < Test::Unit::TestCase
         end
 
         should "add :include if :include was specified" do
-          @parser.expects(:find).with(:all, :conditions => ["documents.id in (?)", [1, 2]], :include => [:author]).returns [1, 2]
+          @parser.expects(:find).with([1, 2], :include => [:author]).returns [1, 2]
           @parser.parse_results(@results, :include => [:author])
         end
       end
@@ -140,7 +140,7 @@ class ParserMethodsTest < Test::Unit::TestCase
         thing3 = stub(:things3)
         thing3.stubs(:id).returns 3
         things = [thing1, thing2, thing3]
-        reordered = @parser.reorder(things, [1, 3, 5])
+        reordered = @parser.reorder(things, ['1', '3', '5'])
         assert_equal [1, 3, 5], reordered.collect{|thing| thing.id}
       end
     end
@@ -162,7 +162,7 @@ class ParserMethodsTest < Test::Unit::TestCase
       end
 
       should "set the relevancy of the specified fields and non-filtered terms" do
-        expected = "(aeroplane brasil continent_t:south OR description_t:(aeroplane brasil)^3 OR tag_t:(aeroplane brasil)^5)"
+        expected = "(aeroplane brasil continent_t:south OR tag_t:(aeroplane brasil)^5 OR description_t:(aeroplane brasil)^3)"
         ActsAsSolr::Post.expects(:execute).with {|request, core|
           request.to_hash[:q].starts_with? expected
         }
@@ -178,7 +178,7 @@ class ParserMethodsTest < Test::Unit::TestCase
       end
 
       should "set the relevance with simple queries" do
-        expected = "(car OR description_t:(car)^3 OR tag_t:(car)^5)"
+        expected = "(car OR tag_t:(car)^5 OR description_t:(car)^3)"
         ActsAsSolr::Post.expects(:execute).with {|request, core|
           request.to_hash[:q].starts_with? expected
         }

data/test/unit/solr_instance.rb

@@ -15,10 +15,6 @@ class SolrInstance
     "id"
   end
   
-  def logger
-    @logger ||= Logger.new(StringIO.new)
-  end
-  
   def record_id(obj)
     10
   end

data/test/unit/test_helper.rb

@@ -12,6 +12,7 @@ require File.expand_path("#{dir}/solr_instance")
 require File.expand_path("#{dir}/parser_instance")
 require 'erb'
 require 'ostruct'
+require 'mongo_mapper'
 
 if RUBY_VERSION =~ /^1\.9/
   puts "\nRunning the unit test suite doesn't as of yet work with Ruby 1.9, because Mocha hasn't yet been updated to use minitest."
@@ -22,3 +23,9 @@ end
 require 'mocha'
 gem 'thoughtbot-shoulda'
 require 'shoulda'
+
+class Rails
+  def self.logger
+    Logger.new(StringIO.new)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_solr_reloaded
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Diego Carrion
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 -02:00
+date: 2010-01-26 00:00:00 -02:00
 default_executable: 
 dependencies: []
 
@@ -45,6 +45,7 @@ files:
 - lib/acts_as_solr/instance_methods.rb
 - lib/acts_as_solr/lazy_document.rb
 - lib/acts_as_solr/local.rb
+- lib/acts_as_solr/mongo_mapper.rb
 - lib/acts_as_solr/parser_methods.rb
 - lib/acts_as_solr/search_results.rb
 - lib/acts_as_solr/solr_fixtures.rb
@@ -203,6 +204,7 @@ files:
 - test/models/author.rb
 - test/models/book.rb
 - test/models/category.rb
+- test/models/document.rb
 - test/models/dynamic_attribute.rb
 - test/models/electronic.rb
 - test/models/gadget.rb
@@ -271,6 +273,7 @@ test_files:
 - test/models/author.rb
 - test/models/book.rb
 - test/models/category.rb
+- test/models/document.rb
 - test/models/dynamic_attribute.rb
 - test/models/electronic.rb
 - test/models/gadget.rb