outoftime-sunspot 0.0.1 → 0.0.2

data/tasks/rcov.rake

@@ -1,6 +1,28 @@
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |t|
-  t.test_files = FileList['test/**/test_*.rb']
-  t.rcov_opts << "--sort coverage"
-  t.rcov_opts << "--only-uncovered"
+require 'rake'
+require 'spec/rake/spectask'
+
+desc 'run specs with rcov'
+Spec::Rake::SpecTask.new('rcov') do |t|
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.rcov = true
+  t.rcov_dir = File.join('coverage', 'all')
+  t.rcov_opts.concat(['--exclude', 'spec', '--sort', 'coverage', '--only-uncovered'])
+end
+
+namespace :rcov do
+  desc 'run api specs with rcov'
+  Spec::Rake::SpecTask.new('api') do |t|
+    t.spec_files = FileList['spec/api/*_spec.rb']
+    t.rcov = true
+    t.rcov_dir = File.join('coverage', 'api')
+    t.rcov_opts.concat(['--exclude', 'spec', '--sort', 'coverage', '--only-uncovered'])
+  end
+
+  desc 'run integration specs with rcov'
+  Spec::Rake::SpecTask.new('integration') do |t|
+    t.spec_files = FileList['spec/integration/*_spec.rb']
+    t.rcov = true
+    t.rcov_dir = File.join('coverage', 'integration')
+    t.rcov_opts.concat(['--exclude', 'spec', '--sort', 'coverage', '--only-uncovered'])
+  end
 end

data/tasks/spec.rake

@@ -0,0 +1,21 @@
+gem 'rspec', '~>1.1'
+
+require 'spec'
+require 'spec/rake/spectask'
+
+desc 'run specs'
+Spec::Rake::SpecTask.new('spec') do |t|
+  t.spec_files = FileList[File.join(File.dirname(__FILE__), '..', 'spec', '**', '*_spec.rb')]
+end
+
+namespace :spec do
+  desc 'run api specs (mock out Solr dependency)'
+  Spec::Rake::SpecTask.new('api') do |t|
+    t.spec_files = FileList[File.join(File.dirname(__FILE__), '..', 'spec', 'api', '*_spec.rb')]
+  end
+
+  desc 'run integration specs (be sure to run `bin/sunspot-solr start`)'
+  Spec::Rake::SpecTask.new('integration') do |t|
+    t.spec_files = FileList[File.join(File.dirname(__FILE__), '..', 'spec', 'integration', '*_spec.rb')]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: outoftime-sunspot
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Mat Brown
@@ -9,154 +9,128 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-12 00:00:00 -08:00
-default_executable: 
+date: 2009-02-14 00:00:00 -08:00
+default_executable: sunspot-solr
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: newgem
+  name: solr-ruby
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.6
+        version: 0.0.6
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: extlib
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 0.9.10
     version: 
-description: ""
-email: 
-- mat@patch.com
-executables: []
-
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "1.1"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.10"
+    version: 
+description: Library for expressive, powerful interaction with the Solr search engine
+email: mat@patch.com
+executables: 
+- sunspot-solr
 extensions: []
 
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- PostInstall.txt
-- README.rdoc
-- solr/README.txt
-- solr/solr/README.txt
-- solr/solr/conf/protwords.txt
-- solr/solr/conf/stopwords.txt
-- solr/solr/conf/synonyms.txt
+extra_rdoc_files: []
+
 files: 
-- History.txt
-- Manifest.txt
-- PostInstall.txt
-- README.rdoc
 - Rakefile
-- config/hoe.rb
-- config/requirements.rb
-- lib/light_config.rb
-- lib/sunspot.rb
+- README.rdoc
+- History.txt
+- VERSION.yml
+- bin/sunspot-solr
+- lib/sunspot
+- lib/sunspot/session.rb
+- lib/sunspot/type.rb
 - lib/sunspot/adapters.rb
-- lib/sunspot/conditions.rb
-- lib/sunspot/conditions_builder.rb
+- lib/sunspot/restriction.rb
 - lib/sunspot/configuration.rb
+- lib/sunspot/dsl.rb
+- lib/sunspot/search.rb
+- lib/sunspot/builder.rb
 - lib/sunspot/field.rb
-- lib/sunspot/field_builder.rb
 - lib/sunspot/indexer.rb
 - lib/sunspot/query.rb
-- lib/sunspot/query_builder.rb
-- lib/sunspot/restriction.rb
-- lib/sunspot/scope_builder.rb
-- lib/sunspot/search.rb
-- lib/sunspot/session.rb
-- lib/sunspot/type.rb
 - lib/sunspot/util.rb
