sunspot 1.0.5 → 1.1.0

data/lib/sunspot/type.rb

@@ -17,6 +17,46 @@ module Sunspot
   #   Ruby type.
   #
   module Type
+    class <<self
+      def register(sunspot_type, *classes)
+        classes.each do |clazz|
+          ruby_type_map[clazz.name.to_sym] = sunspot_type.instance
+        end
+      end
+
+      def for_class(clazz)
+        if clazz
+          ruby_type_map[clazz.name.to_sym] || for_class(clazz.superclass)
+        end
+      end
+
+      def for(object)
+        for_class(object.class)
+      end
+
+      def to_indexed(object)
+        if type = self.for(object)
+          type.to_indexed(object)
+        else
+          object.to_s
+        end
+      end
+
+      def to_literal(object)
+        if type = self.for(object)
+          type.to_literal(object)
+        else
+          raise ArgumentError, "Can't use #{object.inspect} as Solr literal: #{object.class} has no registered Solr type"
+        end
+      end
+
+      private
+
+      def ruby_type_map
+        @ruby_type_map ||= {}
+      end
+    end
+
     class AbstractType #:nodoc:
       class <<self
         def instance
@@ -28,6 +68,17 @@ module Sunspot
       def accepts_dynamic?
         true
       end
+
+      def accepts_more_like_this?
+        false
+      end
+
+      def to_literal(object)
+        raise(
+          ArgumentError,
+          "#{self.class.name} cannot be used as a Solr literal"
+        )
+      end
     end
 
     # 
@@ -53,6 +104,10 @@ module Sunspot
       def accepts_dynamic?
         false
       end
+
+      def accepts_more_like_this?
+        true
+      end
     end
 
     # 
@@ -71,6 +126,7 @@ module Sunspot
         string
       end
     end
+    register(StringType, String)
 
     # 
     # The Integer type represents integers.
@@ -84,10 +140,15 @@ module Sunspot
         value.to_i.to_s if value
       end
 
+      def to_literal(value)
+        to_indexed(value)
+      end
+
       def cast(string) #:nodoc:
         string.to_i
       end
     end
+    register(IntegerType, Integer)
 
     # 
     # The Long type indexes Ruby Fixnum and Bignum numbers into Java Longs
@@ -110,10 +171,15 @@ module Sunspot
         value.to_f.to_s if value
       end
 
+      def to_literal(value)
+        to_indexed(value)
+      end
+
       def cast(string) #:nodoc:
         string.to_f
       end
     end
+    register(FloatType, Float)
 
     # 
     # The Double type indexes Ruby Floats (which are in fact doubles) into Java
@@ -142,6 +208,10 @@ module Sunspot
         end
       end
 
+      def to_literal(value)
+        to_indexed(value)
+      end
+
       def cast(string) #:nodoc:
         begin
           Time.xmlschema(string)
@@ -166,6 +236,7 @@ module Sunspot
         end
       end
     end
+    register TimeType, Time, DateTime
 
     # 
     # The DateType encapsulates dates (without time information). Internally,
@@ -192,6 +263,7 @@ module Sunspot
         Date.civil(time.year, time.mon, time.mday)
       end
     end
+    register DateType, Date
 
     # 
     # Store integers in a TrieField, which makes range queries much faster.
@@ -248,6 +320,7 @@ module Sunspot
         end
       end
     end
+    register BooleanType, TrueClass, FalseClass
 
     class ClassType < AbstractType
       def indexed_name(name) #:nodoc:
@@ -262,5 +335,6 @@ module Sunspot
         Sunspot::Util.full_const_get(string)
       end
     end
+    register ClassType, Class
   end
 end

data/lib/sunspot/util.rb

@@ -100,7 +100,8 @@ module Sunspot
       # as I know the behavior of Kernel.Array() is otherwise fine.
       #
       def Array(object)
-        if object.is_a?(String)
+        case object
+        when String, Hash
           [object]
         else
           super
@@ -164,7 +165,7 @@ module Sunspot
       #
       def deep_merge_into(destination, left, right)
         left.each_pair do |name, left_value|
