acts_as_solr 1.0.0 → 1.1.1

data/.gitignore

@@ -6,3 +6,4 @@ coverage.data
 solr/solr/data/*
 .svn
 test/db/*.db
+pkg

data/Rakefile

@@ -1,6 +1,18 @@
 require 'rubygems'
 require 'rake'
 
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+Dir["#{File.dirname(__FILE__)}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+
+desc "Default Task"
+task :default => [:test]
+
+desc "Runs the unit tests"
+task :test => "test:unit"
+
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.1

data/acts_as_solr.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_solr}
-  s.version = "1.0.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2009-10-18}
+  s.date = %q{2009-12-09}
   s.description = %q{Acts As Solr}
   s.email = %q{kyle@onemorecloud.com}
   s.extra_rdoc_files = [
@@ -184,7 +184,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/onemorecloud/acts_as_solr}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Solr integration for rails}
   s.test_files = [
     "test/db/connections/mysql/connection.rb",
@@ -235,3 +235,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end
+

data/lib/acts_methods.rb

@@ -210,6 +210,12 @@ module ActsAsSolr #:nodoc:
         alias_method_chain :method_missing, :solr_magic
         @already_solr_magic = true
       end
+    rescue ActiveRecord::StatementInvalid  
+      @acts_as_solr_needs_reload = true
+    end
+    
+    def acts_as_solr_needs_reload?
+      @acts_as_solr_needs_reload
     end
     
     private

data/lib/class_methods.rb

@@ -113,6 +113,7 @@ module ActsAsSolr #:nodoc:
     #
     def find_by_solr(query, options={})
       data = parse_query(query, options)
+      puts data.inspect
       return parse_results(data, options) if data
     end
     

data/lib/instance_methods.rb

@@ -24,6 +24,10 @@ module ActsAsSolr #:nodoc:
 
     # saves to the Solr index
     def solr_save
+      if self.class.respond_to?(:acts_as_solr_needs_reload?) && self.class.acts_as_solr_needs_reload?
+        self.class.acts_as_solr 
+      end
+      
       return true if indexing_disabled?
       if evaluate_condition(:if, self) 
         logger.debug "solr_save: #{self.class.name} : #{record_id(self)}"
@@ -33,6 +37,8 @@ module ActsAsSolr #:nodoc:
       else
         solr_destroy
       end
+    rescue ConnectionError
+      false
     end
 
     def indexing_disabled?
@@ -46,6 +52,8 @@ module ActsAsSolr #:nodoc:
       solr_delete solr_id
       solr_commit if configuration[:auto_commit]
       true
+    rescue ConnectionError
+      false
     end
 
     # convert instance to Solr document

data/lib/parser_methods.rb

@@ -4,6 +4,7 @@ module ActsAsSolr #:nodoc:
     
     # Method used by mostly all the ClassMethods when doing a search
     def parse_query(query=nil, options={}, models=nil)
+      
       valid_options = [:offset, :limit, :facets, :models, :results_format, :order, :scores, :operator, :include, :lazy, :highlight]
       query_options = {}
 
@@ -87,11 +88,14 @@ module ActsAsSolr #:nodoc:
         order = options[:order].split(/\s*,\s*/).collect{|e| e.gsub(/\s+/,'_t ').gsub(/\bscore_t\b/, 'score')  }.join(',') if options[:order] 
         query_options[:query] = replace_types([query])[0] # TODO adjust replace_types to work with String or Array  
 
-        if options[:order]
-          # TODO: set the sort parameter instead of the old ;order. style.
-          query_options[:query] << ';' << replace_types([order], false)[0]
+        if options[:order].is_a?(String)  
+          string = replace_types([order], false)[0]
+          field, direction = string.split(/\s+/)
+          direction = direction.to_s =~ /asc/i ? :ascending : :descending
+          query_options[:sort] = [{field => direction}]
+        elsif options[:order]
+          query_options[:sort] = options[:order]
         end
-        
         ActsAsSolr::Post.execute(Solr::Request::Standard.new(query_options))
       rescue
         raise "There was a problem executing your search: #{$!} in #{$!.backtrace.first}"
@@ -164,13 +168,13 @@ module ActsAsSolr #:nodoc:
     
     # Reorders the instances keeping the order returned from Solr
     def reorder(things, ids)
-      ordered_things = Array.new(things.size)
-      raise "Out of sync! Found #{ids.size} items in index, but only #{things.size} were found in database!" unless things.size == ids.size
+      ordered_things = Array.new([things.size, ids.size].max)
+      # raise "Out of sync! Found #{ids.size} items in index, but only #{things.size} were found in database!" unless things.size == ids.size
       things.each do |thing|
         position = ids.index(thing.id)
         ordered_things[position] = thing
       end
-      ordered_things
+      ordered_things.compact
     end
 
     # Replaces the field types based on the types (if any) specified

data/lib/solr/request/standard.rb

@@ -50,7 +50,8 @@ class Solr::Request::Standard < Solr::Request::Select
       key = sort.keys[0]
       "#{key.to_s} #{sort[key] == :descending ? 'desc' : 'asc'}"
     end.join(',') if @params[:sort]
-    hash[:q] = sort ? "#{@params[:query]};#{sort}" : @params[:query]
+    hash[:q] = @params[:query]
+    hash[:sort] = sort if sort
     hash["q.op"] = @params[:operator]
     hash[:df] = @params[:default_field]
 

data/solr/solr/conf/schema.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--META:NAME acts_as_solr for Ruby on Rails-->
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
  contributor license agreements.  See the NOTICE file distributed with
@@ -50,7 +51,8 @@
 
     <fieldType name="text" class="solr.TextField" positionIncrementGap="100">
       <analyzer type="index">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <tokenizer class="solr.ChineseTokenizerFactory"/>
+        <filter class="solr.ChineseFilterFactory" />
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
         <filter class="solr.LowerCaseFilterFactory"/>
@@ -58,7 +60,8 @@
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
       <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <tokenizer class="solr.ChineseTokenizerFactory"/>
+        <filter class="solr.ChineseFilterFactory" />
         <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
@@ -100,19 +103,19 @@
    <field name="id" type="string" indexed="true" stored="true" required="true" /> 
    <field name="pk_i" type="integer" indexed="true" stored="true"/>
    <field name="pk_s" type="string" indexed="true" stored="true"/>   
-   <field name="text" type="text" indexed="true" stored="false" multiValued="true"/>
-
-   <dynamicField name="*_i" type="integer" indexed="true" stored="false"/>
-   <dynamicField name="*_t" type="text" indexed="true" stored="false"/>
-   <dynamicField name="*_f" type="float" indexed="true" stored="false"/>
-   <dynamicField name="*_b" type="boolean" indexed="true" stored="false"/>
-   <dynamicField name="*_d" type="date" indexed="true" stored="false"/>
-   <dynamicField name="*_s" type="string" indexed="true" stored="false"/>
-   <dynamicField name="*_ri" type="sint" indexed="true" stored="false"/>
-   <dynamicField name="*_rf" type="sfloat" indexed="true" stored="false"/>
-   <dynamicField name="*_facet" type="string" indexed="true" stored="false"/>
-   <dynamicField name="*_s_mv" type="string" indexed="true" stored="false" multiValued="true"/>
-   <dynamicField name="*_zh_text" type="text_zh" indexed="true" stored="false" multiValued="true"/>
+   <field name="text" type="text" indexed="true" stored="true" multiValued="true"/>
+
+   <dynamicField name="*_i" type="integer" indexed="true" stored="true"/>
+   <dynamicField name="*_t" type="text" indexed="true" stored="true"/>
+   <dynamicField name="*_f" type="float" indexed="true" stored="true"/>
+   <dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>
+   <dynamicField name="*_d" type="date" indexed="true" stored="true"/>
+   <dynamicField name="*_s" type="string" indexed="true" stored="true"/>
+   <dynamicField name="*_ri" type="sint" indexed="true" stored="true"/>
+   <dynamicField name="*_rf" type="sfloat" indexed="true" stored="true"/>
+   <dynamicField name="*_facet" type="string" indexed="true" stored="true"/>
+   <dynamicField name="*_s_mv" type="string" indexed="true" stored="true" multiValued="true"/>
+   <dynamicField name="*_zh_text" type="text_zh" indexed="true" stored="true" multiValued="true"/>
    <dynamicField name="*_display" type="text" indexed="false" stored="true" multiValued="true"/>
  </fields>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_solr
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-18 00:00:00 -07:00
+date: 2009-12-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Solr integration for rails