sunspot_solr 1.3.3 → 2.0.0.pre.111215

data/lib/sunspot/solr/java.rb

@@ -2,7 +2,7 @@ module Sunspot
   module Solr
     module Java
       def self.installed?
-        `java -version`
+        `java -version &> /dev/null`
         $?.success?
       end
     end

data/lib/sunspot/solr/server.rb

@@ -1,4 +1,4 @@
-require 'shellwords'
+require 'escape'
 require 'set'
 require 'tempfile'
 require 'sunspot/solr/java'
@@ -101,7 +101,7 @@ module Sunspot
         command << "-Djava.util.logging.config.file=#{logging_config_path}" if logging_config_path
         command << '-jar' << File.basename(solr_jar)
         FileUtils.cd(File.dirname(solr_jar)) do
-          exec(Shellwords.shelljoin(command))
+          exec(Escape.shell_command(command))
         end
       end
 

data/solr/solr/conf/schema.xml

@@ -84,11 +84,14 @@
     <fieldType name="tfloat" class="solr.TrieFloatField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true"/>
+
+    <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
+    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
   </types>
   <fields>
     <!-- Valid attributes for fields:
      name: mandatory - the name for the field
-     type: mandatory - the name of a previously defined type from the 
+     type: mandatory - the name of a previously defined type from the
        <types> section
      indexed: true if this field should be indexed (searchable or sortable)
      stored: true if this field should be retrievable
@@ -223,8 +226,17 @@
     <dynamicField name="*_ets" stored="true" termVectors="true" type="tdouble" multiValued="false" indexed="true"/>
     <!-- *** This dynamicField is used by Sunspot! *** -->
     <dynamicField name="*_etms" stored="true" termVectors="true" type="tdouble" multiValued="true" indexed="true"/>
+
+    <!-- Type used to index the lat and lon components for the "location" FieldType -->
+    <dynamicField name="*_coordinate"  type="tdouble" indexed="true"  stored="false" multiValued="false"/>
+    <dynamicField name="*_p" type="location" indexed="true" stored="true" multiValued="false"/>
+
+    <dynamicField name="*_ll" stored="false" type="location" multiValued="false" indexed="true"/>
+    <dynamicField name="*_llm" stored="false" type="location" multiValued="true" indexed="true"/>
+    <dynamicField name="*_lls" stored="true" type="location" multiValued="false" indexed="true"/>
+    <dynamicField name="*_llms" stored="true" type="location" multiValued="true" indexed="true"/>
   </fields>
-  <!-- Field to use to determine and enforce document uniqueness. 
+  <!-- Field to use to determine and enforce document uniqueness.
       Unless this field is marked with required="false", it will be a required field
    -->
   <uniqueKey>id</uniqueKey>

data/spec/server_spec.rb

@@ -35,14 +35,14 @@ describe Sunspot::Solr::Server do
   end
 
   it 'runs Solr with specified data dir' do
-    @server.solr_data_dir = '/var/solr/data'
-    @server.should_receive(:exec).with(%r(-Dsolr\.data\.dir=/var/solr/data))
+    @server.solr_data_dir = '/tmp/var/solr/data'
+    @server.should_receive(:exec).with(%r(-Dsolr\.data\.dir=/tmp/var/solr/data))
     @server.run
   end
 
   it 'runs Solr with specified Solr home' do
-    @server.solr_home = '/var/solr'
-    @server.should_receive(:exec).with(%r(-Dsolr\.solr\.home=/var/solr))
+    @server.solr_home = '/tmp/var/solr'
+    @server.should_receive(:exec).with(%r(-Dsolr\.solr\.home=/tmp/var/solr))
     @server.run
   end
 

data/sunspot_solr.gemspec

@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency 'escape', '~>0.0.4'
+
   s.add_development_dependency 'rspec', '~> 1.1'
   s.add_development_dependency 'hanna'
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sunspot_solr
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  prerelease: true
   segments: 
-  - 1
-  - 3
-  - 3
-  version: 1.3.3
+  - 2
+  - 0
+  - 0
+  - pre
+  - 111215
+  version: 2.0.0.pre.111215
 platform: ruby
 authors: 
 - Mat Brown
@@ -33,37 +34,48 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-11 00:00:00 Z
+date: 2011-12-15 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: escape
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 1
         version: "1.1"
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hanna
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: "    Sunspot::Solr provides a bundled Solr distribution for use with Sunspot.\n    Typical deployment environments will require more configuration, but this\n    distribution is well suited to development and testing.\n"
 email: 
 - mat@patch.com
@@ -90,13 +102,13 @@ files:
 - solr/README.txt
 - solr/etc/jetty.xml
 - solr/etc/webdefault.xml
-- solr/lib/jetty-6.1.3.jar
-- solr/lib/jetty-util-6.1.3.jar
+- solr/lib/jetty-6.1.26-patched-JETTY-1340.jar
+- solr/lib/jetty-util-6.1.26-patched-JETTY-1340.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/lib/servlet-api-2.5-20081211.jar
 - solr/solr/.gitignore
 - solr/solr/README.txt
 - solr/solr/conf/admin-extra.html
@@ -118,6 +130,7 @@ files:
 - spec/server_spec.rb
 - spec/spec_helper.rb
 - sunspot_solr.gemspec
+has_rdoc: true
 homepage: https://github.com/outoftime/sunspot/tree/master/sunspot_solr
 licenses: []
 
@@ -131,27 +144,25 @@ rdoc_options:
 require_paths: 
 - lib
 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 
-  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: sunspot
-rubygems_version: 1.8.15
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Bundled Solr distribution for Sunspot