sunspot 1.0.5 → 1.1.0

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 5
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors: 
 - Mat Brown
@@ -20,11 +20,14 @@ authors:
 - Tom Coleman
 - Matt Mitchell
 - Nathan Beyer
+- Kieran Topping
+- Nicolas Braem
+- Jeremy Ashkenas
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -04:00
+date: 2010-04-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,7 +95,10 @@ files:
 - lib/sunspot/session.rb
 - lib/sunspot/type.rb
 - lib/sunspot/version.rb
+- lib/sunspot/search/standard_search.rb
+- lib/sunspot/search/abstract_search.rb
 - lib/sunspot/search/facet_row.rb
+- lib/sunspot/search/more_like_this_search.rb
 - lib/sunspot/search/hit.rb
 - lib/sunspot/search/highlight.rb
 - lib/sunspot/search/query_facet.rb
@@ -104,19 +110,24 @@ files:
 - lib/sunspot/query/sort.rb
 - lib/sunspot/query/connective.rb
 - lib/sunspot/query/highlighting.rb
+- lib/sunspot/query/composite_fulltext.rb
 - lib/sunspot/query/scope.rb
 - lib/sunspot/query/restriction.rb
 - lib/sunspot/query/sort_composite.rb
+- lib/sunspot/query/more_like_this.rb
 - lib/sunspot/query/filter.rb
+- lib/sunspot/query/standard_query.rb
 - lib/sunspot/query/pagination.rb
+- lib/sunspot/query/function_query.rb
 - lib/sunspot/query/abstract_field_facet.rb
 - lib/sunspot/query/boost_query.rb
 - lib/sunspot/query/query_facet.rb
 - lib/sunspot/query/date_field_facet.rb
 - lib/sunspot/query/text_field_boost.rb
 - lib/sunspot/query/local.rb
-- lib/sunspot/query/query.rb
+- lib/sunspot/query/more_like_this_query.rb
 - lib/sunspot/query/field_facet.rb
+- lib/sunspot/query/common_query.rb
 - lib/sunspot/session_proxy/thread_local_session_proxy.rb
 - lib/sunspot/session_proxy/class_sharding_session_proxy.rb
 - lib/sunspot/session_proxy/master_slave_session_proxy.rb
@@ -142,11 +153,16 @@ files:
 - lib/sunspot/util.rb
 - lib/sunspot/dsl/fulltext.rb
 - lib/sunspot/dsl/fields.rb
+- lib/sunspot/dsl/adjustable.rb
 - lib/sunspot/dsl/scope.rb
 - lib/sunspot/dsl/restriction.rb
 - lib/sunspot/dsl/search.rb
+- lib/sunspot/dsl/standard_query.rb
+- lib/sunspot/dsl/paginatable.rb
+- lib/sunspot/dsl/function.rb
 - lib/sunspot/dsl/query_facet.rb
-- lib/sunspot/dsl/query.rb
+- lib/sunspot/dsl/functional.rb
+- lib/sunspot/dsl/more_like_this_query.rb
 - lib/sunspot/dsl/field_query.rb
 - lib/sunspot/field_factory.rb
 - lib/sunspot/session_proxy.rb
@@ -161,6 +177,7 @@ files:
 - spec/integration/local_search_spec.rb
 - spec/integration/faceting_spec.rb
 - spec/integration/scoped_search_spec.rb
+- spec/integration/more_like_this_spec.rb
 - spec/integration/highlighting_spec.rb
 - spec/integration/keyword_search_spec.rb
 - spec/integration/indexing_spec.rb
@@ -199,19 +216,21 @@ files:
 - spec/api/adapters_spec.rb
 - spec/api/server_spec.rb
 - spec/api/query/dsl_spec.rb
+- spec/api/query/faceting_examples.rb
 - spec/api/query/spec_helper.rb
-- spec/api/query/faceting_spec.rb
-- spec/api/query/connectives_spec.rb
-- spec/api/query/adjust_params_spec.rb
-- spec/api/query/local_spec.rb
-- spec/api/query/highlighting_spec.rb
-- spec/api/query/ordering_pagination_spec.rb
-- spec/api/query/dynamic_fields_spec.rb
+- spec/api/query/highlighting_examples.rb
+- spec/api/query/more_like_this_spec.rb
+- spec/api/query/local_examples.rb
+- spec/api/query/ordering_pagination_examples.rb
 - spec/api/query/types_spec.rb
-- spec/api/query/scope_spec.rb
-- spec/api/query/facet_local_params_spec.rb
-- spec/api/query/text_field_scoping_spec.rb
-- spec/api/query/fulltext_spec.rb
+- spec/api/query/function_spec.rb
+- spec/api/query/advanced_manipulation_examples.rb
+- spec/api/query/fulltext_examples.rb
+- spec/api/query/text_field_scoping_examples.rb
+- spec/api/query/connectives_examples.rb
+- spec/api/query/dynamic_fields_examples.rb
+- spec/api/query/standard_spec.rb
+- spec/api/query/scope_examples.rb
 - spec/api/session_proxy/spec_helper.rb
 - spec/api/session_proxy/master_slave_session_proxy_spec.rb
 - spec/api/session_proxy/class_sharding_session_proxy_spec.rb
@@ -287,6 +306,7 @@ test_files:
 - spec/integration/local_search_spec.rb
 - spec/integration/faceting_spec.rb
 - spec/integration/scoped_search_spec.rb
+- spec/integration/more_like_this_spec.rb
 - spec/integration/highlighting_spec.rb
 - spec/integration/keyword_search_spec.rb
 - spec/integration/indexing_spec.rb
@@ -309,18 +329,10 @@ test_files:
 - spec/api/adapters_spec.rb
 - spec/api/server_spec.rb
 - spec/api/query/dsl_spec.rb