-          right_value = right[name]
+          right_value = right[name] if right
           destination[name] =
             if right_value.nil? || left_value == right_value
               left_value

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '1.0.5'
+  VERSION = '1.1.0'
 end

data/lib/sunspot.rb

@@ -243,7 +243,7 @@ module Sunspot
     #
     # Sunspot::Search::
     #   Search object, not yet executed. Query parameters can be added manually;
-    #   then #execute! should be called.
+    #   then #execute should be called.
     # 
     def new_search(*types, &block)
       session.new_search(*types, &block)
@@ -323,6 +323,14 @@ module Sunspot
       session.search(*types, &block)
     end
 
+    def new_more_like_this(object, *types, &block)
+      session.new_more_like_this(object, *types, &block)
+    end
+
+    def more_like_this(object, *types, &block)
+      session.more_like_this(object, *types, &block)
+    end
+
     # Remove objects from the index. Any time an object is destroyed, it must
     # be removed from the index; otherwise, the index will contain broken
     # references to objects that do not exist, which will cause errors when

data/solr/solr/conf/schema.xml

@@ -211,6 +211,18 @@
     <dynamicField name="*_dts" stored="true" type="tdate" multiValued="false" indexed="true"/>
     <!-- *** This dynamicField is used by Sunspot! *** -->
     <dynamicField name="*_dtms" stored="true" type="tdate" multiValued="true" indexed="true"/>
+    <!-- *** This dynamicField is used by Sunspot! *** -->
+    <dynamicField name="*_textv" stored="false" termVectors="true" type="text" multiValued="true" indexed="true"/>
+    <!-- *** This dynamicField is used by Sunspot! *** -->
+    <dynamicField name="*_textsv" stored="true" termVectors="true" type="text" multiValued="true" indexed="true"/>
+    <!-- *** This dynamicField is used by Sunspot! *** -->
+    <dynamicField name="*_et" stored="false" termVectors="true" type="tdouble" multiValued="false" indexed="true"/>
+    <!-- *** This dynamicField is used by Sunspot! *** -->
+    <dynamicField name="*_etm" stored="false" termVectors="true" type="tdouble" multiValued="true" indexed="true"/>
+    <!-- *** This dynamicField is used by Sunspot! *** -->
+    <dynamicField name="*_ets" stored="true" termVectors="true" type="tdouble" multiValued="false" indexed="true"/>
+    <!-- *** This dynamicField is used by Sunspot! *** -->
+    <dynamicField name="*_etms" stored="true" termVectors="true" type="tdouble" multiValued="true" indexed="true"/>
   </fields>
   <!-- Field to use to determine and enforce document uniqueness. 
       Unless this field is marked with required="false", it will be a required field

data/solr/solr/conf/solrconfig.xml

@@ -929,4 +929,10 @@
     -->
   </admin>
   <searchComponent name="spatial" class="me.outofti.solrspatiallight.SpatialQueryComponent"/>
+  <requestHandler class="solr.MoreLikeThisHandler" name="/mlt">
+    <lst name="defaults">
+      <str name="mlt.mintf">1</str>
+      <str name="mlt.mindf">2</str>
+    </lst>
+  </requestHandler>
 </config>

data/spec/api/indexer/attributes_spec.rb

@@ -18,7 +18,7 @@ describe 'indexing attribute fields', :type => :indexer do
 
   it 'should correctly index a float attribute field' do
     session.index(post(:ratings_average => 2.23))
-    connection.should have_add_with(:average_rating_f => '2.23')
+    connection.should have_add_with(:average_rating_ft => '2.23')
   end
 
   it 'should correctly index a double attribute field' do
@@ -55,14 +55,14 @@ describe 'indexing attribute fields', :type => :indexer do
     session.index(
       post(:published_at => Time.parse('1983-07-08 05:00:00 -0400'))
     )
-    connection.should have_add_with(:published_at_d => '1983-07-08T09:00:00Z')
+    connection.should have_add_with(:published_at_dt => '1983-07-08T09:00:00Z')
   end
 
   it 'should correctly index a time field that\'s after 32-bit Y2K' do
     session.index(
       post(:published_at => DateTime.parse('2050-07-08 05:00:00 -0400'))
     )
