acts_as_ferret 0.5.2 → 0.5.3

data/README

@@ -117,6 +117,12 @@ Please see ActsAsFerret::ActMethods#acts_as_ferret for more information.
 
 aaf is not yet ready for Rails3. Feel free to submit patches!
 
+Rails 3 :More Like this no longer works for unsaved records (test fails in 
+content_test.rb test_more_like_this_new_record)
+
+Rails 3: Sorting does not work - causes failure in sorting test & pagination test.
+
+
 == License
 
 Released under the MIT license.

data/doc/demo/Gemfile

@@ -0,0 +1,18 @@
+source 'http://rubygems.org'
+
+# Don't use latest version of rake:
+# http://stackoverflow.com/questions/6199301/global-access-to-rake-dsl-methods-is-deprecated
+
+gem 'rake', '0.8.7'
+gem 'rails', '3.0.9'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'mysql'
+
+# Until branch is merged into master, the tests will fail.
+# To get everything running use the brightchimp gem.
+gem 'acts_as_ferret'
+#gem 'acts_as_ferret', :git => 'git://github.com/brightchimp/acts_as_ferret.git'
+gem 'will_paginate', '3.0.pre2'

data/doc/demo/Rakefile

@@ -1,10 +1,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/switchtower.rake, and they will automatically be available to Rake.
-
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
+require File.expand_path('../config/application', __FILE__)
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
 
-require 'tasks/rails'
+Demo::Application.load_tasks

data/doc/demo/app/controllers/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+  protect_from_forgery
+end

data/doc/demo/app/helpers/application_helper.rb

@@ -1,3 +1,2 @@
-# Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
 end

data/doc/demo/app/views/admin/backend/search.rhtml

@@ -1,5 +1,5 @@
 <h1>Search Content (backend)</h1>
-<% form_tag :action => 'search' do %>
+<%= form_tag :action => 'search' do %>
   <fieldset>
     <legend>Search</legend>
     <input type="text" name="query" value="<%= h @query %>" />

data/doc/demo/app/views/contents/edit.rhtml

@@ -1,6 +1,6 @@
 <h1>Editing content</h1>
 
-<% form_for :content, @content, content_path(@content), :html => { :method => :put } do |f| %>
+<%= form_for @content, content_path(@content), :html => { :method => :put } do |f| %>
   <%= render :partial => 'form', :object => f %>
   <%= submit_tag 'Edit' %>
 <% end %>

data/doc/demo/app/views/contents/new.rhtml

@@ -1,6 +1,6 @@
 <h1>New content</h1>
 
-<% form_for :content, @content, :url => contents_path, :html => { :method => :post } do |f| %>
+<%= form_for @content, :url => contents_path, :html => { :method => :post } do |f| %>
   <%= render :partial => 'form', :object => f %>
   <%= submit_tag "Create" %>
 <% end %>

data/doc/demo/app/views/searches/search.html.erb

@@ -1,5 +1,5 @@
 <h1>Search</h1>
-<% form_tag search_path do %>
+<%= form_tag search_path do %>
   <fieldset>
     <legend>Search</legend>
     <%= text_field_tag 'q', @search.query %>

data/doc/demo/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run Demo::Application

data/doc/demo/config/application.rb

@@ -0,0 +1,57 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module Demo
+  class Application < Rails::Application
+    # Settings in config/environments/* take precedence over those specified here.
+    # Application configuration should go into files in config/initializers
+    # -- all .rb files in that directory are automatically loaded.
+
+    # Custom directories with classes and modules you want to be autoloadable.
+    # config.autoload_paths += %W(#{config.root}/extras)
+
+    # Only load the plugins named here, in the order given (default is alphabetical).
+    # :all can be used as a placeholder for all plugins not explicitly named.
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
+
+    # Activate observers that should always be running.
+    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+
+    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+    # config.time_zone = 'Central Time (US & Canada)'
+
+    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.default_locale = :de
+
+    # JavaScript files you want as :defaults (application.js is always included).
+    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end
+
+
+ActsAsFerret::remote = false if ENV['AAF_REMOTE'] != 'true'
+ActsAsFerret::raise_drb_errors = ENV['RAISE_DRB_ERRORS'] == 'true'
+
+
+# define the index shared by the SharedIndex1 and SharedIndex2 classes
+ActsAsFerret::define_index 'shared', :remote           => ENV['AAF_REMOTE'] == 'true',
+                                     :raise_drb_errors => ENV['RAISE_DRB_ERRORS'] == 'true',
+                                     :fields           => {
+                                       :name => { :store => :yes }
+                                     }, 
+                                     :ferret           => {
+                                       :default_field => [ :name ]
+                                     }

data/doc/demo/config/boot.rb

@@ -1,109 +1,6 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
+require 'rubygems'
 
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    def preinitialize
-      load(preinitializer_path) if File.exist?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-      Rails::Initializer.run(:install_gem_spec_stubs)
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        require 'rubygems'
-        min_version = '1.1.1'
-        unless rubygems_version >= min_version
-          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
-end
-
-# All that for this:
-Rails.boot!
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/doc/demo/config/database.yml