-- spec/api/query/faceting_spec.rb
-- spec/api/query/connectives_spec.rb
-- spec/api/query/adjust_params_spec.rb
-- spec/api/query/local_spec.rb
-- spec/api/query/highlighting_spec.rb
-- spec/api/query/ordering_pagination_spec.rb
-- spec/api/query/dynamic_fields_spec.rb
+- spec/api/query/more_like_this_spec.rb
 - spec/api/query/types_spec.rb
-- spec/api/query/scope_spec.rb
-- spec/api/query/facet_local_params_spec.rb
-- spec/api/query/text_field_scoping_spec.rb
-- spec/api/query/fulltext_spec.rb
+- spec/api/query/function_spec.rb
+- spec/api/query/standard_spec.rb
 - spec/api/session_proxy/master_slave_session_proxy_spec.rb
 - spec/api/session_proxy/class_sharding_session_proxy_spec.rb
 - spec/api/session_proxy/id_sharding_session_proxy_spec.rb

data/spec/api/query/adjust_params_spec.rb

@@ -1,37 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe 'typed query' do
-  it "should send query to solr with adjusted parameters (keyword example)" do
-    session.search Post do
-      keywords 'keyword search'
-      adjust_solr_params do |params|
-        params[:q]    = 'new search'
-        params[:some] = 'param'
-      end
-    end
-    connection.should have_last_search_with(:q    => 'new search')
-    connection.should have_last_search_with(:some => 'param')
-  end
-  
-  it "should work, even without another dsl command" do
-    session.search Post do
-      adjust_solr_params do |params|
-        params[:q]    = 'napoleon dynamite'
-        params[:qt]   = 'complicated'
-      end
-    end
-    connection.should have_last_search_with(:q  => 'napoleon dynamite')
-    connection.should have_last_search_with(:qt => 'complicated')
-  end
-  
-  it "should be able to extend parameters" do
-    session.search Post do
-      keywords 'keyword search'
-      adjust_solr_params do |params|
-        params[:q]    += ' AND something_s:more'
-      end
-    end
-    connection.should have_last_search_with(:q => 'keyword search AND something_s:more')
-  end
-  
-end

data/spec/api/query/facet_local_params_spec.rb

@@ -1,103 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe 'facet local params' do
-  it 'tags and excludes a scope filter in a field facet' do
-    session.search(Post) do
-      blog_filter = with(:blog_id, 1)
-      facet(:blog_id, :exclude => blog_filter)
-    end
-    filter_tag = get_filter_tag('blog_id_i:1')
-    connection.should have_last_search_with(
-      :"facet.field" => %W({!ex=#{filter_tag}}blog_id_i)
-    )
-  end
-
-  it 'tags and excludes a disjunction filter in a field facet' do
-    session.search(Post) do
-      blog_filter = any_of do
-        with(:blog_id, 1)
-        with(:blog_id, 2)
-      end
-      facet(:blog_id, :exclude => blog_filter)
-    end
-    filter_tag = get_filter_tag('(blog_id_i:1 OR blog_id_i:2)')
-    connection.should have_last_search_with(
-      :"facet.field" => %W({!ex=#{filter_tag}}blog_id_i)
-    )
-  end
-
-  it 'tags and excludes multiple filters in a field facet' do
-    session.search(Post) do
-      blog_filter = with(:blog_id, 1)
-      category_filter = with(:category_ids, 2)
-      facet(:blog_id, :exclude => [blog_filter, category_filter])
-    end
-    filter_tags = %w(blog_id_i:1 category_ids_im:2).map do |phrase|
-      get_filter_tag(phrase)
-    end.join(',')
-    connection.should have_last_search_with(
-      :"facet.field" => %W({!ex=#{filter_tags}}blog_id_i)
-    )
-  end
-
-  it 'does not tag a filter if it is not excluded' do
-    session.search(Post) do
-      with(:blog_id, 1)
-    end
-    connection.should have_last_search_including(:fq, "blog_id_i:1")
-  end
-
-  it 'names a field facet' do
-    session.search(Post) do
-      facet(:blog_id, :name => :blog)
-    end
-    connection.should have_last_search_including(:"facet.field", "{!key=blog}blog_id_i")
-  end
-
-  it 'uses the custom field facet name in facet option parameters' do
-    session.search(Post) do
-      facet(:blog_id, :name => :blog, :sort => :count)
-    end
-    connection.should have_last_search_with(:"f.blog.facet.sort" => 'true')
-  end
-
-  it 'raises an ArgumentError if exclusion attempted on a query facet' do
-    lambda do
-      session.search(Post) do
-        blog_filter = with(:blog_id, 1)
-        facet(:bad, :exclude => blog_filter) do
-          row(:bogus) { with(:blog_id, 1) }
-        end
-      end
-    end.should raise_error(ArgumentError)
-  end
-
-  it 'raises an ArgumentError if exclusion attempted on a restricted field facet' do
-    lambda do
-      session.search(Post) do
-        blog_filter = with(:blog_id, 1)
-        facet(:blog_id, :only => 1, :exclude => blog_filter)
-      end
-    end.should raise_error(ArgumentError)
-  end
-
-  it 'raises an ArgumentError if exclusion attempted on a facet with :extra' do
-    lambda do
-      session.search(Post) do
-        blog_filter = with(:blog_id, 1)
-        facet(:blog_id, :extra => :all, :exclude => blog_filter)
-      end
-    end.should raise_error(ArgumentError)
-  end
-
-  private
-
-  def get_filter_tag(boolean_query)
-    connection.searches.last[:fq].each do |fq|
-      if match = fq.match(/^\{!tag=(.+)\}#{Regexp.escape(boolean_query)}$/)
-        return match[1]
-      end
-    end
-    nil
-  end
-end