-- lib/sunspot/version.rb
-- log/test_solr.log
-- setup.rb
-- solr/README.txt
-- solr/etc/jetty.xml
+- 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/custom_expectation.rb
+- spec/integration
+- spec/integration/spec_helper.rb
+- spec/integration/keyword_search_spec.rb
+- spec/integration/field_types_spec.rb
+- spec/integration/test_pagination.rb
+- spec/mocks
+- spec/mocks/base_class.rb
+- spec/mocks/mock_adapter.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/standard_search_builder_spec.rb
+- spec/api/indexer_spec.rb
+- tasks/gemspec.rake
+- tasks/rcov.rake
+- tasks/spec.rake
 - solr/etc/webdefault.xml
-- solr/exampledocs/books.csv
-- solr/exampledocs/hd.xml
-- solr/exampledocs/ipod_other.xml
-- solr/exampledocs/ipod_video.xml
-- solr/exampledocs/mem.xml
-- solr/exampledocs/monitor.xml
-- solr/exampledocs/monitor2.xml
-- solr/exampledocs/mp500.xml
-- solr/exampledocs/post.jar
-- solr/exampledocs/post.sh
-- solr/exampledocs/sd500.xml
-- solr/exampledocs/solr.xml
-- solr/exampledocs/spellchecker.xml
-- solr/exampledocs/utf8-example.xml
-- solr/exampledocs/vidcard.xml
-- solr/lib/jetty-6.1.3.jar
+- solr/etc/jetty.xml
 - solr/lib/jetty-util-6.1.3.jar
+- solr/lib/servlet-api-2.5-6.1.3.jar
+- solr/lib/jetty-6.1.3.jar
+- solr/lib/jsp-2.1
+- solr/lib/jsp-2.1/jsp-2.1.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/lib/servlet-api-2.5-6.1.3.jar
-- solr/logs
-- solr/solr/README.txt
-- solr/solr/bin/abc
-- solr/solr/bin/abo
-- solr/solr/bin/backup
-- solr/solr/bin/backupcleaner
-- solr/solr/bin/commit
-- solr/solr/bin/optimize
-- solr/solr/bin/readercycle
-- solr/solr/bin/rsyncd-disable
-- solr/solr/bin/rsyncd-enable
-- solr/solr/bin/rsyncd-start
-- solr/solr/bin/rsyncd-stop
-- solr/solr/bin/scripts-util
-- solr/solr/bin/snapcleaner
-- solr/solr/bin/snapinstaller
-- solr/solr/bin/snappuller
-- solr/solr/bin/snappuller-disable
-- solr/solr/bin/snappuller-enable
-- solr/solr/bin/snapshooter
-- solr/solr/conf/admin-extra.html
+- solr/webapps/solr.war
+- solr/solr/conf/elevate.xml
 - solr/solr/conf/protwords.txt
-- solr/solr/conf/schema.xml
-- solr/solr/conf/scripts.conf
+- solr/solr/conf/synonyms.txt
 - solr/solr/conf/solrconfig.xml
+- solr/solr/conf/schema.xml
 - solr/solr/conf/stopwords.txt
-- solr/solr/conf/synonyms.txt
-- solr/solr/conf/xslt
-- solr/solr/data/spell
 - solr/start.jar
-- solr/webapps/solr.war
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/rcov.rake
-- tasks/solr.rake
-- tasks/website.rake
-- test/api/test_build_search.rb
-- test/api/test_helper.rb
-- test/api/test_indexer.rb
-- test/api/test_retrieve_search.rb
-- test/api/test_session.rb
-- test/custom_expectation.rb
-- test/integration/test_field_types.rb
-- test/integration/test_helper.rb
-- test/integration/test_keyword_search.rb
-- test/integration/test_pagination.rb
-- test/mocks/base_class.rb
-- test/mocks/comment.rb
-- test/mocks/mock_adapter.rb
-- test/mocks/post.rb
-- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/outoftime/sunspot
-post_install_message: PostInstall.txt
+post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --inline-source
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -173,19 +147,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: sunspot
+rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: library for expressive, powerful interaction with the Solr search engine
-test_files: 
-- test/api/test_build_search.rb
-- test/api/test_helper.rb
-- test/api/test_indexer.rb
-- test/api/test_retrieve_search.rb
-- test/api/test_session.rb
-- test/integration/test_field_types.rb
-- test/integration/test_helper.rb
-- test/integration/test_keyword_search.rb
-- test/integration/test_pagination.rb
-- test/test_helper.rb
+summary: Library for expressive, powerful interaction with the Solr search engine
+test_files: []
+

data/Manifest.txt

