Merge branch 'stable' into postgres-tests

Rodrigo Souto
2 parents f12dd0f6 ae71aa62
Showing 19 changed files with 151 additions and 52 deletions Show diff stats
app/models/profile.rb
app/views/blocks/location.html.erb
app/views/maps/edit_location.rhtml
db/schema.rb
debian/changelog
lib/feed_updater.rb
lib/noosfero.rb
plugins/solr/lib/solr_plugin/search_helper.rb
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/instance_methods.rb
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/solr/request/select.rb
plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
public/500.html
public/503.html
test/unit/location_block_test.rb
test/unit/profile_test.rb
vendor/plugins/delayed_job/lib/delayed/worker.rb
vendor/plugins/monkey_patches/rescue_delayed_job_crashes/init.rb
@@ -298,7 +298,7 @@ class Profile &lt; ActiveRecord::Base
   validate :valid_template
   def valid_template
-    if template_id.present? and !template.is_template
+    if template_id.present? && template && !template.is_template
       errors.add(:template, _('is not a template.'))
     end
   end
 <% if profile.lat %>
   <%= block_title block.title %>
   <div class='the-localization-map'>
-    <img src="http://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
+    <img src="https://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
   </div>
 </div>
 <% else %>
@@ -29,5 +29,5 @@
 <% end %>
-<%= content_tag('script', '', :src => "http://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>
+<%= content_tag('script', '', :src => "https://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>
 <%= content_tag('script', '', :src => url_for(:controller => :maps, :action => :google_map), :type => 'text/javascript') %>
@@ -221,7 +221,6 @@ ActiveRecord::Schema.define(:version =&gt; 20130711213046) do
     t.string   "source_type"
     t.string   "user_agent"
     t.string   "referrer"
-    t.integer  "group_id"
   end
   add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
+noosfero (0.44.3) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Rodrigo Souto <rodrigo@colivre.coop.br>  Wed, 14 Aug 2013 19:38:33 -0300
+
 noosfero (0.44.2) unstable; urgency=low
   * Bugfixes release
@@ -19,6 +19,18 @@ end
 # stops the process.
 class FeedUpdater
+  class ExceptionNotification < ActionMailer::Base
+    def mail error
+      environment = Environment.default
+
+      recipients NOOSFERO_CONF['exception_recipients']
+      from       environment.contact_email
+      reply_to   environment.contact_email
+      subject    "[#{environment.name}] Feed-updater: #{error.message}"
+      body       render(:text => error.backtrace.join("\n"))
+    end
+  end
+
   # indicates how much time one feed will be left without updates
   # (ActiveSupport::Duration). Default: <tt>4.hours</tt>
   cattr_accessor :update_interval
@@ -79,6 +91,8 @@ class FeedUpdater
         feed_handler.process(container)
       end
     end
+  rescue Exception => e
+    FeedUpdater::ExceptionNotification.deliver_mail e if NOOSFERO_CONF['exception_recipients'].present?
   end
 end
@@ -3,7 +3,7 @@ require &#39;fast_gettext&#39;
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.44.2'
+  VERSION = '0.44.3'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -34,10 +34,6 @@ module SolrPlugin::SearchHelper
     ],
   }
-#  def asset_class(asset)
-#    asset.to_s.singularize.camelize.constantize
-#  end
-
   def class_asset(klass)
     klass.name.underscore.pluralize.to_sym
   end
@@ -111,6 +107,8 @@ module SolrPlugin::SearchHelper
   def asset_class(asset)
     asset.to_s.singularize.camelize.constantize
+  rescue
+    asset.to_s.singularize.camelize.gsub('Plugin', 'Plugin::').constantize
   end
   def set_facets_variables
@@ -208,7 +208,7 @@ module ActsAsSolr #:nodoc:
     # using eager loading for indexed associations.
     def rebuild_solr_index(batch_size=300, options = {}, &finder)
       finder ||= lambda do |ar, sql_options|
-        ar.all sql_options.merge!({:order => self.primary_key, :include => configuration[:solr_includes].keys})
+        ar.all sql_options.merge!({:order => self.primary_key})
       end
       start_time = Time.now
       options[:offset] ||= 0
 module ActsAsSolr #:nodoc:
-  
+
   module InstanceMethods
     # Solr id is <class.name>:<id> to be unique across all models
@@ -10,7 +10,7 @@ module ActsAsSolr #:nodoc:
     # saves to the Solr index
     def solr_save
       return true if indexing_disabled?
-      if evaluate_condition(:if, self) 
+      if evaluate_condition(:if, self)
         debug "solr_save: #{self.class.name} : #{record_id(self)}"
         solr_add to_solr_doc
         solr_commit if configuration[:auto_commit]
@@ -38,9 +38,9 @@ module ActsAsSolr #:nodoc:
       debug "to_solr_doc: creating doc for class: #{self.class.name}, id: #{record_id(self)}"
       doc = Solr::Document.new
       doc.boost = validate_boost(configuration[:boost]) if configuration[:boost]
-      
+
       doc << {:id => solr_id,
-              solr_configuration[:type_field] => self.class.name,
+              solr_configuration[:type_field] => Solr::Util.query_parser_escape(self.class.name),
               solr_configuration[:primary_key_field] => record_id(self).to_s}
       # iterate through the fields and add them to the document,
@@ -50,7 +50,7 @@ module ActsAsSolr #:nodoc:
         field_boost = options[:boost] || solr_configuration[:default_boost]
         field_type = get_solr_field_type(options[:type])
         solr_name = options[:as] || field_name
-        
+
         value = self.send("#{field_name}_for_solr") rescue nil
         next if value.nil?
@@ -63,18 +63,18 @@ module ActsAsSolr #:nodoc:
         field.boost = processed_boost
         doc << field
       end
-      
+
       add_dynamic_attributes(doc)
       add_includes(doc)
       add_tags(doc)
       add_space(doc)
-      
+
       debug doc.to_json
       doc
     end
     private
-    
+
     def debug(text)
       logger.debug text rescue nil
     end
@@ -85,14 +85,14 @@ module ActsAsSolr #:nodoc:
         doc << Solr::Field.new(:name => "lng_f", :value => local.longitude)
       end
     end
-    
+
     def add_tags(doc)
       taggings.each do |tagging|
         doc << Solr::Field.new(:name => "tag_facet", :value => tagging.tag.name)
         doc << Solr::Field.new(:name => "tag_t", :value => tagging.tag.name)
       end if configuration[:taggable]
     end
-    
+
     def add_dynamic_attributes(doc)
       dynamic_attributes.each do |attribute|
         value = ERB::Util.html_escape(attribute.value)
@@ -130,7 +130,7 @@ module ActsAsSolr #:nodoc:
         end
       end
     end
-    
+
     def include_value(record, options)
       if options[:using].is_a? Proc
         options[:using].call(record)
@@ -159,14 +159,14 @@ module ActsAsSolr #:nodoc:
           self.send(boost)
         end
       end
-      
+
       boost_value || solr_configuration[:default_boost]
     end
-    
+
     def condition_block?(condition)
       condition.respond_to?("call") && (condition.arity == 1 || condition.arity == -1)
     end
-    
+
     def evaluate_condition(which_condition, field)
       condition = configuration[which_condition]
       case condition
@@ -127,7 +127,7 @@ module ActsAsSolr #:nodoc:
       classes = [self] + (self.subclasses || []) + (options[:models] || [])
       classes.map do |klass|
         next if klass.name.empty?
-        "#{solr_configuration[:type_field]}:\"#{klass.name}\""
+        "#{solr_configuration[:type_field]}:\"#{Solr::Util.query_parser_escape klass.name}\""
       end.compact.join(' OR ')
     end
@@ -12,22 +12,22 @@
 # "Abstract" base class, only useful with subclasses that add parameters
 class Solr::Request::Select < Solr::Request::Base
-      
+
   attr_reader :query_type
-  
+
   def initialize(qt=nil, params={})
     @query_type = qt
     @select_params = params
   end
-  
+
   def response_format
     :ruby
   end
-  
+
   def handler
     'select'
   end
-  
+
   def content_type
     'application/x-www-form-urlencoded; charset=utf-8'
   end
@@ -35,7 +35,7 @@ class Solr::Request::Select &lt; Solr::Request::Base
   def to_hash
     return {:qt => query_type, :wt => 'ruby', 'json.nl' => 'arrarr'}.merge(@select_params)
   end
-  
+
   def to_s
     raw_params = self.to_hash
@@ -50,5 +50,5 @@ class Solr::Request::Select &lt; Solr::Request::Base
     http_params.join("&")
   end
