outoftime-sunspot 0.7.3 → 0.8.0

data/tasks/gemspec.rake

@@ -1,5 +1,5 @@
 begin
-  gem 'technicalpickles-jeweler', '~> 0.8.1'
+  gem 'technicalpickles-jeweler', '~> 1.0.1'
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = 'sunspot'
@@ -13,5 +13,10 @@ begin
     s.add_dependency 'solr-ruby', '>= 0.0.6'
     s.add_development_dependency 'rspec', '~> 1.1'
     s.add_development_dependency 'ruby-debug', '~> 0.10'
+    s.extra_rdoc_files = ['README.rdoc']
+    s.rdoc_options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' <<
+                      '--title' << 'Sunspot - Pure-Ruby Solr Search and Indexing - API Documentation' <<
+                      '--main' << 'README.rdoc'
+
   end
 end

data/tasks/rdoc.rake

@@ -1,7 +1,20 @@
-require 'rake/rdoctask'
+gem 'mislav-hanna'
+require 'hanna/rdoctask'
 
 Rake::RDocTask.new(:doc) do |rdoc|
+  rdoc.title = 'Sunspot - Pure-Ruby Solr Search and Indexing - API Documentation'
   rdoc.main = 'README.rdoc'
   rdoc.rdoc_files.include('README.rdoc', 'lib/sunspot.rb', 'lib/sunspot/**/*.rb')
   rdoc.rdoc_dir = 'doc'
+  rdoc.options << '--webcvs=http://github.com/outoftime/sunspot/tree/master/%s' << '--title' << 'Sunspot - Pure-Ruby Solr Search and Indexing - API Documentation'
+end
+
+namespace :doc do
+  desc 'Generate rdoc and move into pages directory'
+  task :publish => :doc do
+    doc_dir = File.join(File.dirname(__FILE__), '..', 'doc')
+    publish_dir = File.join(File.dirname(__FILE__), '..', 'pages', 'docs')
+    FileUtils.rm_rf(publish_dir) if File.exist?(publish_dir)
+    FileUtils.cp_r(doc_dir, publish_dir)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: outoftime-sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors: 
 - Mat Brown
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-06 00:00:00 -07:00
+date: 2009-05-22 00:00:00 -07:00
 default_executable: sunspot-solr
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,85 +48,91 @@ executables:
 - sunspot-solr
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
-- Rakefile
+- History.txt
+- LICENSE
 - README.rdoc
+- Rakefile
 - TODO
-- History.txt
 - VERSION.yml
 - bin/sunspot-solr
-- lib/sunspot
-- lib/sunspot/session.rb
-- lib/sunspot/type.rb
-- lib/sunspot/facets.rb
-- lib/sunspot/facet.rb
+- lib/light_config.rb
+- lib/sunspot.rb
 - lib/sunspot/adapters.rb
-- lib/sunspot/restriction.rb
-- lib/sunspot/facet_row.rb
 - lib/sunspot/configuration.rb
+- lib/sunspot/data_extractor.rb
 - lib/sunspot/dsl.rb
-- lib/sunspot/search.rb
-- lib/sunspot/setup.rb
+- lib/sunspot/dsl/fields.rb
+- lib/sunspot/dsl/query.rb
+- lib/sunspot/dsl/restriction.rb
+- lib/sunspot/dsl/scope.rb
+- lib/sunspot/facet.rb
+- lib/sunspot/facet_row.rb
 - lib/sunspot/field.rb
 - lib/sunspot/indexer.rb
 - lib/sunspot/query.rb
+- lib/sunspot/query/dynamic_query.rb
+- lib/sunspot/query/field_facet.rb
+- lib/sunspot/query/pagination.rb
+- lib/sunspot/query/restriction.rb
+- lib/sunspot/query/sort.rb
+- lib/sunspot/search.rb
+- lib/sunspot/session.rb
+- lib/sunspot/setup.rb
+- lib/sunspot/type.rb
 - lib/sunspot/util.rb
-- lib/sunspot/dsl
-- lib/sunspot/dsl/fields.rb
-- lib/sunspot/dsl/scope.rb
-- lib/sunspot/dsl/query.rb
-- lib/sunspot.rb
-- lib/light_config.rb
-- spec/spec_helper.rb
-- spec/integration
-- spec/integration/spec_helper.rb
-- spec/integration/faceting_spec.rb
-- spec/integration/scoped_search_spec.rb
-- spec/integration/keyword_search_spec.rb
-- spec/integration/test_pagination.rb
-- spec/mocks
-- spec/mocks/base_class.rb
-- spec/mocks/mock_adapter.rb
-- spec/mocks/user.rb
-- spec/mocks/post.rb
-- spec/mocks/comment.rb
-- spec/api
-- spec/api/search_retrieval_spec.rb
-- spec/api/spec_helper.rb
-- spec/api/session_spec.rb
-- spec/api/build_search_spec.rb
-- spec/api/indexer_spec.rb
-- tasks/gemspec.rake
-- tasks/rcov.rake
-- tasks/todo.rake
-- tasks/rdoc.rake
-- tasks/spec.rake
-- solr/etc/webdefault.xml
 - solr/etc/jetty.xml
