dusen 0.4.10 → 0.4.11

data/README.md

@@ -6,23 +6,12 @@ Comprehensive search solution for ActiveRecord and MySQL
 
 Dusen lets you search ActiveRecord model when all you have is MySQL (no Solr, Sphinx, etc.). Here's what Dusen does for you:
 
-1. It takes a text query in Google-like syntax (e.g. `some words "a phrase" filetype:pdf`)
+1. It takes a text query in Google-like search syntax e.g. `some words "a phrase" filetype:pdf -excluded -"excluded  phrase" filetype:-txt`)
 2. It parses the query into individual tokens.
 3. It lets you define simple mappers that convert a token to an ActiveRecord scope chain. Mappers can match tokens using ActiveRecord's `where` or perform full text searches with either [LIKE queries](#processing-full-text-search-queries-with-like-queries) or [FULLTEXT indexes](#processing-full-text-queries-with-fulltext-indexes) (see [performance analysis](https://makandracards.com/makandra/12813-performance-analysis-of-mysql-s-fulltext-indexes-and-like-queries-for-full-text-search)).
 4. It gives your model a method `Model.search('some query')` that performs all of the above and returns an ActiveRecord scope chain.
 
 
-Installation
-------------
-
-In your `Gemfile` say:
-
-    gem 'dusen'
-
-Now run `bundle install` and restart your server.
-
-
-
 Processing full text search queries with LIKE queries
 -----------------------------------------------------
 
@@ -300,6 +289,22 @@ Here are some method calls to get you started:
     syntax.search(Contact, query) # => #<ActiveRecord::Relation>
 
 
+Supported Rails versions
+------------------------
+
+Dusen is tested against Rails 3.0 and Rails 3.2. There is also a branch rails-2-3, which is tested against Rails 2.3.
+
+
+Installation
+------------
+
+In your `Gemfile` say:
+
+    gem 'dusen'
+
+Now run `bundle install` and restart your server.
+
+
 Development
 -----------
 
@@ -314,7 +319,7 @@ If you would like to contribute:
 - Push your changes **with passing specs**.
 - Send me a pull request.
 
-I'm very eager to keep this gem leightweight and on topic. If you're unsure whether a change would make it into the gem, [talk to me beforehand](mailto:henning.koch@makandra.de).
+I'm very eager to keep this gem lightweight and on topic. If you're unsure whether a change would make it into the gem, [talk to me beforehand](mailto:henning.koch@makandra.de).
 
 
 Credits

data/dusen.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('activerecord')
+  s.add_dependency('activerecord', '>=3.0')
   s.add_dependency('edge_rider', '>=0.2.5')
 
 end

data/lib/dusen/parser.rb

@@ -4,7 +4,7 @@ module Dusen
   class Parser
 
     WESTERNISH_WORD_CHARACTER =  '\\w\\-\\.;@_ÄÖÜäöüß' # this is wrong on so many levels
-    TEXT_QUERY = /(?:"([^"]+)"|([#{WESTERNISH_WORD_CHARACTER}]+))/
+    TEXT_QUERY = /(?:(\-)?"([^"]+)"|(\-)?([#{WESTERNISH_WORD_CHARACTER}]+))/
     FIELD_QUERY = /(\w+)\:#{TEXT_QUERY}/
 
     def self.parse(query_string)
@@ -17,16 +17,20 @@ module Dusen
 
     def self.extract_text_query_tokens(query_string, query)
       while query_string.sub!(TEXT_QUERY, '')
-        value = "#{$1}#{$2}"
-        query << Token.new(value)
+        value = "#{$2}#{$4}"
+        exclude = "#{$1}#{$3}" == "-"
+        options = { :field => 'text', :value => value, :exclude => exclude }
+        query << Token.new(options)
       end
     end
 
     def self.extract_field_query_tokens(query_string, query)
       while query_string.sub!(FIELD_QUERY, '')
         field = $1
-        value = "#{$2}#{$3}"
-        query << Token.new(field, value)
+        value = "#{$3}#{$5}"
+        exclude = "#{$2}#{$4}" == "-"
+        options = { :field => field, :value => value, :exclude => exclude }
+        query << Token.new(options)
       end
     end
 

data/lib/dusen/query.rb

@@ -34,12 +34,29 @@ module Dusen
     end
 
     def condensed
-      texts = tokens.select(&:text?).collect(&:value)
+      include_texts = include.select(&:text?).collect(&:value)
+      exclude_texts = exclude.select(&:text?).collect(&:value)
       field_tokens = tokens.reject(&:text?)
+
       condensed_tokens = field_tokens
-      condensed_tokens << Token.new(texts) if texts.present?
+      if include_texts.present?
+        options = { :field => 'text', :value => include_texts, :exclude => false }
+        condensed_tokens << Token.new(options)
+      end
+      if exclude_texts.present?
+        options = { :field => 'text', :value => exclude_texts, :exclude => true }
+        condensed_tokens << Token.new(options)
+      end
       self.class.new(condensed_tokens)
     end
 
+    def include
+      self.class.new tokens.reject(&:exclude?)
+    end
+
+    def exclude
+      self.class.new tokens.select(&:exclude?)
+    end
+
   end
 end

data/lib/dusen/syntax.rb

@@ -17,14 +17,27 @@ module Dusen
     end
 
     def search(root_scope, query)
-      scope = root_scope
       query = parse(query) if query.is_a?(String)
       query = query.condensed
-      query.each do |token|
-        scoper = @scopers[token.field] || unknown_scoper
-        scope = scoper.call(scope, token.value)
+      matches = find_parsed_query(root_scope, query.include)
+      if query.exclude.any?
+        exclude_matches = find_parsed_query(root_scope, query.exclude)
+
+        # extract conditions that were added by exclude tokens
+        sql = exclude_matches.to_sql
+        root_pattern = /\A#{Regexp.quote root_scope.to_sql}/
+        sql =~ root_pattern or raise "Could not find ..."
+        sql = sql.sub(root_pattern, '')
+
+        # negate conditions
+        sql = sql.sub(/^\s*WHERE\s*/i, '')
+        sql = sql.sub(/^\s*AND\s*/i, '')
+        sql = "NOT COALESCE(#{sql}, 0)"
+
+        matches.scoped(:conditions => sql)
+      else
+        matches
       end
-      scope
     end
 
     def fields
@@ -51,5 +64,14 @@ module Dusen
       @unknown_scoper || DEFAULT_UNKNOWN_SCOPER
     end
 
+    def find_parsed_query(root_scope, query)
+      scope = root_scope
+      query.each do |token|
+        scoper = @scopers[token.field] || unknown_scoper
+        scope = scoper.call(scope, token.value)
+      end
+      scope
+    end
+
   end
 end

data/lib/dusen/token.rb

@@ -3,16 +3,12 @@
 module Dusen
   class Token
 
-    attr_reader :field, :value
+    attr_reader :field, :value, :exclude
 
-    def initialize(*args)
-      if args.length == 2
-        @field, @value = args
-      else
-        @field = 'text'
-        @value = args.first
-      end
-      @field = @field.to_s
+    def initialize(options)
+      @value = options.fetch(:value)
+      @exclude = options.fetch(:exclude)
+      @field = options.fetch(:field).to_s
     end
 
     def to_s
@@ -23,5 +19,9 @@ module Dusen
       field == 'text'
     end
 
+    def exclude?
+      exclude
+    end
+
   end
 end

data/lib/dusen/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dusen
-  VERSION = '0.4.10'
+  VERSION = '0.4.11'
 end

data/spec/rails-3.0/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../..
   specs:
-    dusen (0.4.9)
-      activerecord
+    dusen (0.4.10)
+      activerecord (>= 3.0)
       edge_rider (>= 0.2.5)
 
 GEM
@@ -41,7 +41,7 @@ GEM
     columnize (0.3.6)
     database_cleaner (1.0.1)
     diff-lcs (1.2.4)
-    edge_rider (0.2.5)
+    edge_rider (0.3.0)
       activerecord
     erubis (2.6.6)
       abstract (>= 1.0.0)

data/spec/rails-3.2/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../..
   specs:
-    dusen (0.4.9)
-      activerecord
+    dusen (0.4.10)
+      activerecord (>= 3.0)
       edge_rider (>= 0.2.5)
 
 GEM
@@ -41,7 +41,7 @@ GEM
     columnize (0.3.6)
     database_cleaner (1.0.1)
     diff-lcs (1.2.4)
-    edge_rider (0.2.5)
+    edge_rider (0.3.0)
       activerecord
     erubis (2.7.0)
     hike (1.2.2)

data/spec/shared/spec/dusen/active_record/base_ext_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 shared_examples_for 'model with search syntax' do
 
-  describe '.search' do
+  describe '#search' do
 
     it 'should find records by given words' do
       match = subject.create!(:name => 'Abraham')
@@ -78,6 +78,62 @@ shared_examples_for 'model with search syntax' do
       subject.search('Baden-Baden').to_a.should == [match]
     end
 
+    context 'with excludes' do
+
+      it 'should exclude words with prefix - (minus)' do
+        match = subject.create!(:name => 'Sunny Flower')
+        no_match = subject.create!(:name => 'Sunny Power')
+        no_match2 = subject.create!(:name => 'Absolutly no match')
+        subject.search('Sunny -Power').to_a.should == [match]
+      end
+
+      it 'should exclude phrases with prefix - (minus)' do
+        match = subject.create!(:name => 'Buch Tastatur Schreibtisch')
+        no_match = subject.create!(:name => 'Buch Schreibtisch Tastatur')
+        no_match2 = subject.create!(:name => 'Absolutly no match')
+        subject.search('Buch -"Schreibtisch Tastatur"').to_a.should == [match]
+      end
+
+      it 'should exclude qualified fields with prefix - (minus)' do
+        match = subject.create!(:name => 'Abraham', :city => 'Foohausen')
+        no_match = subject.create!(:name => 'Abraham', :city => 'Barhausen')
+        no_match2 = subject.create!(:name => 'Absolutly no match')
+        subject.search('Abraham city:-Barhausen').to_a.should == [match]
+      end
+
+      it 'should work if the query only contains excluded words' do
+        match = subject.create!(:name => 'Sunny Flower')
+        no_match = subject.create!(:name => 'Sunny Power')
+        subject.search('-Power').to_a.should == [match]
+      end
+
+      it 'should work if the query only contains excluded phrases' do
+        match = subject.create!(:name => 'Buch Tastatur Schreibtisch')
+        no_match = subject.create!(:name => 'Buch Schreibtisch Tastatur')
+        subject.search('-"Schreibtisch Tastatur"').to_a.should == [match]
+      end
+
+      it 'should work if the query only contains excluded qualified fields' do
+        match = subject.create!(:name => 'Abraham', :city => 'Foohausen')
+        no_match = subject.create!(:name => 'Abraham', :city => 'Barhausen')
+        subject.search('city:-Barhausen').to_a.should == [match]
+      end
+
+      it 'respects an existing scope chain when there are only excluded tokens (bugfix)' do
+        match = subject.create!(:name => 'Abraham', :city => 'Foohausen')
+        no_match = subject.create!(:name => 'Abraham', :city => 'Barhausen')
+        subject.scoped(:conditions => { :name => 'Abraham' }).search('-Barhausen').to_a.should == [match]
+      end
+
+      it 'should work if there are fields contained in the search that are NULL (needs NOT COALESCE in syntax#search)' do
+        match = subject.create!(:name => 'Sunny Flower', :city => nil, :email => nil)
+        no_match = subject.create!(:name => 'Sunny Power', :city => nil, :email => nil)
+        no_match2 = subject.create!(:name => 'Absolutly no match')
+        subject.search('Sunny -Power').to_a.should == [match]
+      end
+
+    end
+
     context 'when the given query is blank' do
 
       it 'returns all records' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dusen
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-05-05 00:00:00 +02:00
+date: 2015-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,10 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 3
         - 0
-        version: "0"
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -84,19 +85,6 @@ files:
 - lib/dusen/token.rb
 - lib/dusen/util.rb
 - lib/dusen/version.rb