-  
+
 end
 namespace :solr do
-  APACHE_MIRROR = ENV['APACHE_MIRROR'] || "http://ftp.unicamp.br/pub/apache"
+  APACHE_MIRROR = ENV['APACHE_MIRROR'] || "https://archive.apache.org/dist"
   SOLR_VERSION = '3.6.2'
   SOLR_FILENAME = "apache-solr-#{SOLR_VERSION}.tgz"
   SOLR_MD5SUM = 'e9c51f51265b070062a9d8ed50b84647'
@@ -177,7 +177,7 @@ namespace :solr do
     models.each do |model|
       if clear_first
         puts "Clearing index for #{model}..."
-        ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => "#{model.solr_configuration[:type_field]}:#{Solr::Util.query_parser_escape(model.name)}"))
+        ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => "#{model.solr_configuration[:type_field]}:#{model.name.gsub ':', "\\:"}"))
         ActsAsSolr::Post.execute(Solr::Request::Commit.new)
       end
@@ -55,13 +55,13 @@
       <div id='es' style='display: none' class='message'>
-        <h1>Temporary system problem</h1>
+        <h1>Problema temporal del sistema</h1>
         <p>
-        Our technical team is working on it, please try again later. Sorry for the inconvenience.
+        Nuestro equipo técnico está trabajando en ello, por favor, inténtalo de nuevo más tarde. Disculpa las molestias.
         </p>
         <ul>
-          <li><a href='javascript: history.back()'>Go back</a></li>
-          <li><a href='/'>Go to the site home page</a></li>
+          <li><a href='javascript: history.back()'>Regresar</a></li>
+          <li><a href='/'>Ir a la página de inicio del sitio</a></li>
         </ul>
       </div>
@@ -90,6 +90,18 @@
       </div>
+      <div id='it' style='display: none' class='message'>
+        <h1>Temporary system problem</h1>
+        <p>
+        Our technical team is working on it, please try again later. Sorry for the inconvenience.
+        </p>
+        <ul>
+          <li><a href='javascript: history.back()'>Go back</a></li>
+          <li><a href='/'>Go to the site home page</a></li>
+        </ul>
+      </div>
+    
+      
       <div id='pt' style='display: none' class='message'>
         <h1>Problema temporário no sistema</h1>
         <p>
@@ -127,6 +139,8 @@
         <a href="javascript: display_error_message('hy')">հայերեն լեզու</a>
+        <a href="javascript: display_error_message('it')">Italiano</a>
+      
         <a href="javascript: display_error_message('pt')">Português</a>
         <a href="javascript: display_error_message('ru')">русский язык</a>
@@ -43,9 +43,9 @@
       <div id='es' style='display: none' class='message'>
-        <h1>System maintainance</h1>
+        <h1>Mantenimeinto del sistema</h1>
         <p>
-        This system is under maintainance. It should be back in a few moments.
+        Este sistema está en mantenimiento. Debería regresar en unos momentos.
         </p>
       </div>
@@ -66,6 +66,14 @@
       </div>
+      <div id='it' style='display: none' class='message'>
+        <h1>System maintainance</h1>
+        <p>
+        This system is under maintainance. It should be back in a few moments.
+        </p>
+      </div>
+    
+      
       <div id='pt' style='display: none' class='message'>
         <h1>Manutenção do sistema</h1>
         <p>
@@ -95,6 +103,8 @@
         <a href="javascript: display_error_message('hy')">հայերեն լեզու</a>
+        <a href="javascript: display_error_message('it')">Italiano</a>
+      
         <a href="javascript: display_error_message('pt')">Português</a>
         <a href="javascript: display_error_message('ru')">русский язык</a>
@@ -29,11 +29,11 @@ class LocationBlockTest &lt; ActiveSupport::TestCase
     assert_equal '', LocationBlock.new.title
   end
-  should 'use google maps api v3' do
+  should 'use google maps api v3 with ssl' do
     @block.owner.lat = '-12.34'; @block.owner.save!
     content = extract_block_content(@block.content)
-    assert_match 'http://maps.google.com/maps/api/staticmap', content
+    assert_match 'https://maps.google.com/maps/api/staticmap', content
     assert_no_match /key=/, content
   end
@@ -1379,6 +1379,16 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_not_includes Profile.templates(Environment.default), profile
   end
+  should 'not crash on a profile update with a destroyed template' do
+    template = fast_create(Profile, :is_template => true)
+    profile = fast_create(Profile, :template_id => template.id)
+    template.destroy
+
+    assert_nothing_raised do
+      Profile.find(profile.id).save!
+    end
+  end
+
   should 'provide URL to leave' do
     profile = build(Profile, :identifier => 'testprofile')
     assert_equal({ :profile => 'testprofile', :controller => 'profile', :action => 'leave', :reload => false}, profile.leave_url)
@@ -10,12 +10,12 @@ module Delayed
     self.max_attempts = 25
     self.max_run_time = 4.hours
     self.default_priority = 0
-    
+
     # By default failed jobs are destroyed after too many attempts. If you want to keep them around
     # (perhaps to inspect the reason for the failure), set this to false.
     cattr_accessor :destroy_failed_jobs
     self.destroy_failed_jobs = true
-    
+
     self.logger = if defined?(Merb::Logger)
       Merb.logger
     elsif defined?(RAILS_DEFAULT_LOGGER)
@@ -24,9 +24,9 @@ module Delayed
     # name_prefix is ignored if name is set directly
     attr_accessor :name_prefix
-    
+
     cattr_reader :backend
-    
+
     def self.backend=(backend)
       if backend.is_a? Symbol
         require "delayed/backend/#{backend}"
@@ -35,7 +35,7 @@ module Delayed
       @@backend = backend
       silence_warnings { ::Delayed.const_set(:Job, backend) }
     end
-    
+
     def self.guess_backend
       self.backend ||= if defined?(ActiveRecord)
         :active_record
@@ -97,7 +97,7 @@ module Delayed
     ensure
       Delayed::Job.clear_locks!(name)
     end
-    
+
     # Do num jobs and return stats on success/failure.
     # Exit early if interrupted.
     def work_off(num = 100)
@@ -117,7 +117,7 @@ module Delayed
       return [success, failure]
     end
-    
+
     def run(job)
       runtime =  Benchmark.realtime do
         Timeout.timeout(self.class.max_run_time.to_i) { job.invoke_job }
@@ -129,7 +129,7 @@ module Delayed
       handle_failed_job(job, e)
       return false  # work failed
     end
-    
+
     # Reschedule the job in the future (when a job fails).
     # Uses an exponential scale depending on the number of failed attempts.
     def reschedule(job, time = nil)
@@ -162,13 +162,13 @@ module Delayed
     end
   protected
-    
+
     def handle_failed_job(job, error)
       job.last_error = error.message + "\n" + error.backtrace.join("\n")
       say "#{job.name} failed with #{error.class.name}: #{error.message} - #{job.attempts} failed attempts", Logger::ERROR
       reschedule(job)
     end
-    
+
     # Run the next job we can get an exclusive lock on.
     # If no jobs are left we return nil
     def reserve_and_run_one_job
@@ -0,0 +1,48 @@
+Delayed::Worker.module_eval do
+  # based on https://groups.google.com/forum/#!topic/delayed_job/ZGMUFFppNgs
+  class Delayed::Worker::ExceptionNotification < ActionMailer::Base
+    def mail error
+      environment = Environment.default
+
+      recipients NOOSFERO_CONF['exception_recipients']
+      from       environment.contact_email
+      reply_to   environment.contact_email
+      subject    "[#{environment.name}] DelayedJob: #{error.message}"
+      body       render(:text => error.backtrace.join("\n"))
+    end
+  end
+
+  def handle_failed_job_with_notification(job, error)
+    Delayed::Worker::ExceptionNotification.deliver_mail error if NOOSFERO_CONF['exception_recipients'].present?
+    handle_failed_job_without_notification job, error
+  end
+  alias_method_chain :handle_failed_job, :notification
+
+  def handle_failed_job_with_rescue(job, error)
+    handle_failed_job_without_rescue(job, error)
+  rescue => e # don't crash here
+  end
+  alias_method_chain :handle_failed_job, :rescue
+
+  protected
+
+  # This code must be replicated because there is no other way to pass the job
+  # through and use alias_method_chain as we used on the previous method
+  def reserve_and_run_one_job
+    # We get up to 5 jobs from the db. In case we cannot get exclusive access to a job we try the next.
+    # this leads to a more even distribution of jobs across the worker processes
+    job = Delayed::Job.find_available(name, 5, self.class.max_run_time).detect do |job|
+      if job.lock_exclusively!(self.class.max_run_time, name)
+        say "acquired lock on #{job.name}"
+        true
+      else
+        say "failed to acquire exclusive lock for #{job.name}", Logger::WARN
+        false
+      end
+    end
+
+    run(job) if job
+  rescue => e
+    handle_failed_job(job, e)
+  end
+end
	@@ -298,7 +298,7 @@ class Profile < ActiveRecord::Base		@@ -298,7 +298,7 @@ class Profile < ActiveRecord::Base
298	validate :valid_template	298	validate :valid_template
299		299
300	def valid_template	300	def valid_template
301	- if template_id.present? and !template.is_template	301	+ if template_id.present? && template && !template.is_template
302	errors.add(:template, _('is not a template.'))	302	errors.add(:template, _('is not a template.'))
303	end	303	end
304	end	304	end
1	<% if profile.lat %>	1	<% if profile.lat %>
2	<%= block_title block.title %>	2	<%= block_title block.title %>
3	<div class='the-localization-map'>	3	<div class='the-localization-map'>
4	- <img src="http://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>	4	+ <img src="https://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
5	</div>	5	</div>
6	</div>	6	</div>
7	<% else %>	7	<% else %>
	@@ -29,5 +29,5 @@		@@ -29,5 +29,5 @@
29		29
30	<% end %>	30	<% end %>
31		31
32	-<%= content_tag('script', '', :src => "http://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>	32	+<%= content_tag('script', '', :src => "https://maps.googleapis.com/maps/api/js?sensor=false", :type => 'text/javascript') %>
33	<%= content_tag('script', '', :src => url_for(:controller => :maps, :action => :google_map), :type => 'text/javascript') %>	33	<%= content_tag('script', '', :src => url_for(:controller => :maps, :action => :google_map), :type => 'text/javascript') %>
	@@ -221,7 +221,6 @@ ActiveRecord::Schema.define(:version => 20130711213046) do		@@ -221,7 +221,6 @@ ActiveRecord::Schema.define(:version => 20130711213046) do
221	t.string "source_type"	221	t.string "source_type"
222	t.string "user_agent"	222	t.string "user_agent"
223	t.string "referrer"	223	t.string "referrer"
224	- t.integer "group_id"
225	end	224	end
226		225
227	add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"	226	add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
		1	+noosfero (0.44.3) unstable; urgency=low
		2	+
		3	+ * Bugfixes release
		4	+
		5	+ -- Rodrigo Souto <rodrigo@colivre.coop.br> Wed, 14 Aug 2013 19:38:33 -0300
		6	+
1	noosfero (0.44.2) unstable; urgency=low	7	noosfero (0.44.2) unstable; urgency=low
2		8
3	* Bugfixes release	9	* Bugfixes release
	@@ -19,6 +19,18 @@ end		@@ -19,6 +19,18 @@ end
19	# stops the process.	19	# stops the process.
20	class FeedUpdater	20	class FeedUpdater
21		21
		22	+ class ExceptionNotification < ActionMailer::Base
		23	+ def mail error
		24	+ environment = Environment.default
		25	+
		26	+ recipients NOOSFERO_CONF['exception_recipients']
		27	+ from environment.contact_email
		28	+ reply_to environment.contact_email
		29	+ subject "[#{environment.name}] Feed-updater: #{error.message}"
		30	+ body render(:text => error.backtrace.join("\n"))
		31	+ end
		32	+ end
		33	+
22	# indicates how much time one feed will be left without updates	34	# indicates how much time one feed will be left without updates
23	# (ActiveSupport::Duration). Default: <tt>4.hours</tt>	35	# (ActiveSupport::Duration). Default: <tt>4.hours</tt>
24	cattr_accessor :update_interval	36	cattr_accessor :update_interval
	@@ -79,6 +91,8 @@ class FeedUpdater		@@ -79,6 +91,8 @@ class FeedUpdater
79	feed_handler.process(container)	91	feed_handler.process(container)
80	end	92	end
81	end	93	end
		94	+ rescue Exception => e
		95	+ FeedUpdater::ExceptionNotification.deliver_mail e if NOOSFERO_CONF['exception_recipients'].present?
82	end	96	end
83	end	97	end
84		98
	@@ -3,7 +3,7 @@ require 'fast_gettext'		@@ -3,7 +3,7 @@ require 'fast_gettext'
3		3
4	module Noosfero	4	module Noosfero
5	PROJECT = 'noosfero'	5	PROJECT = 'noosfero'
6	- VERSION = '0.44.2'	6	+ VERSION = '0.44.3'
7		7
8	def self.pattern_for_controllers_in_directory(dir)	8	def self.pattern_for_controllers_in_directory(dir)
9	disjunction = controllers_in_directory(dir).join('\|')	9	disjunction = controllers_in_directory(dir).join('\|')
	@@ -208,7 +208,7 @@ module ActsAsSolr #:nodoc:		@@ -208,7 +208,7 @@ module ActsAsSolr #:nodoc:
208	# using eager loading for indexed associations.	208	# using eager loading for indexed associations.
209	def rebuild_solr_index(batch_size=300, options = {}, &finder)	209	def rebuild_solr_index(batch_size=300, options = {}, &finder)
210	finder \|\|= lambda do \|ar, sql_options\|	210	finder \|\|= lambda do \|ar, sql_options\|
211	- ar.all sql_options.merge!({:order => self.primary_key, :include => configuration[:solr_includes].keys})	211	+ ar.all sql_options.merge!({:order => self.primary_key})
212	end	212	end
213	start_time = Time.now	213	start_time = Time.now
214	options[:offset] \|\|= 0	214	options[:offset] \|\|= 0
1	module ActsAsSolr #:nodoc:	1	module ActsAsSolr #:nodoc:
2	-	2	+
3	module InstanceMethods	3	module InstanceMethods
4		4
5	# Solr id is <class.name>:<id> to be unique across all models	5	# Solr id is <class.name>:<id> to be unique across all models
	@@ -10,7 +10,7 @@ module ActsAsSolr #:nodoc:		@@ -10,7 +10,7 @@ module ActsAsSolr #:nodoc:
10	# saves to the Solr index	10	# saves to the Solr index
11	def solr_save	11	def solr_save
12	return true if indexing_disabled?	12	return true if indexing_disabled?
13	- if evaluate_condition(:if, self)	13	+ if evaluate_condition(:if, self)
14	debug "solr_save: #{self.class.name} : #{record_id(self)}"	14	debug "solr_save: #{self.class.name} : #{record_id(self)}"
15	solr_add to_solr_doc	15	solr_add to_solr_doc
16	solr_commit if configuration[:auto_commit]	16	solr_commit if configuration[:auto_commit]
	@@ -38,9 +38,9 @@ module ActsAsSolr #:nodoc:		@@ -38,9 +38,9 @@ module ActsAsSolr #:nodoc:
38	debug "to_solr_doc: creating doc for class: #{self.class.name}, id: #{record_id(self)}"	38	debug "to_solr_doc: creating doc for class: #{self.class.name}, id: #{record_id(self)}"
39	doc = Solr::Document.new	39	doc = Solr::Document.new
40	doc.boost = validate_boost(configuration[:boost]) if configuration[:boost]	40	doc.boost = validate_boost(configuration[:boost]) if configuration[:boost]
41	-	41	+
42	doc << {:id => solr_id,	42	doc << {:id => solr_id,
43	- solr_configuration[:type_field] => self.class.name,	43	+ solr_configuration[:type_field] => Solr::Util.query_parser_escape(self.class.name),
44	solr_configuration[:primary_key_field] => record_id(self).to_s}	44	solr_configuration[:primary_key_field] => record_id(self).to_s}
45		45
46	# iterate through the fields and add them to the document,	46	# iterate through the fields and add them to the document,
	@@ -50,7 +50,7 @@ module ActsAsSolr #:nodoc:		@@ -50,7 +50,7 @@ module ActsAsSolr #:nodoc:
50	field_boost = options[:boost] \|\| solr_configuration[:default_boost]	50	field_boost = options[:boost] \|\| solr_configuration[:default_boost]
51	field_type = get_solr_field_type(options[:type])	51	field_type = get_solr_field_type(options[:type])
52	solr_name = options[:as] \|\| field_name	52	solr_name = options[:as] \|\| field_name
53	-	53	+
54	value = self.send("#{field_name}_for_solr") rescue nil	54	value = self.send("#{field_name}_for_solr") rescue nil
55	next if value.nil?	55	next if value.nil?
56		56
	@@ -63,18 +63,18 @@ module ActsAsSolr #:nodoc:		@@ -63,18 +63,18 @@ module ActsAsSolr #:nodoc:
63	field.boost = processed_boost	63	field.boost = processed_boost
64	doc << field	64	doc << field
65	end	65	end
66	-	66	+
67	add_dynamic_attributes(doc)	67	add_dynamic_attributes(doc)
68	add_includes(doc)	68	add_includes(doc)
69	add_tags(doc)	69	add_tags(doc)
70	add_space(doc)	70	add_space(doc)
71	-	71	+
72	debug doc.to_json	72	debug doc.to_json
73	doc	73	doc
74	end	74	end
75		75
76	private	76	private
77	-	77	+
78	def debug(text)	78	def debug(text)
79	logger.debug text rescue nil	79	logger.debug text rescue nil
80	end	80	end
	@@ -85,14 +85,14 @@ module ActsAsSolr #:nodoc:		@@ -85,14 +85,14 @@ module ActsAsSolr #:nodoc:
85	doc << Solr::Field.new(:name => "lng_f", :value => local.longitude)	85	doc << Solr::Field.new(:name => "lng_f", :value => local.longitude)
86	end	86	end
87	end	87	end
88	-	88	+
89	def add_tags(doc)	89	def add_tags(doc)
90	taggings.each do \|tagging\|	90	taggings.each do \|tagging\|
91	doc << Solr::Field.new(:name => "tag_facet", :value => tagging.tag.name)	91	doc << Solr::Field.new(:name => "tag_facet", :value => tagging.tag.name)
92	doc << Solr::Field.new(:name => "tag_t", :value => tagging.tag.name)	92	doc << Solr::Field.new(:name => "tag_t", :value => tagging.tag.name)
93	end if configuration[:taggable]	93	end if configuration[:taggable]
94	end	94	end
95	-	95	+
96	def add_dynamic_attributes(doc)	96	def add_dynamic_attributes(doc)
97	dynamic_attributes.each do \|attribute\|	97	dynamic_attributes.each do \|attribute\|
98	value = ERB::Util.html_escape(attribute.value)	98	value = ERB::Util.html_escape(attribute.value)
	@@ -130,7 +130,7 @@ module ActsAsSolr #:nodoc:		@@ -130,7 +130,7 @@ module ActsAsSolr #:nodoc:
130	end	130	end
131	end	131	end
132	end	132	end
133	-	133	+
134	def include_value(record, options)	134	def include_value(record, options)
135	if options[:using].is_a? Proc	135	if options[:using].is_a? Proc
136	options[:using].call(record)	136	options[:using].call(record)
	@@ -159,14 +159,14 @@ module ActsAsSolr #:nodoc:		@@ -159,14 +159,14 @@ module ActsAsSolr #:nodoc:
159	self.send(boost)	159	self.send(boost)
160	end	160	end
161	end	161	end
162	-	162	+
163	boost_value \|\| solr_configuration[:default_boost]	163	boost_value \|\| solr_configuration[:default_boost]
164	end	164	end
165	-	165	+
166	def condition_block?(condition)	166	def condition_block?(condition)
167	condition.respond_to?("call") && (condition.arity == 1 \|\| condition.arity == -1)	167	condition.respond_to?("call") && (condition.arity == 1 \|\| condition.arity == -1)
168	end	168	end
169	-	169	+
170	def evaluate_condition(which_condition, field)	170	def evaluate_condition(which_condition, field)
171	condition = configuration[which_condition]	171	condition = configuration[which_condition]
172	case condition	172	case condition
	@@ -127,7 +127,7 @@ module ActsAsSolr #:nodoc:		@@ -127,7 +127,7 @@ module ActsAsSolr #:nodoc:
127	classes = [self] + (self.subclasses \|\| []) + (options[:models] \|\| [])	127	classes = [self] + (self.subclasses \|\| []) + (options[:models] \|\| [])
128	classes.map do \|klass\|	128	classes.map do \|klass\|
129	next if klass.name.empty?	129	next if klass.name.empty?
130	- "#{solr_configuration[:type_field]}:\"#{klass.name}\""	130	+ "#{solr_configuration[:type_field]}:\"#{Solr::Util.query_parser_escape klass.name}\""
131	end.compact.join(' OR ')	131	end.compact.join(' OR ')
132	end	132	end
133		133