-    connection.should have_add_with(:published_at_d => '2050-07-08T09:00:00Z')
+    connection.should have_add_with(:published_at_dt => '2050-07-08T09:00:00Z')
   end
 
   it 'should correctly index a date field' do
@@ -140,4 +140,10 @@ describe 'indexing attribute fields', :type => :indexer do
       session.index(post(:author_name => ['Mat Brown', 'Matthew Brown']))
     end.should raise_error(ArgumentError)
   end
+
+  it 'should throw an ArgumentError if specifying more_like_this on type that does not support it' do
+    lambda do
+      Sunspot.setup(Post) { integer :popularity, :more_like_this => true }
+    end.should raise_error(ArgumentError)
+  end
 end

data/spec/api/indexer/fulltext_spec.rb

@@ -8,7 +8,7 @@ describe 'indexing fulltext fields' do
 
   it 'indexes stored text field' do
     session.index(post(:body => 'Test body'))
-    connection.should have_add_with(:body_texts => 'Test body')
+    connection.should have_add_with(:body_textsv => 'Test body')
   end
 
   it 'indexes text field with boost' do
@@ -18,7 +18,7 @@ describe 'indexing fulltext fields' do
 
   it 'indexes multiple values for a text field' do
     session.index(post(:body => %w(some title)))
-    connection.should have_add_with(:body_texts => %w(some title))
+    connection.should have_add_with(:body_textsv => %w(some title))
   end
 
   it 'indexes text via a block accessor' do

data/spec/api/indexer/removal_spec.rb

@@ -25,7 +25,7 @@ describe 'document removal', :type => :indexer do
 
   it 'removes everything from the index' do
     session.remove_all
-    connection.should have_delete_by_query("type:[* TO *]")
+    connection.should have_delete_by_query("*:*")
   end
 
   it 'removes everything from the index and immediately commits' do

data/spec/api/query/advanced_manipulation_examples.rb

@@ -0,0 +1,35 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+shared_examples_for "query with advanced manipulation" do
+  describe 'adjust_solr_params' do
+    before :each do
+      search do
+        adjust_solr_params do |params|
+          params[:rows] = 40
+          params[:qt] = 'complicated'
+        end
+      end
+    end
+
+    it "modifies existing param" do
+      connection.should have_last_search_with(:rows  => 40)
+    end
+
+    it "adds new param" do
+      connection.should have_last_search_with(:qt => 'complicated')
+    end
+  end
+
+  describe 'request_handler' do
+    before :each do
+      connection.expected_handler = :myRequestHandler
+      search do
+        request_handler :myRequestHandler
+      end
+    end
+
+    it 'should use specified request handler' do
+      connection.should have_last_search_with({})
+    end
+  end
+end

data/spec/api/query/{connectives_spec.rb → connectives_examples.rb}

@@ -1,6 +1,6 @@
-describe 'connective in scope', :type => :query do
+shared_examples_for "query with connective scope" do
   it 'creates a disjunction between two restrictions' do
-    session.search Post do
+    search do
       any_of do
         with :category_ids, 1
         with :blog_id, 2
@@ -12,7 +12,7 @@ describe 'connective in scope', :type => :query do
   end
 
   it 'creates a conjunction inside of a disjunction' do
-    session.search Post do
+    search do
       any_of do
         with :blog_id, 2
         all_of do
@@ -23,12 +23,12 @@ describe 'connective in scope', :type => :query do
     end
     connection.should have_last_search_including(
       :fq,
-      '(blog_id_i:2 OR (category_ids_im:1 AND average_rating_f:[3\.0 TO *]))'
+      '(blog_id_i:2 OR (category_ids_im:1 AND average_rating_ft:[3\.0 TO *]))'
     )
   end
 
   it 'creates a disjunction with nested conjunction with negated restrictions' do
-    session.search Post do
+    search do
       any_of do
         with :category_ids, 1
         all_of do
@@ -38,12 +38,12 @@ describe 'connective in scope', :type => :query do
       end
     end
     connection.should have_last_search_including(
-      :fq, '(category_ids_im:1 OR (-average_rating_f:[3\.0 TO *] AND blog_id_i:1))'
+      :fq, '(category_ids_im:1 OR (-average_rating_ft:[3\.0 TO *] AND blog_id_i:1))'
     )
   end
 
   it 'does nothing special if #all_of called from the top level' do
-    session.search Post do
+    search do
       all_of do
         with :blog_id, 2
         with :category_ids, 1
@@ -55,19 +55,19 @@ describe 'connective in scope', :type => :query do
   end
 
   it 'creates a disjunction with negated restrictions' do
-    session.search Post do
+    search do
       any_of do
         with :category_ids, 1
         without(:average_rating).greater_than(3.0)
       end
     end
     connection.should have_last_search_including(
-      :fq, '-(-category_ids_im:1 AND average_rating_f:[3\.0 TO *])'
+      :fq, '-(-category_ids_im:1 AND average_rating_ft:[3\.0 TO *])'
     )
   end
 
   it 'creates a disjunction with a negated restriction and a nested disjunction in a conjunction with a negated restriction' do
-    session.search(Post) do
+    search do
       any_of do
         without(:title, 'Yes')
         all_of do
@@ -80,11 +80,11 @@ describe 'connective in scope', :type => :query do
       end
     end
     connection.should have_last_search_including(
-      :fq, '-(title_ss:Yes AND -(blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_f:2\.0)))'
+      :fq, '-(title_ss:Yes AND -(blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_ft:2\.0)))'
     )
   end
   it 'creates a disjunction with nested conjunction with nested disjunction with negated restriction' do
-    session.search(Post) do
+    search do
       any_of do
         with(:title, 'Yes')
         all_of do
@@ -97,7 +97,7 @@ describe 'connective in scope', :type => :query do
       end
     end
     connection.should have_last_search_including(
-      :fq, '(title_ss:Yes OR (blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_f:2\.0)))'
+      :fq, '(title_ss:Yes OR (blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_ft:2\.0)))'
     )
   end
 
@@ -114,7 +114,7 @@ describe 'connective in scope', :type => :query do
   # logical semantics of the disjunction.
   #
   it 'creates a single disjunction when disjunctions nested' do
-    session.search(Post) do
+    search do
       any_of do
         with(:title, 'Yes')
         any_of do
@@ -130,7 +130,7 @@ describe 'connective in scope', :type => :query do
 
   it 'creates a disjunction with instance exclusion' do
     post = Post.new
-    session.search Post do
+    search do
       any_of do
         without(post)
         with(:category_ids, 1)
@@ -142,19 +142,19 @@ describe 'connective in scope', :type => :query do
   end
 
   it 'creates a disjunction with empty restriction' do
-    session.search Post do
+    search do
       any_of do
         with(:average_rating, nil)
         with(:average_rating).greater_than(3.0)
       end
     end
     connection.should have_last_search_including(
-      :fq, '-(average_rating_f:[* TO *] AND -average_rating_f:[3\.0 TO *])'
+      :fq, '-(average_rating_ft:[* TO *] AND -average_rating_ft:[3\.0 TO *])'
     )
   end
 
   it 'creates a disjunction with some text field components' do
-    session.search Post do
+    search do
       any_of do
         text_fields do
           with(:title).starting_with('test')
@@ -168,7 +168,7 @@ describe 'connective in scope', :type => :query do
   end
 
   it 'should ignore empty connectives' do
-    session.search Post do
+    search do
       any_of {}
     end
     connection.should_not have_last_search_including(:fq, '')

data/spec/api/query/{dynamic_fields_spec.rb → dynamic_fields_examples.rb}

@@ -1,8 +1,6 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe 'dynamic field query', :type => :query do
+shared_examples_for "query with dynamic field support" do
   it 'restricts by dynamic string field with equality restriction' do
-    session.search Post do
+    search do
       dynamic :custom_string do
         with :test, 'string'
       end
@@ -11,7 +9,7 @@ describe 'dynamic field query', :type => :query do
   end
 
   it 'restricts by dynamic integer field with less than restriction' do