-- solr/lib/jetty-util-6.1.3.jar
-- solr/lib/servlet-api-2.5-6.1.3.jar
+- solr/etc/webdefault.xml
 - solr/lib/jetty-6.1.3.jar
-- solr/lib/jsp-2.1
-- solr/lib/jsp-2.1/jsp-2.1.jar
+- solr/lib/jetty-util-6.1.3.jar
 - solr/lib/jsp-2.1/ant-1.6.5.jar
 - solr/lib/jsp-2.1/core-3.1.1.jar
+- solr/lib/jsp-2.1/jsp-2.1.jar
 - solr/lib/jsp-2.1/jsp-api-2.1.jar
-- solr/webapps/solr.war
+- solr/lib/servlet-api-2.5-6.1.3.jar
 - solr/solr/conf/elevate.xml
 - solr/solr/conf/protwords.txt
-- solr/solr/conf/synonyms.txt
-- solr/solr/conf/solrconfig.xml
 - solr/solr/conf/schema.xml
+- solr/solr/conf/solrconfig.xml
 - solr/solr/conf/stopwords.txt
+- solr/solr/conf/synonyms.txt
 - solr/start.jar
+- solr/webapps/solr.war
+- spec/api/build_search_spec.rb
+- spec/api/indexer_spec.rb
+- spec/api/query_spec.rb
+- spec/api/search_retrieval_spec.rb
+- spec/api/session_spec.rb
+- spec/api/spec_helper.rb
+- spec/integration/dynamic_fields_spec.rb
+- spec/integration/faceting_spec.rb
+- spec/integration/keyword_search_spec.rb
+- spec/integration/scoped_search_spec.rb
+- spec/integration/spec_helper.rb
+- spec/integration/test_pagination.rb
+- spec/mocks/base_class.rb
+- spec/mocks/comment.rb
+- spec/mocks/mock_adapter.rb
+- spec/mocks/post.rb
+- spec/mocks/user.rb
+- spec/spec_helper.rb
+- tasks/gemspec.rake
+- tasks/rcov.rake
+- tasks/rdoc.rake
+- tasks/spec.rake
+- tasks/todo.rake
 has_rdoc: true
 homepage: http://github.com/outoftime/sunspot
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
+- --webcvs=http://github.com/outoftime/sunspot/tree/master/%s
+- --title
+- Sunspot - Pure-Ruby Solr Search and Indexing - API Documentation
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -148,5 +154,22 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Library for expressive, powerful interaction with the Solr search engine
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb
+- spec/integration/spec_helper.rb
+- spec/integration/faceting_spec.rb
+- spec/integration/scoped_search_spec.rb
+- spec/integration/keyword_search_spec.rb
+- spec/integration/dynamic_fields_spec.rb
+- spec/integration/test_pagination.rb
+- spec/mocks/base_class.rb
+- spec/mocks/mock_adapter.rb
+- spec/mocks/user.rb
+- spec/mocks/post.rb
+- spec/mocks/comment.rb
+- spec/api/search_retrieval_spec.rb
+- spec/api/spec_helper.rb
+- spec/api/session_spec.rb
+- spec/api/build_search_spec.rb
+- spec/api/indexer_spec.rb
+- spec/api/query_spec.rb

data/lib/sunspot/restriction.rb