-- spec/rails-2.3/Gemfile
-- spec/rails-2.3/Gemfile.lock
-- spec/rails-2.3/Rakefile
-- spec/rails-2.3/app_root/config/boot.rb
-- spec/rails-2.3/app_root/config/environment.rb
-- spec/rails-2.3/app_root/config/environments/test.rb
-- spec/rails-2.3/app_root/config/initializers/fix_missing_source_file.rb
-- spec/rails-2.3/app_root/config/preinitializer.rb
-- spec/rails-2.3/app_root/config/routes.rb
-- spec/rails-2.3/app_root/log/.gitignore
-- spec/rails-2.3/rcov.opts
-- spec/rails-2.3/spec.opts
-- spec/rails-2.3/spec/spec_helper.rb
 - spec/rails-3.0/.rspec
 - spec/rails-3.0/Gemfile
 - spec/rails-3.0/Gemfile.lock

data/spec/rails-2.3/Gemfile

@@ -1,13 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~>2.3'
-gem 'rspec', '~>1.3'
-gem 'rspec-rails', '~>1.3'
-gem 'mysql2', '~>0.2.0'
-gem 'ruby-debug', :platforms => :ruby_18
-gem 'test-unit', '~>1.2', :platforms => :ruby_19
-gem 'hoe', '=2.8.0', :platforms => :ruby_19
-gem 'database_cleaner'
-gem 'andand'
-
-gem 'dusen', :path => '../..'

data/spec/rails-2.3/Gemfile.lock

@@ -1,66 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    dusen (0.4.9)
-      activerecord
-      edge_rider (>= 0.2.5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (2.3.18)
-      actionpack (= 2.3.18)
-    actionpack (2.3.18)
-      activesupport (= 2.3.18)
-      rack (~> 1.1.0)
-    activerecord (2.3.18)
-      activesupport (= 2.3.18)
-    activeresource (2.3.18)
-      activesupport (= 2.3.18)
-    activesupport (2.3.18)
-    andand (1.3.3)
-    columnize (0.3.6)
-    database_cleaner (1.0.1)
-    edge_rider (0.2.5)
-      activerecord
-    hoe (2.8.0)
-      rake (>= 0.8.7)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    mysql2 (0.2.18)
-    rack (1.1.6)
-    rails (2.3.18)
-      actionmailer (= 2.3.18)
-      actionpack (= 2.3.18)
-      activerecord (= 2.3.18)
-      activeresource (= 2.3.18)
-      activesupport (= 2.3.18)
-      rake (>= 0.8.3)
-    rake (10.0.4)
-    rbx-require-relative (0.0.9)
-    rspec (1.3.2)
-    rspec-rails (1.3.4)
-      rack (>= 1.0.0)
-      rspec (~> 1.3.1)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    test-unit (1.2.3)
-      hoe (>= 1.5.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  andand
-  database_cleaner
-  dusen!
-  hoe (= 2.8.0)
-  mysql2 (~> 0.2.0)
-  rails (~> 2.3)
-  rspec (~> 1.3)
-  rspec-rails (~> 1.3)
-  ruby-debug
-  test-unit (~> 1.2)

data/spec/rails-2.3/Rakefile

@@ -1,11 +0,0 @@
-require 'rake'
-require 'spec/rake/spectask'
-
-desc 'Default: Run all specs for a specific rails version.'
-task :default => :spec
-
-desc "Run all specs for a specific rails version"
-Spec::Rake::SpecTask.new() do |t|
-  t.spec_opts = ['--options', "\"spec.opts\""]
-  t.spec_files = defined?(SPEC) ? SPEC : FileList['**/*_spec.rb', '../shared/spec/**/*_spec.rb']
-end

data/spec/rails-2.3/app_root/config/boot.rb

@@ -1,130 +0,0 @@
-# encoding: utf-8
-
-# Allow customization of the rails framework path
-RAILS_FRAMEWORK_ROOT = (ENV['RAILS_FRAMEWORK_ROOT'] || "#{File.dirname(__FILE__)}/../../../../../../vendor/rails") unless defined?(RAILS_FRAMEWORK_ROOT) 
-
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-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_FRAMEWORK_ROOT)
-    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_FRAMEWORK_ROOT}/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 rescue nil
-      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
-          environment_rb = "#{RAILS_ROOT}/config/environment.rb"
-          environment_rb = "#{HELPER_RAILS_ROOT}/config/environment.rb" unless File.exists?(environment_rb)
-          File.read(environment_rb)
-        end
-    end
-  end
-end
-
-class Rails::Boot
-  def run
-    load_initializer
-
-    Rails::Initializer.class_eval do
-      def load_gems
-        @bundler_loaded ||= Bundler.require :default, Rails.env
-      end
-    end
-
-    Rails::Initializer.run(:set_load_path)
-  end
-end
-
-# All that for this:
-Rails.boot!

data/spec/rails-2.3/app_root/config/environment.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-
-require File.join(File.dirname(__FILE__), 'boot')
-
-Rails::Initializer.run do |config|
-  config.cache_classes = false
-  config.whiny_nils = true
-  config.action_controller.session = { :key => "_myapp_session", :secret => "gwirofjweroijger8924rt2zfwehfuiwehb1378rifowenfoqwphf23" }
-  config.plugin_locators.unshift(
-    Class.new(Rails::Plugin::Locator) do
-      def plugins
-        [Rails::Plugin.new(File.expand_path('.'))]
-      end
-    end
-  ) unless defined?(PluginTestHelper::PluginLocator)
-end

data/spec/rails-2.3/app_root/config/initializers/fix_missing_source_file.rb

@@ -1 +0,0 @@
-MissingSourceFile::REGEXPS.push([/^cannot load such file -- (.+)$/i, 1])

data/spec/rails-2.3/app_root/config/preinitializer.rb

@@ -1,22 +0,0 @@
-# encoding: utf-8
-
-begin
-  require "rubygems"
-  require "bundler"
-rescue LoadError
-  raise "Could not load the bundler gem. Install it with `gem install bundler`."
-end
-
-if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
-  raise RuntimeError, "Your bundler version is too old for Rails 2.3." +
-   "Run `gem install bundler` to upgrade."
-end
-
-begin
-  # Set up load paths for all bundled gems
-  ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
-  Bundler.setup
-rescue Bundler::GemNotFound
-  raise RuntimeError, "Bundler couldn't find some gems." +
-    "Did you run `bundle install`?"
-end

data/spec/rails-2.3/app_root/config/routes.rb

@@ -1,15 +0,0 @@
-# encoding: utf-8
-
-ActionController::Routing::Routes.draw do |map|
-
-  map.resource :dashboard, :member => { :error => :post }
-
-  map.resources :songs
-
-  map.resources :users
-
-  map.resources :risks
-
-  map.resources :cakes, :member => { :custom_action => :get }
-
-end

data/spec/rails-2.3/app_root/log/.gitignore

@@ -1 +0,0 @@
-*.log

data/spec/rails-2.3/rcov.opts

@@ -1,2 +0,0 @@
---exclude "spec/*,gems/*"
---rails

data/spec/rails-2.3/spec/spec_helper.rb

@@ -1,24 +0,0 @@
-# encoding: utf-8
-
-$: << File.join(File.dirname(__FILE__), "/../../lib" )
-
-ENV['RAILS_ENV'] = 'test'
-
-# Load the Rails environment and testing framework
-require "#{File.dirname(__FILE__)}/../app_root/config/environment"
-require 'spec/rails'
-DatabaseCleaner.strategy = :truncation
-
-# Requires supporting files with custom matchers and macros, etc in ./support/ and its subdirectories.
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
-
-# Run the migrations
-Dusen::Util.migrate_test_database
-
-Spec::Runner.configure do |config|
-  config.use_transactional_fixtures = false
-  config.use_instantiated_fixtures  = false
-  config.before(:each) do
-    DatabaseCleaner.clean
-  end
-end

data/spec/rails-2.3/spec.opts

@@ -1,4 +0,0 @@
---colour
---format progress
---loadby mtime
---reverse