rsolr 1.0.3 → 1.0.5

data/.gitignore

@@ -0,0 +1,12 @@
+.DS_Store
+.yardoc/
+pkg/*
+apache-solr-3.3.0/
+coverage/
+doc/
+example/
+
+Gemfile.lock
+
+*.gem
+.bundle

data/CHANGES.txt

@@ -0,0 +1,8 @@
+1.0.4
+   - The "builder" gem dependency is less strict: ~> 2.1.2
+   - RSolr.version is no longer read from a file
+   - Gemspec updated -- less strict dev/test versions
+   - Jeweler is no longer used for building the gemspec
+1.0.3
+   - Proper encodings in Ruby 1.9
+   - Applied pull request from https://github.com/mwmitchell/rsolr/pull/20

data/Gemfile

@@ -0,0 +1,15 @@
+source "http://rubygems.org"
+
+gemspec
+
+gem "builder", "~> 2.1.2"
+
+group :development do
+  gem "rake", "~> 0.9.2"
+  gem "rdoc", "~> 3.9.4"
+end
+
+group :test do
+  gem "rake", "~> 0.9.2"
+  gem "rspec", "~> 2.6.0"
+end

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rake'
 require 'rake/testtask'
+require 'bundler/gem_tasks'
 
 require 'rubygems/package_task'
 

data/lib/rsolr.rb

@@ -6,9 +6,7 @@ module RSolr
   
   %W(Response Char Client Error Connection Uri Xml).each{|n|autoload n.to_sym, "rsolr/#{n.downcase}"}
   
-  def self.version
-    @version ||= File.read(File.join(File.dirname(__FILE__), '..', 'VERSION')).chomp
-  end
+  def self.version; "1.0.5" end
   
   VERSION = self.version
   

data/rsolr.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+
+require "rsolr"
+
+Gem::Specification.new do |s|
+  s.name        = "rsolr"
+  s.summary     = "A Ruby client for Apache Solr"
+  s.description = %q{RSolr aims to provide a simple and extensible library for working with Solr}
+  s.version     = RSolr.version
+  s.authors     = ["Matt Mitchell", "Jeremy Hinegardner", "Mat Brown", "Mike Perham", "Nathan Witmer", "Peter Kieltyka", "Randy Souza", "shairon toledo", "shima", "Chris Beer", "Jonathan Rochkind"]
+  s.email       = ["goodieboy@gmail.com"]
+  s.homepage    = "https://github.com/mwmitchell/rsolr"
+  s.rubyforge_project = "rsolr"
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_dependency 'builder', '~>2.1.2'
+  s.add_development_dependency 'rake', '~>0.9.2'
+  s.add_development_dependency 'rdoc', '~>3.9.4'
+  s.add_development_dependency 'rspec', '~>2.6.0'
+end

data/tasks/rcov.rake

@@ -0,0 +1,25 @@
+# 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')
+#   # --only-uncovered
+#   t.rcov_opts.concat(['--exclude', 'spec', '--sort', 'coverage'])
+# end
+# 
+# namespace :rcov do
+#   desc 'run api specs with rcov'
+#   Spec::Rake::SpecTask.new('api') do |t|
+#     rm_f "coverage"
+#     rm_f "coverage.data"
+#     t.spec_files = FileList['spec/spec_helper.rb', 'spec/api/**/*_spec.rb']
+#     t.rcov = true
+#     t.rcov_dir = File.join('coverage', 'api')
+#     # --only-uncovered
+#     t.rcov_opts.concat(['--exclude', 'spec', '--sort', 'coverage'])
+#   end
+#   
+# end

data/tasks/rsolr.rake

@@ -0,0 +1,10 @@
+namespace :rsolr do
+  
+  namespace :solr do
+    desc "Starts the HTTP server (port 9999) used for running HTTP connection tests"
+    task :start do
+      system "cd jetty; java -jar start.jar"
+    end
+  end
+  
+end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rsolr
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 1.0.5
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
 platform: ruby
-authors: 
+authors:
 - Matt Mitchell
 - Jeremy Hinegardner
 - Mat Brown
@@ -24,103 +19,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  version_requirements: *id001
+date: 2011-11-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: builder
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70183668711840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        version: 1.6.4
-  version_requirements: *id002
-  name: jeweler
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :runtime
   prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70183668711840
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70183668711040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.9.2
-  version_requirements: *id003
-  name: rake
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70183668711040
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70183668710060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 3
-        - 9
-        - 4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 3.9.4
-  version_requirements: *id004
-  name: rdoc
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70183668710060
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70183668709340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
-  version_requirements: *id005
-  name: builder
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
   prerelease: false
-  type: :runtime
-description: RSolr aims to provide a simple and extensible library for working with Solr
-email: goodieboy@gmail.com
+  version_requirements: *70183668709340
+description: RSolr aims to provide a simple and extensible library for working with
+  Solr
+email:
+- goodieboy@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- CHANGES.txt
+- Gemfile
 - LICENSE
 - README.rdoc
-files: 
-- LICENSE
-- README.rdoc
-- VERSION
-- lib/rsolr-direct.rb
+- Rakefile
 - lib/rsolr.rb
 - lib/rsolr/char.rb
 - lib/rsolr/client.rb