@@ -1,104 +0,0 @@
-History.txt
-Manifest.txt
-PostInstall.txt
-README.rdoc
-Rakefile
-config/hoe.rb
-config/requirements.rb
-lib/light_config.rb
-lib/sunspot.rb
-lib/sunspot/adapters.rb
-lib/sunspot/conditions.rb
-lib/sunspot/conditions_builder.rb
-lib/sunspot/configuration.rb
-lib/sunspot/field.rb
-lib/sunspot/field_builder.rb
-lib/sunspot/indexer.rb
-lib/sunspot/query.rb
-lib/sunspot/query_builder.rb
-lib/sunspot/restriction.rb
-lib/sunspot/scope_builder.rb
-lib/sunspot/search.rb
-lib/sunspot/session.rb
-lib/sunspot/type.rb
-lib/sunspot/util.rb
-lib/sunspot/version.rb
-log/test_solr.log
-setup.rb
-solr/README.txt
-solr/etc/jetty.xml
-solr/etc/webdefault.xml
-solr/exampledocs/books.csv
-solr/exampledocs/hd.xml
-solr/exampledocs/ipod_other.xml
-solr/exampledocs/ipod_video.xml
-solr/exampledocs/mem.xml
-solr/exampledocs/monitor.xml
-solr/exampledocs/monitor2.xml
-solr/exampledocs/mp500.xml
-solr/exampledocs/post.jar
-solr/exampledocs/post.sh
-solr/exampledocs/sd500.xml
-solr/exampledocs/solr.xml
-solr/exampledocs/spellchecker.xml
-solr/exampledocs/utf8-example.xml
-solr/exampledocs/vidcard.xml
-solr/lib/jetty-6.1.3.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/lib/servlet-api-2.5-6.1.3.jar
-solr/logs
-solr/solr/README.txt
-solr/solr/bin/abc
-solr/solr/bin/abo
-solr/solr/bin/backup
-solr/solr/bin/backupcleaner
-solr/solr/bin/commit
-solr/solr/bin/optimize
-solr/solr/bin/readercycle
-solr/solr/bin/rsyncd-disable
-solr/solr/bin/rsyncd-enable
-solr/solr/bin/rsyncd-start
-solr/solr/bin/rsyncd-stop
-solr/solr/bin/scripts-util
-solr/solr/bin/snapcleaner
-solr/solr/bin/snapinstaller
-solr/solr/bin/snappuller
-solr/solr/bin/snappuller-disable
-solr/solr/bin/snappuller-enable
-solr/solr/bin/snapshooter
-solr/solr/conf/admin-extra.html
-solr/solr/conf/protwords.txt
-solr/solr/conf/schema.xml
-solr/solr/conf/scripts.conf
-solr/solr/conf/solrconfig.xml
-solr/solr/conf/stopwords.txt
-solr/solr/conf/synonyms.txt
-solr/solr/conf/xslt
-solr/solr/conf/xslt
-solr/solr/data/spell
-solr/start.jar
-solr/webapps/solr.war
-tasks/deployment.rake
-tasks/environment.rake
-tasks/rcov.rake
-tasks/solr.rake
-tasks/website.rake
-test/api/test_build_search.rb
-test/api/test_helper.rb
-test/api/test_indexer.rb
-test/api/test_retrieve_search.rb
-test/api/test_session.rb
-test/custom_expectation.rb
-test/integration/test_field_types.rb
-test/integration/test_helper.rb
-test/integration/test_keyword_search.rb
-test/integration/test_pagination.rb
-test/mocks/base_class.rb
-test/mocks/comment.rb
-test/mocks/mock_adapter.rb
-test/mocks/post.rb
-test/test_helper.rb

data/PostInstall.txt

@@ -1,7 +0,0 @@
-
-For more information on sunspot, see http://sunspot.rubyforge.org
-
-NOTE: Change this information in PostInstall.txt 
-You can also delete it if you don't want it.
-
-

data/config/hoe.rb

@@ -1,74 +0,0 @@
-require 'sunspot/version'
-
-AUTHOR = 'Mat Brown'  # can also be an array of Authors
-EMAIL = "mat@patch.com"
-DESCRIPTION = "Awesome Solr interaction for Ruby"
-GEM_NAME = 'sunspot' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'sunspot' # The unix name for your project
-HOMEPATH = "http://github.com/outoftime/sunspot"
-DOWNLOAD_PATH = "http://github.com/outoftime/sunspot"
-EXTRA_DEPENDENCIES = [
-  ['solr-ruby', '= 0.0.6',
-   'extlib', '>= 0.9.7']
-]    # An array of rubygem dependencies [name, version]
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil
-# UNCOMMENT IF REQUIRED:
-# REV = YAML.load(`svn info`)['Revision']
-VERS = Sunspot::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'sunspot documentation',
-    "--opname", "index.html",
-    "--line-numbers",
-    "--main", "README.rdoc",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
-    @extra_deps
-  end
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["spec/**/*_spec.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = EXTRA_DEPENDENCIES
-
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-end
-
-CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-$hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""

data/config/requirements.rb

@@ -1,15 +0,0 @@
-require 'fileutils'
-include FileUtils
-
-require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))

data/lib/sunspot/conditions.rb

@@ -1,50 +0,0 @@
-module Sunspot
-  class Conditions
-    def initialize(query, conditions_hash)
-      @query = query
-      @conditions_hash = conditions_hash.inject({}) do |hash, pair|
-        field_name, value = pair
-        hash[field_name.to_s] = value
-        hash
-      end
-    end
-    
-    def interpret(field_name, condition_type)
-      operators_hash[field_name.to_s] = Sunspot::Restriction.const_get condition_type.to_s.camel_case
-    end
-
-    def default(field_name, value)
-      conditions_hash[field_name.to_s] ||= value
-    end
-
-    def restrictions
-      conditions_hash.map { |field_name, value| condition_for(field_name, value) }.compact
-    end
-
-    protected
-    attr_reader :conditions_hash
-
-    def condition_for(field_name, value)
-      operator = operator_for(field_name) || default_operator_for(value)
-      begin
-        @query.build_condition field_name, operator, value
-      rescue ArgumentError
-        nil # fail silently if field isn't configured
-      end
-    end
-
-    def default_operator_for(value)
-      if value.is_a?(Array) then Sunspot::Restriction::AnyOf
-      else Sunspot::Restriction::EqualTo
-      end
-    end
-
-    def operator_for(field_name)
-      operators_hash[field_name.to_s] 
-    end
-
-    def operators_hash
-      @operators_hash ||= {}
-    end
-  end
-end

data/lib/sunspot/conditions_builder.rb

@@ -1,37 +0,0 @@
-module Sunspot
-  class Conditions
-    def initialize(query, conditions_hash)
-      @query, @conditions_hash = query, conditions_hash
-    end
-    
-    def interpret(field_name, condition_type)
-      operators_hash[field_name.to_s] = Sunspot::Restriction.const_get condition_type.to_s.camel_case
-    end
-
-    def conditions
-      conditions_hash.map { |field_name, value| condition_for(field_name, value) }
-    end
-
-    protected
-    attr_reader :conditions_hash
-
-    def condition_for(field_name, value)
-      operator = operator_for(field_name) || default_operator_for(value)
-      @query.build_condition field_name, operator, value
-    end
-
-    def default_operator_for(value)
-      if value.is_a?(Array) then Sunspot::Restriction::AnyOf
-      else Sunspot::Restriction::EqualTo
-      end
-    end
-
-    def operator_for(field_name)
-      operators_hash[field_name.to_s] 
-    end
-
-    def operators_hash
-      @operators_hash ||= {}
-    end
-  end
-end

data/lib/sunspot/field_builder.rb

@@ -1,37 +0,0 @@
-module Sunspot
-  class FieldBuilder
-    def initialize(clazz)
-      @clazz = clazz
-    end
-
-    def text(*names, &block)
-      for name in names
-        ::Sunspot::Field.register_text clazz, build_field(name, ::Sunspot::Type::TextType, &block)
-      end
-    end
-
-    def method_missing(method, *args, &block)
-      begin
-        type = ::Sunspot::Type.const_get "#{method.to_s.camel_case}Type"
-      rescue(NameError)
-        super(method.to_sym, *args, &block) and return
-      end
-      name = args.shift
-      ::Sunspot::Field.register clazz, build_field(name, type, *args, &block)
-    end
-
-    protected
-    attr_reader :clazz
-
-    private
-
-    def build_field(name, type, *args, &block)
-      options = args.shift if args.first.is_a?(Hash)
-      unless block
-        ::Sunspot::Field::AttributeField.new(name, type, options || {})
-      else
-        ::Sunspot::Field::VirtualField.new(name, type, options || {}, &block)
-      end
-    end
-  end
-end

data/lib/sunspot/query_builder.rb

@@ -1,30 +0,0 @@
-module Sunspot
-  class QueryBuilder
-    def initialize(query)
-      @query = query 
-    end
-
-    def keywords(keywords)
-      @query.keywords = keywords
-    end
-
-    def with
-      @conditions_builder ||= ::Sunspot::ScopeBuilder.new(@query)
-    end
-
-    def conditions
-      @query.conditions
-    end
-
-    def paginate(options = {})
-      page = options.delete(:page) || raise(ArgumentError, "paginate requires a :page argument")
-      per_page = options.delete(:per_page)
-      raise ArgumentError, "unknown argument #{options.keys.first.inspect} passed to paginate" unless options.empty?
-      @query.paginate(page, per_page)
-    end
-
-    def order_by(field_name, direction = nil)
-      @query.order_by(field_name, direction)
-    end
-  end
-end