@@ -1,216 +0,0 @@
-module Sunspot
-  module Restriction #:nodoc:
-    class <<self
-      #
-      # Return the names of all of the restriction classes that should be made
-      # available to the DSL.
-      #
-      # ==== Returns
-      # 
-      # Array:: Collection of restriction class names
-      #
-      def names
-        constants - %w(Base SameAs) #XXX this seems ugly
-      end
-    end
-
-    # 
-    # Subclasses of this class represent restrictions that can be applied to
-    # a Sunspot query. The Sunspot::DSL::Restriction class presents a builder
-    # API for instances of this class.
-    #
-    # Implementations of this class must respond to #to_params and
-    # #to_negative_params. Instead of implementing those methods, they may
-    # choose to implement any of:
-    #
-    # * #to_positive_boolean_phrase, and optionally #to_negative_boolean_phrase
-    # * #to_solr_conditional
-    #
-    class Base #:nodoc:
-      def initialize(field, value, negative = false)
-        @field, @value, @negative = field, value, negative
-      end
-
-      # 
-      # A hash representing this restriction in solr-ruby's parameter format.
-      # All restriction implementations must respond to this method; however,
-      # the base implementation delegates to the #to_positive_boolean_phrase method, so
-      # subclasses may (and probably should) choose to implement that method
-      # instead.
-      #
-      # ==== Returns
-      #
-      # Hash:: Representation of this restriction as solr-ruby parameters
-      #
-      def to_params
-        { :filter_queries => [to_boolean_phrase] }
-      end
-
-      # 
-      # Return the boolean phrase associated with this restriction object.
-      # Differentiates between positive and negative boolean phrases depending
-      # on whether this restriction is negated.
-      #
-      def to_boolean_phrase
-        unless negative?
-          to_positive_boolean_phrase
-        else
-          to_negative_boolean_phrase
-        end
-      end
-
-      # 
-      # Boolean phrase representing this restriction in the positive. Subclasses
-      # may choose to implement this method rather than #to_params; however,
-      # this method delegates to the abstract #to_solr_conditional method, which
-      # in most cases will be what subclasses will want to implement.
-      # #to_solr_conditional contains the boolean phrase representing the
-      # condition but leaves out the field name (see built-in implementations
-      # for examples)
-      #
-      # ==== Returns
-      #
-      # String:: Boolean phrase for restriction in the positive
-      #
-      def to_positive_boolean_phrase
-        "#{@field.indexed_name}:#{to_solr_conditional}"
-      end
-
-      # 
-      # Boolean phrase representing this restriction in the negative. Subclasses
-      # may choose to implement this method, but it is not necessary, as the
-      # base implementation delegates to #to_positive_boolean_phrase.
-      #
-      # ==== Returns
-      #
-      # String:: Boolean phrase for restriction in the negative
-      #
-      def to_negative_boolean_phrase
-        "-#{to_positive_boolean_phrase}"
-      end
-
-      protected
-
-      # 
-      # Whether this restriction should be negated from its original meaning
-      #
-      def negative?
-        !!@negative
-      end
-
-      # 
-      # Return escaped Solr API representation of given value
-      #
-      # ==== Parameters
-      #
-      # value<Object>::
-      #   value to convert to Solr representation (default: @value)
-      #
-      # ==== Returns
-      #
-      # String:: Solr API representation of given value
-      #
-      def solr_value(value = @value)
-        Solr::Util.query_parser_escape(@field.to_indexed(value))
-      end
-    end
-
-    # 
-    # Results must have field with value equal to given value. If the value
-    # is nil, results must have no value for the given field.
-    #
-    class EqualTo < Base
-      def to_positive_boolean_phrase
-        unless @value.nil?
-          super
-        else
-          "-#{@field.indexed_name}:[* TO *]"
-        end
-      end
-
-      def to_negative_boolean_phrase
-        unless @value.nil?
-          super
-        else
-          "#{@field.indexed_name}:[* TO *]"
-        end
-      end
-
-      private
-
-      def to_solr_conditional
-        "#{solr_value}"
-      end
-    end
-
-    # 
-    # Results must have field with value less than given value
-    #
-    class LessThan < Base
-      private
-
-      def to_solr_conditional
-        "[* TO #{solr_value}]"
-      end
-    end
-
-    # 
-    # Results must have field with value greater than given value
-    #
-    class GreaterThan < Base
-      private
-
-      def to_solr_conditional
-        "[#{solr_value} TO *]"
-      end
-    end
-
-    # 
-    # Results must have field with value in given range
-    #
-    class Between < Base
-      private
-
-      def to_solr_conditional
-        "[#{solr_value(@value.first)} TO #{solr_value(@value.last)}]"
-      end
-    end
-
-    # 
-    # Results must have field with value included in given collection
-    #
-    class AnyOf < Base
-      private
-
-      def to_solr_conditional
-        "(#{@value.map { |v| solr_value v } * ' OR '})"
-      end
-    end
-
-    #
-    # Results must have field with values matching all values in given
-    # collection (only makes sense for fields with multiple values)
-    #
-    class AllOf < Base
-      private
-
-      def to_solr_conditional
-        "(#{@value.map { |v| solr_value v } * ' AND '})"
-      end
-    end
-
-    # 
-    # Result must be the exact instance given (only useful when negated).
-    #
-    class SameAs < Base
-      def initialize(object, negative = false)
-        @object, @negative = object, negative
-      end
-
-      def to_positive_boolean_phrase
-        adapter = Adapters::InstanceAdapter.adapt(@object)
-        "id:#{Solr::Util.query_parser_escape(adapter.index_id)}"
-      end
-    end
-  end
-end