-    session.search Post do
+    search do
       dynamic :custom_integer do
         with(:test).less_than(1)
       end
@@ -20,7 +18,7 @@ describe 'dynamic field query', :type => :query do
   end
 
   it 'restricts by dynamic float field with between restriction' do
-    session.search Post do
+    search do
       dynamic :custom_float do
         with(:test).between(2.2..3.3)
       end
@@ -29,7 +27,7 @@ describe 'dynamic field query', :type => :query do
   end
 
   it 'restricts by dynamic time field with any of restriction' do
-    session.search Post do
+    search do
       dynamic :custom_time do
         with(:test).any_of([Time.parse('2009-02-10 14:00:00 UTC'),
                             Time.parse('2009-02-13 18:00:00 UTC')])
@@ -39,7 +37,7 @@ describe 'dynamic field query', :type => :query do
   end
 
   it 'restricts by dynamic boolean field with equality restriction' do
-    session.search Post do
+    search do
       dynamic :custom_boolean do
         with :test, false
       end
@@ -48,7 +46,7 @@ describe 'dynamic field query', :type => :query do
   end
 
   it 'negates a dynamic field restriction' do
-    session.search Post do
+    search do
       dynamic :custom_string do
         without :test, 'foo'
       end
@@ -57,7 +55,7 @@ describe 'dynamic field query', :type => :query do
   end
 
   it 'scopes by a dynamic field inside a disjunction' do
-    session.search Post do
+    search do
       any_of do
         dynamic :custom_string do
           with :test, 'foo'
@@ -71,7 +69,7 @@ describe 'dynamic field query', :type => :query do
   end
 
   it 'orders by a dynamic field' do
-    session.search Post do
+    search do
       dynamic :custom_integer do
         order_by :test, :desc
       end
@@ -80,7 +78,7 @@ describe 'dynamic field query', :type => :query do
   end
 
   it 'orders by a dynamic field and static field, with given precedence' do
-    session.search Post do
+    search do
       dynamic :custom_integer do
         order_by :test, :desc
       end
@@ -91,7 +89,7 @@ describe 'dynamic field query', :type => :query do
 
   it 'raises an UnrecognizedFieldError if an unknown dynamic field is searched by' do
     lambda do
-      session.search Post do
+      search do
         dynamic(:bogus) { with :some, 'value' }
       end
     end.should raise_error(Sunspot::UnrecognizedFieldError)
@@ -99,7 +97,7 @@ describe 'dynamic field query', :type => :query do
 
   it 'raises a NoMethodError if pagination is attempted in a dynamic query' do
     lambda do
-      session.search Post do
+      search do
         dynamic :custom_string do
           paginate :page => 3, :per_page => 10
         end
@@ -107,8 +105,26 @@ describe 'dynamic field query', :type => :query do
     end.should raise_error(NoMethodError)
   end
 
+  it 'requests field facet on dynamic field' do
+    search do
+      dynamic :custom_string do
+        facet(:test)
+      end
+    end
+    connection.should have_last_search_including(:"facet.field", 'custom_string:test_ss')
+  end
+
+  it 'requests named field facet on dynamic field' do
+    search do
+      dynamic :custom_string do
+        facet(:test, :name => :bogus)
+      end
+    end
+    connection.should have_last_search_including(:"facet.field", '{!key=bogus}custom_string:test_ss')
+  end
+
   it 'requests query facet with internal dynamic field' do
-    session.search Post do
+    search do
       facet :test do
         row 'foo' do
           dynamic :custom_string do
@@ -123,7 +139,7 @@ describe 'dynamic field query', :type => :query do
   end
 
   it 'requests query facet with external dynamic field' do
-    session.search Post do
+    search do
       dynamic :custom_string do
         facet :test do
           row 'foo' do
@@ -139,7 +155,7 @@ describe 'dynamic field query', :type => :query do
   end
 
   it 'allows scoping on dynamic fields common to all types' do
-    session.search Post, Namespaced::Comment do
+    search Post, Namespaced::Comment do
       dynamic :custom_float do
         with(:test, 1.23)
       end