acts_as_ferret 0.5.2 → 0.5.3

data/lib/acts_as_ferret/blank_slate.rb

@@ -1,12 +1,20 @@
 module ActsAsFerret
-  if defined?(BasicObject)
+  
+  if defined?(ActiveSupport::BasicObject)
+    # Rails 2.3, 3.x
+    class BlankSlate < ActiveSupport::BasicObject
+    end
+    
+  elsif defined?(::BasicObject)
     # Ruby 1.9.x
     class BlankSlate < BasicObject
     end
-  elsif defined?(BlankSlate)
-    # Rails 2.x has it already
+    
+  elsif defined?(::BlankSlate)
+    # former 2.x rails versions (?)
     class BlankSlate < ::BlankSlate
     end
+    
   else
     # 'backported' for Rails pre 2.0
     #
@@ -37,13 +45,6 @@ module ActsAsFerret
           end
         end
 
-        # Redefine a previously hidden method so that it may be called on a blank
-        # slate object.
-        #
-        # no-op here since we don't hide the methods we reveal where this is
-        # used in this implementation
-        def reveal(name)
-        end
       end
 
       instance_methods.each { |m| hide(m) }

data/lib/acts_as_ferret/class_methods.rb

@@ -65,7 +65,7 @@ module ActsAsFerret
         logger.warn "#{self.name}: Override records_modified_since(time) to keep the index up to date with records changed during rebuild."
         []
       else
-        find :all, :conditions => [ condition.join(' AND '), *([time]*condition.size) ]
+        where([ condition.join(' AND '), *([time]*condition.size) ]).all
       end
     end
 
@@ -74,14 +74,14 @@ module ActsAsFerret
       transaction do
         if use_fast_batches?
           offset = 0
-          while (rows = find :all, :conditions => [ "#{table_name}.id > ?", offset ], :limit => batch_size).any?
+          while (rows = where([ "#{table_name}.id > ?", offset ]).limit(batch_size).all).any?
             offset = rows.last.id
             yield rows, offset
           end
         else
           order = "#{primary_key} ASC" # fixes #212
           0.step(self.count, batch_size) do |offset|
-            yield find( :all, :limit => batch_size, :offset => offset, :order => order ), offset
+            yield scoped.limit(batch_size).offset(offset).order(order).all, offset
           end
         end
       end
@@ -92,9 +92,9 @@ module ActsAsFerret
       transaction do
         offset = 0
         ids.each_slice(batch_size) do |id_slice|
-          records = find( :all, :conditions => ["id in (?)", id_slice] )
+          records = where(:id => id_slice).all
           #yield records, offset
-          yield find( :all, :conditions => ["id in (?)", id_slice] ), offset
+          yield where(:id => id_slice).all, offset
           offset += batch_size
         end
       end
@@ -146,8 +146,10 @@ module ActsAsFerret
     # +page+ and +per_page+ are supposed to work regardless of any 
     # +conditions+ present in +find_options+.
     def find_with_ferret(q, options = {}, find_options = {})
-      if respond_to?(:scope) && scope(:find, :conditions)
-        find_options[:conditions] ||= '1=1' # treat external scope the same as if :conditions present (i.e. when it comes to counting results)
+      if self.scoped.to_sql =~ /WHERE/ && self.scoped.where_values_hash.empty?
+        # Treat external scope the same as if :conditions present 
+        # (i.e. when it comes to counting results). 
+        find_options[:conditions] ||= '1=1'
       end
       return ActsAsFerret::find q, self, options, find_options
     end 

data/lib/acts_as_ferret/ferret_find_methods.rb

@@ -108,7 +108,11 @@ module ActsAsFerret
 
       q = process_query(query, options)
       q = scope_query_to_models q, options[:models] #if shared?
-      logger.debug "query: #{query}\n-->#{q}"
+      
+      # Force q to be encoded as UTF-8 to avoid barfing when unicode passed in.
+      # Was not an issue pre ruby 1.9.x force_encoding method is only available in ruby 1.9.x
+      q_to_s = q.to_s.respond_to?('force_encoding') ? q.to_s.force_encoding('UTF-8') : q
+      logger.debug "query: #{query}\n-->#{q_to_s}"
       s = searcher
       total_hits = s.search_each(q, options) do |hit, score|
         doc = s[hit]

data/lib/acts_as_ferret/ferret_result.rb