@@ -1,38 +1,30 @@
-# MySQL (default setup).  Versions 4.1 and 5.0 are recommended.
+# MySQL.  Versions 4.1 and 5.0 are recommended.
+#
+# Install the MySQL driver:
+#   gem install mysql2
 #
-# Get the fast C bindings:
-#   gem install mysql
-#   (on OS X: gem install mysql -- --include=/usr/local/lib)
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-#
-# mysql config
 development:
   adapter: mysql
+  encoding: utf8
+  reconnect: false
   database: aaf_dev
+  pool: 5
   username: ferret
   password: ferret
-  
+  socket: /tmp/mysql.sock
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
 test:
   adapter: mysql
+  encoding: utf8
+  reconnect: false
   database: aaf_test
+  pool: 5
   username: ferret
   password: ferret
-
-# since this is a demo, we won't need this one
-#production:
-#  adapter: mysql
-#  database: ferret_production
-#  username: root
-#  password: 
-#  socket: /var/run/mysqld/mysqld.sock
-
-# SQLITE
-#development:
-#  adapter: sqlite3
-#  dbfile: db/dev.sqlite
-
-#test:
-#  adapter: sqlite3
-#  dbfile: db/test.sqlite
+  socket: /tmp/mysql.sock
 

data/doc/demo/config/environment.rb

@@ -1,69 +1,5 @@
-# Be sure to restart your web server when you modify this file.
-
-# Uncomment below to force Rails into production mode when 
-# you don't control web/app server and can't set it the proper way
-# ENV['RAILS_ENV'] ||= 'production'
-
-# Bootstrap the Rails environment, frameworks, and default configuration
-require File.join(File.dirname(__FILE__), 'boot')
-
-Rails::Initializer.run do |config|
-  # Settings in config/environments/* take precedence those specified here
-  
-  config.action_controller.session = { :session_key => "_demo_session", :secret => "aaaaaaaaaaaaaaaabbbbbbbbbbbbbbccccccccccccccsome secret phrase" }
-  
-  # Skip frameworks you're not going to use
-  # config.frameworks -= [ :action_web_service, :action_mailer ]
-
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
-
-  # Force all environments to use the same logger level 
-  # (by default production uses :info, the others :debug)
-  # config.log_level = :debug
-
-  # Use the database for sessions instead of the file system
-  # (create the session table with 'rake create_sessions_table')
-  # config.action_controller.session_store = :active_record_store
-
-  # Enable page/fragment caching by setting a file-based store
-  # (remember to create the caching directory and make it readable to the application)
-  # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
-
-  # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector
-
-  # Make Active Record use UTC-base instead of local time
-  # config.active_record.default_timezone = :utc
-  
-  # Use Active Record's schema dumper instead of SQL when creating the test database
-  # (enables use of different database adapters for development and test environments)
-  # config.active_record.schema_format = :ruby
-
-  # See Rails::Configuration for more options
-end
-
-# Add new inflection rules using the following format 
-# (all these examples are active by default):
-# Inflector.inflections do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
-
-# Include your application configuration below
-
-ActsAsFerret::remote = false if ENV['AAF_REMOTE'] != 'true'
-ActsAsFerret::raise_drb_errors = ENV['RAISE_DRB_ERRORS'] == 'true'
-
-# define the index shared by the SharedIndex1 and SharedIndex2 classes
-ActsAsFerret::define_index 'shared', :remote           => ENV['AAF_REMOTE'] == 'true',
-                                     :raise_drb_errors => ENV['RAISE_DRB_ERRORS'] == 'true',
-                                     :fields           => {
-                                       :name => { :store => :yes }
-                                     }, 
-                                     :ferret           => {
-                                       :default_field => [ :name ]
-                                     }
+# Load the rails application
+require File.expand_path('../application', __FILE__)
 
+# Initialize the rails application
+Demo::Application.initialize!

data/doc/demo/config/environments/development.rb

@@ -1,16 +1,26 @@
-# Settings specified here will take precedence over those in config/environment.rb
+Demo::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
 
-# In the development environment your application's code is reloaded on
-# every request.  This slows down response time but is perfect for development
-# since you don't have to restart the webserver when you make code changes.
-config.cache_classes     = false
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
 
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils        = true
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
 
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+end
 
-# Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false

data/doc/demo/config/environments/production.rb

@@ -1,19 +1,49 @@
-# Settings specified here will take precedence over those in config/environment.rb
+Demo::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
 
-# The production environment is meant for finished, "live" apps.
-# Code is not reloaded between requests
-config.cache_classes = true
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
 
-# Use a different logger for distributed setups
-# config.logger        = SyslogLogger.new
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
 
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
 
-# Full error reports are disabled and caching is turned on
-config.action_controller.consider_all_requests_local = false
-config.action_controller.perform_caching             = true
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
 
-# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host                  = "http://assets.example.com"
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
 
-# Disable delivery errors if you bad email addresses should just be ignored
-# config.action_mailer.raise_delivery_errors = false
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end