@@ -129,6 +87,7 @@ files:
 - lib/rsolr/response.rb
 - lib/rsolr/uri.rb
 - lib/rsolr/xml.rb
+- rsolr.gemspec
 - spec/api/char_spec.rb
 - spec/api/client_spec.rb
 - spec/api/connection_spec.rb
@@ -138,52 +97,32 @@ files:
 - spec/api/uri_spec.rb
 - spec/api/xml_spec.rb
 - spec/spec_helper.rb
-- Rakefile
-- tasks/spec.rake
+- tasks/rcov.rake
 - tasks/rdoc.rake
-homepage: http://github.com/mwmitchell/rsolr
+- tasks/rsolr.rake
+- tasks/spec.rake
+homepage: https://github.com/mwmitchell/rsolr
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.10
+rubyforge_project: rsolr
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A Ruby client for Apache Solr
-test_files: 
-- spec/api/char_spec.rb
-- spec/api/client_spec.rb
-- spec/api/connection_spec.rb
-- spec/api/error_spec.rb
-- spec/api/pagination_spec.rb
-- spec/api/rsolr_spec.rb
-- spec/api/uri_spec.rb
-- spec/api/xml_spec.rb
-- spec/spec_helper.rb
-- Rakefile
-- tasks/spec.rake
-- tasks/rdoc.rake
+test_files: []

data/VERSION

@@ -1 +0,0 @@
-1.0.3

data/lib/rsolr-direct.rb

@@ -1,111 +0,0 @@
-require 'java'
-require 'rubygems'
-require 'rsolr'
-
-#
-# Connection for JRuby + DirectSolrConnection
-#
-module RSolr::Direct
-  
-  # load the java libs that ship with rsolr-direct
-  # RSolr.load_java_libs
-  # rsolr = RSolr.connect :direct, :solr_home => ''
-  def self.load_java_libs apache_solr_dir
-    @java_libs_loaded ||= (
-      base_dir = File.expand_path(apache_solr_dir)
-      ['lib', 'dist'].each do |sub|
-        Dir[File.join(base_dir, sub, '*.jar')].each do |jar|
-          require jar
-        end
-      end
-      true
-    )
-  end
-  
-  RSolr.class_eval do
-    # RSolr.direct_connect :solr_home => 'apache-solr/example/solr'
-    # RSolr.direct_connect java_solr_core
-    # RSolr.direct_connect java_direct_solr_connection
-    def self.direct_connect *args, &blk
-      client = RSolr::Client.new RSolr::Direct::Connection.new(*args), {:url => false}
-      if block_given?
-        yield client
-        client.connection.close
-        nil
-      else
-        client
-      end
-    end
-  end
-  
-  class Connection
-    
-    attr_accessor :opts
-    
-    class MissingRequiredJavaLibs < RuntimeError
-    end
-    
-    class InvalidSolrHome < RuntimeError
-    end
-    
-    # opts can be an instance of org.apache.solr.servlet.DirectSolrConnection
-    # if opts is NOT an instance of org.apache.solr.servlet.DirectSolrConnection
-    # then...
-    # required: opts[:solr_home] is absolute path to solr home (the directory with "data", "config" etc.)
-    def initialize opts
-      begin
-        org.apache.solr.servlet.DirectSolrConnection
-      rescue NameError
-        raise MissingRequiredJavaLibs
-      end
-      if opts.is_a?(Hash) and opts[:solr_home]
-        raise InvalidSolrHome unless File.exists?(opts[:solr_home])
-        opts[:data_dir] ||= File.join(opts[:solr_home], 'data')
-        @opts = opts
-      elsif opts.class.to_s == "Java::OrgApacheSolrCore::SolrCore"
-        @direct = org.apache.solr.servlet.DirectSolrConnection.new(opts)
-      elsif opts.class.to_s == "Java::OrgApacheSolrServlet::DirectSolrConnection"
-        @direct = opts
-      end
-      opts[:auto_connect] = true unless opts.key?(:auto_connect)
-      self.direct if opts[:auto_connect]
-    end
-    
-    # sets the @direct instance variable if it has not yet been set
-    def direct
-      @direct ||= org.apache.solr.servlet.DirectSolrConnection.new(opts[:solr_home], @opts[:data_dir], nil)
-    end
-    
-    # rsolr.connection.open
-    alias_method :open, :direct
-    
-    def close
-      if @direct
-        @direct.close
-        @direct = nil
-      end
-    end
-    
-    # send a request to the connection
-    def execute client, request_context
-      #data = request_context[:data]
-      #data = data.to_xml if data.respond_to?(:to_xml)
-      url = [request_context[:path], request_context[:query]].join("?")
-      url = "/" + url unless url[0].chr == "/"
-      begin
-        body = direct.request(url, request_context[:data])
-      rescue
-        $!.extend RSolr::Error::SolrContext
-        $!.request = request_context
-        raise $!
-      end
-      {
-        :status => 200,
-        :body => body,
-        :headers => {}
-      }
-    end
-    
-  end
-  
-end