@@ -12,7 +12,6 @@ module ActsAsFerret
   class FerretResult < ActsAsFerret::BlankSlate
     include ResultAttributes
     attr_accessor :id
-    reveal :methods
 
     def initialize(model, id, score, rank, data = {})
       @model = model.constantize
@@ -24,7 +23,7 @@ module ActsAsFerret
     end
 
     def inspect
-      "#<FerretResult wrapper for #{@model} with id #{@id}"
+      "#<FerretResult wrapper for #{@model} with id #{@id}>"
     end
 
     def method_missing(method, *args, &block)
@@ -36,7 +35,10 @@ module ActsAsFerret
     end
 
     def respond_to?(name)
-      methods.include?(name.to_s) || @data.has_key?(name.to_sym) || to_record.respond_to?(name)
+      [ :ferret_score, :ferret_rank,
+        :inspect, :method_missing, :respond_to?, :to_record, :to_param, :id
+      ].include?(name) ||
+        @data.has_key?(name.to_sym) || to_record.respond_to?(name)
     end
 
     def to_record
@@ -45,9 +47,14 @@ module ActsAsFerret
         @ar_record.ferret_rank  = ferret_rank
         @ar_record.ferret_score = ferret_score
         # don't try to fetch attributes from RDig based records
-        @use_record = !@ar_record.class.included_modules.include?(ActsAsFerret::RdigAdapter)
+        @use_record = !@ar_record.class.included_modules.include?(::ActsAsFerret::RdigAdapter)
       end
       @ar_record
     end
+    
+    def to_param
+      return @id
+    end
+    
   end
 end

data/lib/acts_as_ferret/multi_index.rb

@@ -12,8 +12,15 @@ module ActsAsFerret #:nodoc:
       default_fields = indexes.inject([]) do |fields, idx| 
         fields + [ idx.index_definition[:ferret][:default_field] ]
       end.flatten.uniq
+      # Patch to pass an or_default setting on to ferret.
+      # Without an or_default set, ferret will use OR queries by default.
+      # This implementation will use OR if any model asks for OR, otherwise 
+      # AND. -- Paul Fitzpatrick, 11/1/2010 (contributed to public domain)
+      or_default = 
+        indexes.select{|idx| idx.index_definition[:ferret][:or_default]}.size>0
       @options = {
-        :default_field => default_fields
+        :default_field => default_fields,
+        :or_default => or_default
       }.update(options)
       @logger = IndexLogger.new(ActsAsFerret::logger, "multi: #{indexes.map(&:index_name).join(',')}")
     end

data/lib/acts_as_ferret/search_results.rb

@@ -3,7 +3,6 @@ module ActsAsFerret
   # decorator that adds a total_hits accessor and will_paginate compatible 
   # paging support to search result arrays
   class SearchResults < ActsAsFerret::BlankSlate
-    reveal :methods
     attr_reader :current_page, :per_page, :total_hits, :total_pages
     alias total_entries total_hits  # will_paginate compatibility
     alias page_count total_pages    # will_paginate backwards compatibility

data/lib/acts_as_ferret/version.rb

@@ -1,3 +1,3 @@
 module ActsAsFerret
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_ferret
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Jens Kraemer
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +02:00
+date: 2011-09-08 00:00:00 +02:00
 default_executable: aaf_install
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jk-ferret
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 35
         segments: 
         - 0
         - 11
@@ -38,11 +35,9 @@ dependencies:
   name: rails
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -63,12 +58,14 @@ files:
 - LICENSE
 - bin/aaf_install
 - config/ferret_server.yml
+- doc/demo/Gemfile
 - doc/demo/README
 - doc/demo/README_DEMO
 - doc/demo/Rakefile
 - doc/demo/app/controllers/admin/backend_controller.rb
 - doc/demo/app/controllers/admin_area_controller.rb
 - doc/demo/app/controllers/application.rb
+- doc/demo/app/controllers/application_controller.rb
 - doc/demo/app/controllers/contents_controller.rb
 - doc/demo/app/controllers/searches_controller.rb
 - doc/demo/app/helpers/admin/backend_helper.rb
@@ -92,6 +89,7 @@ files:
 - doc/demo/app/views/layouts/application.html.erb
 - doc/demo/app/views/searches/_content.html.erb
 - doc/demo/app/views/searches/search.html.erb
+- doc/demo/config/application.rb
 - doc/demo/config/boot.rb
 - doc/demo/config/database.yml
 - doc/demo/config/environment.rb
@@ -99,8 +97,15 @@ files:
 - doc/demo/config/environments/production.rb
 - doc/demo/config/environments/test.rb
 - doc/demo/config/ferret_server.yml
+- doc/demo/config/initializers/backtrace_silencers.rb
+- doc/demo/config/initializers/inflections.rb
+- doc/demo/config/initializers/mime_types.rb
+- doc/demo/config/initializers/secret_token.rb
+- doc/demo/config/initializers/session_store.rb
 - doc/demo/config/lighttpd.conf
+- doc/demo/config/locales/en.yml
 - doc/demo/config/routes.rb
+- doc/demo/config.ru
 - doc/demo/db/development_structure.sql
 - doc/demo/db/migrate/001_initial_migration.rb
 - doc/demo/db/migrate/002_add_type_to_contents.rb
@@ -113,6 +118,7 @@ files:
 - doc/demo/doc/README_FOR_APP
 - doc/demo/doc/howto.txt
 - doc/demo/public/404.html
+- doc/demo/public/422.html
 - doc/demo/public/500.html
 - doc/demo/public/dispatch.cgi
 - doc/demo/public/dispatch.fcgi
@@ -120,6 +126,12 @@ files:
 - doc/demo/public/favicon.ico
 - doc/demo/public/images/rails.png
 - doc/demo/public/index.html
+- doc/demo/public/javascripts/application.js
+- doc/demo/public/javascripts/controls.js
+- doc/demo/public/javascripts/dragdrop.js
+- doc/demo/public/javascripts/effects.js
+- doc/demo/public/javascripts/prototype.js
+- doc/demo/public/javascripts/rails.js
 - doc/demo/public/robots.txt
 - doc/demo/public/stylesheets/scaffold.css
 - doc/demo/script/about
@@ -135,16 +147,17 @@ files:
 - doc/demo/script/process/reaper
 - doc/demo/script/process/spawner
 - doc/demo/script/process/spinner
+- doc/demo/script/rails
 - doc/demo/script/runner
 - doc/demo/script/server
 - doc/demo/test/fixtures/comments.yml
 - doc/demo/test/fixtures/contents.yml
-- doc/demo/test/fixtures/remote_contents.yml
 - doc/demo/test/fixtures/shared_index1s.yml
 - doc/demo/test/fixtures/shared_index2s.yml
 - doc/demo/test/functional/admin/backend_controller_test.rb
 - doc/demo/test/functional/contents_controller_test.rb
 - doc/demo/test/functional/searches_controller_test.rb
+- doc/demo/test/performance/browsing_test.rb
 - doc/demo/test/smoke/drb_smoke_test.rb
 - doc/demo/test/smoke/process_stats.rb
 - doc/demo/test/test_helper.rb
@@ -157,36 +170,6 @@ files:
 - doc/demo/test/unit/shared_index2_test.rb
 - doc/demo/test/unit/sort_test.rb
 - doc/demo/test/unit/special_content_test.rb
-- doc/demo/vendor/plugins/will_paginate/LICENSE
-- doc/demo/vendor/plugins/will_paginate/README
-- doc/demo/vendor/plugins/will_paginate/Rakefile
-- doc/demo/vendor/plugins/will_paginate/init.rb
-- doc/demo/vendor/plugins/will_paginate/lib/will_paginate/collection.rb
-- doc/demo/vendor/plugins/will_paginate/lib/will_paginate/core_ext.rb
-- doc/demo/vendor/plugins/will_paginate/lib/will_paginate/finder.rb
-- doc/demo/vendor/plugins/will_paginate/lib/will_paginate/view_helpers.rb
-- doc/demo/vendor/plugins/will_paginate/test/array_pagination_test.rb
-- doc/demo/vendor/plugins/will_paginate/test/boot.rb
-- doc/demo/vendor/plugins/will_paginate/test/console
-- doc/demo/vendor/plugins/will_paginate/test/finder_test.rb
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/admin.rb
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/companies.yml
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/company.rb
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/developer.rb
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/developers_projects.yml
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/project.rb
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/projects.yml
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/replies.yml
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/reply.rb
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/schema.sql
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/topic.rb
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/topics.yml
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/user.rb
-- doc/demo/vendor/plugins/will_paginate/test/fixtures/users.yml
-- doc/demo/vendor/plugins/will_paginate/test/helper.rb
-- doc/demo/vendor/plugins/will_paginate/test/lib/activerecord_test_connector.rb
-- doc/demo/vendor/plugins/will_paginate/test/lib/load_fixtures.rb
-- doc/demo/vendor/plugins/will_paginate/test/pagination_test.rb
 - doc/monit-example
 - recipes/aaf_recipes.rb
 - script/ferret_server
@@ -229,29 +212,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: acts_as_ferret
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: acts_as_ferret - Ferret based full text search for any ActiveRecord model

data/doc/demo/test/fixtures/remote_contents.yml

@@ -1,9 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-first:
-  id: 1
-  title: title of item one
-  content: content of item one
-another:
-  id: 2
-  title: title of item two
-  content: content of item two

data/doc/demo/vendor/plugins/will_paginate/LICENSE

@@ -1,18 +0,0 @@
-Copyright (c) 2007 PJ Hyett and Mislav Marohnić
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of 
-the Software, and to permit persons to whom the Software is furnished to do so, 
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS 
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR 
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/doc/demo/vendor/plugins/will_paginate/README

@@ -1,108 +0,0 @@
-= WillPaginate
-
-Quick quiz: Where does pagination logic belong?
-
-  a) in the model;
-  b) in the controller;
-  c) in views;
-  d) all of the above.
-
-We think you know the answer (if you think hard enough).
-
-This plugin makes magic happen. You *will* paginate!
-
-
-== Example usage:
-
-Use a paginate finder in the controller:
-
-    @posts = Post.paginate_by_board_id @board.id, :page => params[:page]
-
-Yeah, +paginate+ works just like +find+ -- it just doesn't fetch all the records.
-Just don't forget to tell it which page you want!
-
-Render the posts in your view like you would normally do. When you need to render
-pagination, just stick this in:
-
-    <%= will_paginate @posts %>
-
-You're done. (Copy and paste the example fancy CSS styles from the bottom.)
-
-How does it know how much items to fetch per page? It asks your model by calling
-+Post.per_page+. You can define it like this:
-
-    class Post < ActiveRecord::Base
-      cattr_reader :per_page
-      @@per_page = 50
-    end
-
-... or like this:
-
-    class Post < ActiveRecord::Base
-      def self.per_page
-        50
-      end
-    end
-
-... or don't worry about it at all. (WillPaginate defines it to be 30 if missing.)
-You can also specify the count explicitly when calling +paginate+:
-
-    @posts = Post.paginate :page => params[:page], :per_page => 50
-
-The +paginate+ finder wraps the original finder and returns your resultset that now has
-some new properties. You can use the collection as you would with any ActiveRecord
-resultset, but WillPaginate view helpers also need that object to be able to render pagination:
-
-    <ol>
-      <% for post in @posts -%>
-        <li>Render `post` in some nice way.</li>
-      <% end -%>
-    </ol>
-
-    <p>Now let's render us some pagination!</p>
-    <%= will_paginate @posts %>
-
-
-== Authors, credits
-
-  Ruby port by:           PJ Hyett, Mislav Marohnić (Sulien)
-  Contributors:           K. Adam Christensen, Chris Wanstrath, Dr. Nic Williams
-  Original announcement:  http://errtheblog.com/post/929 
-  Original PHP source:    http://www.strangerstudios.com/sandbox/pagination/diggstyle.php
-
-REPORT BUGS on Lighthouse: http://err.lighthouseapp.com/projects/466-plugins/overview
-
-
-== Want Digg style?
-
-Copy the following css into your stylesheet for a good start:
-
-  .pagination {
-    padding: 3px;
-    margin: 3px;
-  }
-  .pagination a {
-    padding: 2px 5px 2px 5px;
-    margin: 2px;
-    border: 1px solid #aaaadd;
-    text-decoration: none;
-    color: #000099;
-  }
-  .pagination a:hover, .pagination a:active {
-    border: 1px solid #000099;
-    color: #000;
-  }
-  .pagination span.current {
-    padding: 2px 5px 2px 5px;
-    margin: 2px;
-    border: 1px solid #000099;
-    font-weight: bold;
-    background-color: #000099;
-    color: #FFF;
-  }
-  .pagination span.disabled {
-    padding: 2px 5px 2px 5px;
-    margin: 2px;
-    border: 1px solid #eee;
-    color: #ddd;
-  }