outoftime-sunspot 0.9.4 → 0.9.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
+:patch: 5
 :major: 0
 :minor: 9

data/lib/sunspot/query/base_query.rb

@@ -9,8 +9,8 @@ module Sunspot
 
       attr_writer :keywords
 
-      def initialize(setup)
-        @setup = setup
+      def initialize(types, setup)
+        @types, @setup = types, setup
       end
 
       # 
@@ -64,7 +64,7 @@ module Sunspot
       #
       def escaped_types
         @escaped_types ||=
-          @setup.type_names.map { |name| escape(name)}
+          @types.map { |type| escape(type.name)}
       end
 
       # 

data/lib/sunspot/query.rb

@@ -20,12 +20,12 @@ module Sunspot
     class Query < FieldQuery
       attr_reader :query_facets #:nodoc:
 
-      def initialize(setup, configuration) #:nodoc:
-        @setup, @configuration = setup, configuration
+      def initialize(types, setup, configuration) #:nodoc:
+        @setup = setup
         @components = []
         @query_facets = {}
-        @components << @base_query = BaseQuery.new(setup)
-        @components << @pagination = Pagination.new(@configuration)
+        @components << @base_query = BaseQuery.new(types, setup)
+        @components << @pagination = Pagination.new(configuration)
         @components << @sort = SortComposite.new
       end
 

data/lib/sunspot/session.rb

@@ -46,8 +46,8 @@ module Sunspot
           Setup.for(types.first)
         else
           CompositeSetup.for(types)
-        end
-      Search.new(connection, setup, Query::Query.new(setup, @config))
+          end
+      Search.new(connection, setup, Query::Query.new(types, setup, @config))
     end
 
     #

data/spec/api/build_search_spec.rb

@@ -27,6 +27,16 @@ describe 'Search' do
     connection.should have_last_search_with(:fq => 'type:Post')
   end
 
+  it 'should search types in main query if keywords not used' do
+    session.search Post
+    connection.should have_last_search_with(:q => 'type:Post')
+  end
+
+  it 'should search type of subclass when superclass is configured' do
+    session.search PhotoPost
+    connection.should have_last_search_with(:q => 'type:PhotoPost')
+  end
+
   it 'should search all text fields for searched class' do
     session.search Post do
       keywords 'keyword search'

data/spec/mocks/post.rb

@@ -68,3 +68,6 @@ Sunspot.setup(Post) do
     end
   end
 end
+
+class PhotoPost < Post
+end

data/tasks/gemspec.rake

@@ -1,5 +1,4 @@
 begin
-  gem 'technicalpickles-jeweler', '~> 1.0.1'
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = 'sunspot'

data/tasks/rdoc.rake

@@ -1,5 +1,6 @@
 gem 'mislav-hanna'
 require 'hanna/rdoctask'
+require 'jeweler'
 
 Rake::RDocTask.new(:doc) do |rdoc|
   version = Jeweler::VersionHelper.new(File.join(File.dirname(__FILE__), '..')).to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: outoftime-sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Mat Brown
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-29 00:00:00 -07:00
+date: 2009-08-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency