muck-services 0.1.20 → 0.1.21

data/VERSION

@@ -1 +1 @@
-0.1.20
+0.1.21

data/app/controllers/muck/entries_controller.rb

@@ -78,29 +78,30 @@ class Muck::EntriesController < ApplicationController
 
   protected
 
-  def _search operator = :or
-    @page = (params[:page] || 1).to_i
-    @per_page = (params[:per_page] || 10).to_i
-    @offset = (@page-1)*@per_page
-    if !@search.nil?
-      @term_list = URI.escape(@search) 
-      results = Entry.search(@search, @grain_size, I18n.locale.to_s, @per_page, @offset, operator)
-      @hit_count = results.total
-      @results = results.results
-      @paginated_results = @results.paginate(:page => @page, :per_page => @per_page, :total_entries => @hit_count)
-      log_query(current_user.nil? ? request.remote_addr : current_user.id, Language.locale_id, @tag_filter.nil? ? 'search' : 'browse', @search, @grain_size, @hit_count)
+    def _search operator = :or
+      @page = (params[:page] || 1).to_i
+      @per_page = (params[:per_page] || 10).to_i
+      @offset = (@page-1)*@per_page
+      if !@search.nil?
+        @term_list = URI.escape(@search)
+        results = Entry.search(@search, @grain_size, I18n.locale.to_s, @per_page, @offset, operator)
+        @hit_count = results.total
+        @results = results.results
+        @paginated_results = @results.paginate(:page => @page, :per_page => @per_page, :total_entries => @hit_count)
+        log_query(current_user.nil? ? request.remote_addr : current_user.id, Language.locale_id, @tag_filter.nil? ? 'search' : 'browse', @search, @grain_size, @hit_count)
+      end
+    rescue RuntimeError, MuckServices::Exceptions::LanguageNotSupported => ex
+      @hit_count = 0
+      @results = []
+      flash[:error] = t('muck.services.search_problem') + '<p class="support-information">Information for support: <br />' + ex.to_s + '</p>'
     end
-  rescue MuckServices::Exceptions::LanguageNotSupported => ex
-    @hit_count = 0
-    @results = []
-    flash[:error] = ex.to_s
-  end
   
-  def query_logger
-    @@query_logger ||= Logger.new("#{RAILS_ROOT}/log/queries_#{Date.today}.log")
-  end
+    def query_logger
+      @@query_logger ||= Logger.new("#{RAILS_ROOT}/log/queries_#{Date.today}.log")
+    end
   
-  def log_query(user_id, locale, search_type, query, grain_size, hits)
-    query_logger.info "#{Time.new.to_i},#{user_id},#{locale},#{search_type},\"#{query.gsub(/"/, '\\\\"')}\",#{grain_size},#{hits}"
-  end
+    def log_query(user_id, locale, search_type, query, grain_size, hits)
+      query_logger.info "#{Time.new.to_i},#{user_id},#{locale},#{search_type},\"#{query.gsub(/"/, '\\\\"')}\",#{grain_size},#{hits}"
+    end
+    
 end

data/locales/en.yml

@@ -211,6 +211,7 @@ en:
       explore: "Search for {{topic}}"
       language_not_supported: The requested language is not supported
       get_recommendations: Get Recommendations
+      search_problem: "There was a problem with your search.  Please review your search criteria and try again."
       comment_entries_count:
         one: "1 Comment"
         other: "{{count}} Comments"

data/muck-services.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-services}
-  s.version = "0.1.20"
+  s.version = "0.1.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Duffin", "Justin Ball"]
-  s.date = %q{2009-12-08}
+  s.date = %q{2009-12-11}
   s.description = %q{This gem contains the rails specific code for dealing with feeds, aggregations and recommendations.  It is meant to work with the muck-raker gem.}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

data/test/rails_root/config/environment.rb

@@ -27,6 +27,8 @@ Rails::Initializer.run do |config|
   config.gem "river"
   config.gem "overlord"
   config.gem "friendly_id"
+  config.gem "sanitize"
+  config.gem "geokit"
   config.gem 'muck-engine', :lib => 'muck_engine'
   config.gem 'muck-users', :lib => 'muck_users'
   config.gem 'muck-comments', :lib => 'muck_comments'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-services
 version: !ruby/object:Gem::Version 
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors: 
 - Joel Duffin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 -07:00
+date: 2009-12-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency