acts_as_ferret 0.5.2 → 0.5.3

data/doc/demo/public/javascripts/rails.js

@@ -0,0 +1,191 @@
+(function() {
+  // Technique from Juriy Zaytsev
+  // http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
+  function isEventSupported(eventName) {
+    var el = document.createElement('div');
+    eventName = 'on' + eventName;
+    var isSupported = (eventName in el);
+    if (!isSupported) {
+      el.setAttribute(eventName, 'return;');
+      isSupported = typeof el[eventName] == 'function';
+    }
+    el = null;
+    return isSupported;
+  }
+
+  function isForm(element) {
+    return Object.isElement(element) && element.nodeName.toUpperCase() == 'FORM'
+  }
+
+  function isInput(element) {
+    if (Object.isElement(element)) {
+      var name = element.nodeName.toUpperCase()
+      return name == 'INPUT' || name == 'SELECT' || name == 'TEXTAREA'
+    }
+    else return false
+  }
+
+  var submitBubbles = isEventSupported('submit'),
+      changeBubbles = isEventSupported('change')
+
+  if (!submitBubbles || !changeBubbles) {
+    // augment the Event.Handler class to observe custom events when needed
+    Event.Handler.prototype.initialize = Event.Handler.prototype.initialize.wrap(
+      function(init, element, eventName, selector, callback) {
+        init(element, eventName, selector, callback)
+        // is the handler being attached to an element that doesn't support this event?
+        if ( (!submitBubbles && this.eventName == 'submit' && !isForm(this.element)) ||
+             (!changeBubbles && this.eventName == 'change' && !isInput(this.element)) ) {
+          // "submit" => "emulated:submit"
+          this.eventName = 'emulated:' + this.eventName
+        }
+      }
+    )
+  }
+
+  if (!submitBubbles) {
+    // discover forms on the page by observing focus events which always bubble
+    document.on('focusin', 'form', function(focusEvent, form) {
+      // special handler for the real "submit" event (one-time operation)
+      if (!form.retrieve('emulated:submit')) {
+        form.on('submit', function(submitEvent) {
+          var emulated = form.fire('emulated:submit', submitEvent, true)
+          // if custom event received preventDefault, cancel the real one too
+          if (emulated.returnValue === false) submitEvent.preventDefault()
+        })
+        form.store('emulated:submit', true)
+      }
+    })
+  }
+
+  if (!changeBubbles) {
+    // discover form inputs on the page
+    document.on('focusin', 'input, select, texarea', function(focusEvent, input) {
+      // special handler for real "change" events
+      if (!input.retrieve('emulated:change')) {
+        input.on('change', function(changeEvent) {
+          input.fire('emulated:change', changeEvent, true)
+        })
+        input.store('emulated:change', true)
+      }
+    })
+  }
+
+  function handleRemote(element) {
+    var method, url, params;
+
+    var event = element.fire("ajax:before");
+    if (event.stopped) return false;
+
+    if (element.tagName.toLowerCase() === 'form') {
+      method = element.readAttribute('method') || 'post';
+      url    = element.readAttribute('action');
+      params = element.serialize();
+    } else {
+      method = element.readAttribute('data-method') || 'get';
+      url    = element.readAttribute('href');
+      params = {};
+    }
+
+    new Ajax.Request(url, {
+      method: method,
+      parameters: params,
+      evalScripts: true,
+
+      onComplete:    function(request) { element.fire("ajax:complete", request); },
+      onSuccess:     function(request) { element.fire("ajax:success",  request); },
+      onFailure:     function(request) { element.fire("ajax:failure",  request); }
+    });
+
+    element.fire("ajax:after");
+  }
+
+  function handleMethod(element) {
+    var method = element.readAttribute('data-method'),
+        url = element.readAttribute('href'),
+        csrf_param = $$('meta[name=csrf-param]')[0],
+        csrf_token = $$('meta[name=csrf-token]')[0];
+
+    var form = new Element('form', { method: "POST", action: url, style: "display: none;" });
+    element.parentNode.insert(form);
+
+    if (method !== 'post') {
+      var field = new Element('input', { type: 'hidden', name: '_method', value: method });
+      form.insert(field);
+    }
+
+    if (csrf_param) {
+      var param = csrf_param.readAttribute('content'),
+          token = csrf_token.readAttribute('content'),
+          field = new Element('input', { type: 'hidden', name: param, value: token });
+      form.insert(field);
+    }
+
+    form.submit();
+  }
+
+
+  document.on("click", "*[data-confirm]", function(event, element) {
+    var message = element.readAttribute('data-confirm');
+    if (!confirm(message)) event.stop();
+  });
+
+  document.on("click", "a[data-remote]", function(event, element) {
+    if (event.stopped) return;
+    handleRemote(element);
+    event.stop();
+  });
+
+  document.on("click", "a[data-method]", function(event, element) {
+    if (event.stopped) return;
+    handleMethod(element);
+    event.stop();
+  });
+
+  document.on("submit", function(event) {
+    var element = event.findElement(),
+        message = element.readAttribute('data-confirm');
+    if (message && !confirm(message)) {
+      event.stop();
+      return false;
+    }
+
+    var inputs = element.select("input[type=submit][data-disable-with]");
+    inputs.each(function(input) {
+      input.disabled = true;
+      input.writeAttribute('data-original-value', input.value);
+      input.value = input.readAttribute('data-disable-with');
+    });
+
+    var element = event.findElement("form[data-remote]");
+    if (element) {
+      handleRemote(element);
+      event.stop();
+    }
+  });
+
+  document.on("ajax:after", "form", function(event, element) {
+    var inputs = element.select("input[type=submit][disabled=true][data-disable-with]");
+    inputs.each(function(input) {
+      input.value = input.readAttribute('data-original-value');
+      input.removeAttribute('data-original-value');
+      input.disabled = false;
+    });
+  });
+
+  Ajax.Responders.register({
+    onCreate: function(request) {
+      var csrf_meta_tag = $$('meta[name=csrf-token]')[0];
+
+      if (csrf_meta_tag) {
+        var header = 'X-CSRF-Token',
+            token = csrf_meta_tag.readAttribute('content');
+
+        if (!request.options.requestHeaders) {
+          request.options.requestHeaders = {};
+        }
+        request.options.requestHeaders[header] = token;
+      }
+    }
+  });
+})();

data/doc/demo/public/robots.txt

@@ -1 +1,5 @@
-# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-Agent: *
+# Disallow: /

data/doc/demo/script/rails

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
+require 'rails/commands'

data/doc/demo/test/functional/admin/backend_controller_test.rb

@@ -4,7 +4,7 @@ require 'admin/backend_controller'
 # Re-raise errors caught by the controller.
 class Admin::BackendController; def rescue_action(e) raise e end; end
 
-class Admin::BackendControllerTest < Test::Unit::TestCase
+class Admin::BackendControllerTest < ActionController::TestCase
   def setup
     @controller = Admin::BackendController.new
     @request    = ActionController::TestRequest.new

data/doc/demo/test/functional/contents_controller_test.rb

@@ -4,8 +4,7 @@ require 'contents_controller'
 # Re-raise errors caught by the controller.
 class ContentsController; def rescue_action(e) raise e end; end
 
-class ContentsControllerTest < Test::Unit::TestCase
-  fixtures :contents
+class ContentsControllerTest < ActionController::TestCase
 
   def setup
     @controller = ContentsController.new

data/doc/demo/test/functional/searches_controller_test.rb

@@ -4,8 +4,7 @@ require 'searches_controller'
 # Re-raise errors caught by the controller.
 class SearchesController; def rescue_action(e) raise e end; end
 
-class SearchesControllerTest < Test::Unit::TestCase
-  fixtures :contents
+class SearchesControllerTest < ActionController::TestCase
 
   def setup
     @controller = SearchesController.new

data/doc/demo/test/performance/browsing_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+# Profiling results for each test method are written to tmp/performance.
+class BrowsingTest < ActionDispatch::PerformanceTest
+  def test_homepage
+    get '/'
+  end
+end

data/doc/demo/test/test_helper.rb

@@ -1,30 +1,25 @@
 ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
 
-class Test::Unit::TestCase
-  # Transactional fixtures accelerate your tests by wrapping each test method
-  # in a transaction that's rolled back on completion.  This ensures that the
-  # test database remains unchanged so your fixtures don't have to be reloaded
-  # between every test method.  Fewer database queries means faster tests.
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
   #
-  # Read Mike Clark's excellent walkthrough at
-  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
-  #
-  # Every Active Record database supports transactions except MyISAM tables
-  # in MySQL.  Turn off transactional fixtures in this case; however, if you
-  # don't care one way or the other, switching from MyISAM to InnoDB tables
-  # is recommended.
-  #self.use_transactional_fixtures = true
-  self.use_transactional_fixtures = false
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # The only drawback to using transactional fixtures is when you actually 
+  # need to test transactions.  Since your test is bracketed by a transaction,
+  # any transactions started in your code will be automatically rolled back.
+  use_transactional_fixtures = false
 
   # Instantiated fixtures are slow, but give you @david where otherwise you
   # would need people(:david).  If you don't want to migrate your existing
   # test cases which use the @david style and don't mind the speed hit (each
   # instantiated fixtures translates to a database query per test method),
   # then set this back to true.
-  self.use_instantiated_fixtures  = false
+  use_instantiated_fixtures  = false
 
   # Add more helper methods to be used by all tests here...
 end
-

data/doc/demo/test/unit/comment_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
-class CommentTest < Test::Unit::TestCase
-  fixtures :comments
+
+class CommentTest < ActiveSupport::TestCase
 
   def setup
     Comment.rebuild_index
@@ -34,7 +34,7 @@ class CommentTest < Test::Unit::TestCase
   end
 
   def test_class_index_dir
-    assert Comment.aaf_configuration[:index_dir] =~ %r{^#{RAILS_ROOT}/index/test/comment}
+    assert Comment.aaf_configuration[:index_dir] =~ %r{^./index/test/comment}
   end
 
   def test_aliased_field

data/doc/demo/test/unit/content_test.rb

@@ -1,11 +1,12 @@
-require File.dirname(__FILE__) + '/../test_helper'
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 require 'pp'
 require 'fileutils'
 
-class ContentTest < Test::Unit::TestCase
+
+class ContentTest < ActiveSupport::TestCase
   include Ferret::Index
   include Ferret::Search
-  fixtures :contents, :comments
 
   def setup
     #make sure the fixtures are in the index
@@ -299,7 +300,7 @@ class ContentTest < Test::Unit::TestCase
   end
 
   def test_class_index_dir
-    assert Content.aaf_configuration[:index_dir] =~ %r{^#{RAILS_ROOT}/index/test/content_base}
+    assert Content.aaf_configuration[:index_dir] =~ %r{./index/test/content_base}
   end
   
   def test_update
@@ -554,6 +555,7 @@ class ContentTest < Test::Unit::TestCase
 
     r = Content.find_with_ferret 'title', { :limit => 10, :offset => 0 }, 
                                           { :conditions => "description != '0'", :order => 'title ASC' }
+                
     assert_equal 29, r.total_hits
     assert_equal 10, r.size
     assert_equal "1", r.first.description

data/doc/demo/test/unit/ferret_result_test.rb

@@ -1,9 +1,8 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 require 'pp'
 require 'fileutils'
 
-class FerretResultTest < Test::Unit::TestCase
-  fixtures :contents
+class FerretResultTest < ActiveSupport::TestCase
 
   def teardown
   end

data/doc/demo/test/unit/multi_index_test.rb

@@ -1,11 +1,10 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 require 'pp'
 require 'fileutils'
 
-class MultiIndexTest < Test::Unit::TestCase
+class MultiIndexTest < ActiveSupport::TestCase
   include Ferret::Index
   include Ferret::Search
-  fixtures :contents, :comments
 
   def setup
     #make sure the fixtures are in the index

data/doc/demo/test/unit/remote_index_test.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
-class RemoteIndexTest < Test::Unit::TestCase
+class RemoteIndexTest < ActiveSupport::TestCase
   def setup
     ActsAsFerret::remote = 'druby://localhost:9999'
   end

data/doc/demo/test/unit/shared_index1_test.rb

@@ -1,7 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
-class SharedIndex1Test < Test::Unit::TestCase
-  fixtures :shared_index1s, :shared_index2s
+class SharedIndex1Test < ActiveSupport::TestCase
 
   def setup
     SharedIndex1.rebuild_index

data/doc/demo/test/unit/shared_index2_test.rb

@@ -1,7 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
-class SharedIndex2Test < Test::Unit::TestCase
-  fixtures :shared_index2s, :shared_index1s
+class SharedIndex2Test < ActiveSupport::TestCase
 
   def setup
     SharedIndex1.rebuild_index

data/doc/demo/test/unit/sort_test.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
-class SortTest < Test::Unit::TestCase
+class SortTest < ActiveSupport::TestCase
   include Ferret::Search
 
   def test_sort_marshalling

data/doc/demo/test/unit/special_content_test.rb

@@ -1,9 +1,8 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../test_helper'
 
-class SpecialContentTest < Test::Unit::TestCase
+class SpecialContentTest < ActiveSupport::TestCase
   include Ferret::Index
   include Ferret::Search
-  fixtures :contents, :comments
 
   def setup
     ContentBase.rebuild_index
@@ -11,7 +10,7 @@ class SpecialContentTest < Test::Unit::TestCase
   end
   
   def test_class_index_dir
-    assert SpecialContent.aaf_configuration[:index_dir] =~ %r{^#{RAILS_ROOT}/index/test/content_base}
+    assert SpecialContent.aaf_configuration[:index_dir] =~ %r{^./index/test/content_base}
   end
 
   def test_find_with_ferret

data/lib/acts_as_ferret.rb

@@ -474,8 +474,8 @@ module ActsAsFerret
       end
 
       # fetch
-      tmp_result = model_class.find(:all, find_options.merge(:conditions => conditions, 
-                                                             :include    => filtered_include_options))
+      options = find_options.merge(:conditions => conditions, :include => filtered_include_options)
+      tmp_result = model_class.where(options[:conditions]).includes(options[:include]).order(options[:order]).limit(options[:limit]).offset(options[:offset])
 
       # set scores and rank
       tmp_result.each do |record|
@@ -493,7 +493,21 @@ module ActsAsFerret
   
   # combine our conditions with those given by user, if any
   def self.combine_conditions(conditions, additional_conditions = [])
-    if additional_conditions && additional_conditions.any?
+
+    any_additional_conditions = false
+
+    if additional_conditions
+      if additional_conditions.kind_of?(Enumerable)
+        # We are pre-ruby 1.9.x
+        any_additional_conditions = additional_conditions.any?
+      else
+        # This ruby 1.9.x - String is no longer an Enumerable
+        # http://www.ivanenviroman.com/string-is-not-an-enumerable-in-ruby-1-9/
+        any_additional_conditions = ! additional_conditions.empty?
+      end
+    end
+    
+    if any_additional_conditions
       cust_opts = (Array === additional_conditions) ? additional_conditions.dup : [ additional_conditions ]
       logger.debug "cust_opts: #{cust_opts.inspect}"
       conditions.first << " and " << cust_opts.shift