scoped_search 2.4.1 → 2.5.0

data/.travis.yml

@@ -7,6 +7,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ruby-head
   - ree
   - jruby-18mode
@@ -16,6 +17,11 @@ gemfile:
  - Gemfile.activerecord2
  - Gemfile.activerecord3
 matrix:
+  include:
+    - rvm: 1.9.3
+      gemfile: Gemfile.activerecord4
+    - rvm: 2.0.0
+      gemfile: Gemfile.activerecord4
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
@@ -28,3 +34,6 @@ matrix:
       gemfile: Gemfile.activerecord2
     - rvm: jruby-head
       gemfile: Gemfile.activerecord2
+    - rvm: jruby-head
+      gemfile: Gemfile.activerecord2
+    - rvm: ree

data/Gemfile.activerecord4

@@ -0,0 +1,16 @@
+source :rubygems
+gemspec
+
+gem 'activerecord', '~> 4.0.0.beta1'
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+end
+
+platforms :ruby do
+  gem 'sqlite3'
+  gem 'mysql2', '~> 0.3.11'
+  gem 'pg'
+end

data/README.rdoc

@@ -13,6 +13,7 @@ to create a clean web UI with sorting and an ajax auto-completer.
 == Preview
 A demo application using the scoped search can be found here: http://github.com/abenari/scoped_search_demo_app
 A running version of the demo application can be found here: http://scope-search-demo.heroku.com
+A Rails 3.2 demo with assets pipeline and twitter bootstrap theame https://github.com/abenari/search-demo2
 
 == Installing
 For a Rails 3 application add the following line in your Gemfile, and run <tt>bundle install</tt>:

data/lib/scoped_search.rb

@@ -14,7 +14,7 @@ module ScopedSearch
 
   # The current scoped_search version. Do not change thisvalue by hand,
   # because it will be updated automatically by the gem release script.
-  VERSION = "2.4.1"
+  VERSION = "2.5.0"
 
   # The ClassMethods module will be included into the ActiveRecord::Base class
   # to add the <tt>ActiveRecord::Base.scoped_search</tt> method and the
@@ -54,7 +54,7 @@ module ScopedSearch
 
       fields.each do |field|
         if relation = self.reflections.keys.detect { |relation| field.to_s =~ Regexp.new("^#{relation}_(\\w+)$") }
-          scoped_search(:in => relation, :on => $1.to_sym)
+          scoped_search(:in => relation.to_sym, :on => $1.to_sym)
         else
           scoped_search(:on => field)
         end

data/lib/scoped_search/definition.rb

@@ -153,10 +153,8 @@ module ScopedSearch
       @profile_fields        = {:default => {}}
       @profile_unique_fields = {:default => []}
 
-
       register_named_scope! unless klass.respond_to?(:search_for)
       register_complete_for! unless klass.respond_to?(:complete_for)
-
     end
 
     attr_accessor :profile, :default_order
@@ -185,11 +183,11 @@ module ScopedSearch
     def operator_by_field_name(name)
       field = field_by_name(name)
       return [] if field.nil?
-      return field.operators                                   if field.operators
-      return ['= ', '!= ']                                     if field.set?
-      return ['= ', '> ', '< ', '<= ', '>= ','!= ', '^ ', '!^ '] if field.numerical?
-      return ['= ', '!= ', '~ ', '!~ ', '^ ', '!^ ']             if field.textual?
-      return ['= ', '> ', '< ']                                if field.temporal?
+      return field.operators                                      if field.operators
+      return ['= ', '!= ']                                        if field.set?
+      return ['= ', '> ', '< ', '<= ', '>= ','!= ', '^ ', '!^ ']  if field.numerical?
+      return ['= ', '!= ', '~ ', '!~ ', '^ ', '!^ ']              if field.textual?
+      return ['= ', '> ', '< ']                                   if field.temporal?
       raise ScopedSearch::QueryNotSupported, "could not verify '#{name}' type, this can be a result of a definition error"
     end
 
@@ -200,10 +198,10 @@ module ScopedSearch
     def default_fields_for(value, operator = nil)
 
       column_types  = []
-      column_types += [:string, :text]                      if [nil, :like, :unlike, :ne, :eq].include?(operator)
-      column_types += [:double, :float, :decimal] if value =~ NUMERICAL_REGXP
-      column_types += [:integer] if value =~ INTEGER_REGXP
-      column_types += [:datetime, :date, :timestamp]        if (parse_temporal(value))
+      column_types += [:string, :text]                if [nil, :like, :unlike, :ne, :eq].include?(operator)
+      column_types += [:double, :float, :decimal]     if value =~ NUMERICAL_REGXP
+      column_types += [:integer]                      if value =~ INTEGER_REGXP
+      column_types += [:datetime, :date, :timestamp]  if (parse_temporal(value))
 
       default_fields.select { |field| column_types.include?(field.type) && !field.set? }
     end
@@ -250,6 +248,17 @@ module ScopedSearch
             search_scope = search_scope.reorder(find_options[:order]) if find_options[:order]
             search_scope
           })
+        when 4
+          @klass.scope(:search_for, lambda { |*args|
+            find_options = ScopedSearch::QueryBuilder.build_query(self, args[0], args[1])
+            search_scope = @klass.all
+            search_scope = search_scope.where(find_options[:conditions]) if find_options[:conditions]
+            search_scope = search_scope.includes(find_options[:include]) if find_options[:include]
+            search_scope = search_scope.references(find_options[:include]) if find_options[:include]
+            search_scope = search_scope.joins(find_options[:joins]) if find_options[:joins]
+            search_scope = search_scope.reorder(find_options[:order]) if find_options[:order]
+            search_scope
+          })
         else
           raise "This ActiveRecord version is currently not supported!"
         end

data/lib/scoped_search/query_builder.rb

@@ -140,7 +140,7 @@ module ScopedSearch
       # more logical results.
       if field.datetime?
         span = 1.minute if(value =~ /\A\s*\d+\s+\bminutes?\b\s+\bago\b\s*\z/i)
-        span ||= (timestamp.day_fraction == 0) ? 1.day :  1.hour
+        span ||= (timestamp.day_fraction == 0) ? 1.day : 1.hour
         if [:eq, :ne].include?(operator)
           # Instead of looking for an exact (non-)match, look for dates that
           # fall inside/outside the range of timestamps of that day.
@@ -271,18 +271,16 @@ module ScopedSearch
         join_sql = ""
         connection = klass.connection
         key = key_relation.to_s.singularize.to_sym
-        main = definition.klass.to_s.gsub(/.*::/,'').underscore.to_sym
 
         key_table = klass.reflections[key].table_name
-        key_table_pk = klass.reflections[key].klass.primary_key
-
         value_table = klass.table_name.to_s
-        value_table_fk_key = klass.reflections[key].association_foreign_key
 
-        if klass.reflections[main]
+        key_table_pk, value_table_fk_key = reflection_keys(klass.reflections[key])
+
+        main_reflection = definition.klass.reflections[relation]
+        if main_reflection
           main_table = definition.klass.table_name
-          main_table_pk = klass.reflections[main].klass.primary_key
-          value_table_fk_main = klass.reflections[main].association_foreign_key
+          main_table_pk, value_table_fk_main = reflection_keys(definition.klass.reflections[relation])
 
           join_sql = "\n  INNER JOIN #{connection.quote_table_name(value_table)} #{value_table}_#{num} ON (#{main_table}.#{main_table_pk} = #{value_table}_#{num}.#{value_table_fk_main})"
           value_table = " #{value_table}_#{num}"
@@ -303,18 +301,23 @@ module ScopedSearch
       # on different keys in the same query.
       def construct_simple_join_sql( num )
         connection = klass.connection
-        main = definition.klass.to_s.gsub(/.*::/,'').underscore.to_sym
         key_value_table = klass.table_name
 
         main_table = definition.klass.table_name
-        main_table_pk = klass.reflections[main].klass.primary_key
-        value_table_fk_main = klass.reflections[main].options[:foreign_key]
-        value_table_fk_main ||= klass.reflections[main].association_foreign_key
+        main_table_pk, value_table_fk_main = reflection_keys(definition.klass.reflections[relation])
 
         join_sql = "\n  INNER JOIN #{connection.quote_table_name(key_value_table)} #{key_value_table}_#{num} ON (#{connection.quote_table_name(main_table)}.#{main_table_pk} = #{key_value_table}_#{num}.#{value_table_fk_main})"
         return join_sql
       end
 
+      def reflection_keys reflection
+        pk = reflection.klass.primary_key
+        fk = reflection.options[:foreign_key]
+        # activerecord prior to 3.1 doesn't respond to foreign_key method and hold the key name in the reflection primary key
+        fk = fk || reflection.respond_to?(:foreign_key) ? reflection.foreign_key : reflection.primary_key_name
+        [pk, fk]
+      end
+
       def to_ext_method_sql(key, operator, value, &block)
         raise ScopedSearch::QueryNotSupported, "'#{definition.klass}' doesn't respond to '#{ext_method}'" unless definition.klass.respond_to?(ext_method)
         conditions = definition.klass.send(ext_method.to_sym,key, operator, value) rescue {}

data/lib/scoped_search/query_language/tokenizer.rb

@@ -49,9 +49,12 @@ module ScopedSearch::QueryLanguage::Tokenizer
   end
 
   # Tokenizes an operator that occurs in the OPERATORS hash
+  # The .to_s on [peek|next]_char is to prevent a ruby bug when nil 
+  # values are returned from strings which have forced encoding.
+  # https://github.com/wvanbergen/scoped_search/issues/33 for details
   def tokenize_operator(&block)
     operator = current_char
-    operator << next_char if OPERATORS.has_key?(operator + peek_char)
+    operator << next_char.to_s if OPERATORS.has_key?(operator + peek_char.to_s)
     yield(OPERATORS[operator])
   end
 

data/scoped_search.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   
   # Do not change the version and date fields by hand. This will be done
   # automatically by the gem release script.
-  s.version = "2.4.1"
-  s.date    = "2013-03-06"
+  s.version = "2.5.0"
+  s.date    = "2013-03-29"
 
   s.summary = "Easily search you ActiveRecord models with a simple query language using a named scope."
   s.description = <<-EOS
@@ -33,6 +33,6 @@ Gem::Specification.new do |s|
 
   # Do not change the files and test_files fields by hand. This will be done
   # automatically by the gem release script.
-  s.files      = %w(.gitignore .infinity_test .travis.yml Gemfile Gemfile.activerecord2 Gemfile.activerecord3 LICENSE README.rdoc Rakefile init.rb lib/scoped_search.rb lib/scoped_search/auto_complete_builder.rb lib/scoped_search/definition.rb lib/scoped_search/engine.rb lib/scoped_search/query_builder.rb lib/scoped_search/query_language.rb lib/scoped_search/query_language/ast.rb lib/scoped_search/query_language/parser.rb lib/scoped_search/query_language/tokenizer.rb lib/scoped_search/rails_helper.rb scoped_search.gemspec spec/database.jruby.yml spec/database.ruby.yml spec/integration/api_spec.rb spec/integration/auto_complete_spec.rb spec/integration/key_value_querying_spec.rb spec/integration/ordinal_querying_spec.rb spec/integration/profile_querying_spec.rb spec/integration/relation_querying_spec.rb spec/integration/set_query_spec.rb spec/integration/string_querying_spec.rb spec/lib/database.rb spec/lib/matchers.rb spec/lib/mocks.rb spec/spec_helper.rb spec/unit/ast_spec.rb spec/unit/auto_complete_builder_spec.rb spec/unit/definition_spec.rb spec/unit/parser_spec.rb spec/unit/query_builder_spec.rb spec/unit/tokenizer_spec.rb tasks/github-gem.rake vendor/assets/images/spinner.gif vendor/assets/javascripts/scoped_search.js vendor/assets/stylesheets/scoped_search.scss)
+  s.files      = %w(.gitignore .infinity_test .travis.yml Gemfile Gemfile.activerecord2 Gemfile.activerecord3 Gemfile.activerecord4 LICENSE README.rdoc Rakefile init.rb lib/scoped_search.rb lib/scoped_search/auto_complete_builder.rb lib/scoped_search/definition.rb lib/scoped_search/engine.rb lib/scoped_search/query_builder.rb lib/scoped_search/query_language.rb lib/scoped_search/query_language/ast.rb lib/scoped_search/query_language/parser.rb lib/scoped_search/query_language/tokenizer.rb lib/scoped_search/rails_helper.rb scoped_search.gemspec spec/database.jruby.yml spec/database.ruby.yml spec/integration/api_spec.rb spec/integration/auto_complete_spec.rb spec/integration/key_value_querying_spec.rb spec/integration/ordinal_querying_spec.rb spec/integration/profile_querying_spec.rb spec/integration/relation_querying_spec.rb spec/integration/set_query_spec.rb spec/integration/string_querying_spec.rb spec/lib/database.rb spec/lib/matchers.rb spec/lib/mocks.rb spec/spec_helper.rb spec/unit/ast_spec.rb spec/unit/auto_complete_builder_spec.rb spec/unit/definition_spec.rb spec/unit/parser_spec.rb spec/unit/query_builder_spec.rb spec/unit/tokenizer_spec.rb tasks/github-gem.rake vendor/assets/images/spinner.gif vendor/assets/javascripts/scoped_search.js vendor/assets/stylesheets/scoped_search.scss)
   s.test_files = %w(spec/integration/api_spec.rb spec/integration/auto_complete_spec.rb spec/integration/key_value_querying_spec.rb spec/integration/ordinal_querying_spec.rb spec/integration/profile_querying_spec.rb spec/integration/relation_querying_spec.rb spec/integration/set_query_spec.rb spec/integration/string_querying_spec.rb spec/unit/ast_spec.rb spec/unit/auto_complete_builder_spec.rb spec/unit/definition_spec.rb spec/unit/parser_spec.rb spec/unit/query_builder_spec.rb spec/unit/tokenizer_spec.rb)
 end

data/spec/integration/api_spec.rb

@@ -56,6 +56,12 @@ describe ScopedSearch, "API" do
         @class.search_for('query').class.should eql(ActiveRecord::Relation)
       end
       
+    elsif ActiveRecord::VERSION::MAJOR == 4
+      
+      it "should return a ActiveRecord::Relation instance" do
+        @class.search_for('query').class.superclass.should eql(ActiveRecord::Relation)
+      end
+      
     end
   end
 
@@ -83,7 +89,6 @@ describe ScopedSearch, "API" do
     it "should create a Field with a valid relation when using the underscore notation" do
       ScopedSearch::Definition::Field.should_receive(:new).with(
           instance_of(ScopedSearch::Definition), hash_including(:in => :bar, :on => :related_field))
-
       Foo.searchable_on(:bar_related_field)
     end
 

data/spec/integration/key_value_querying_spec.rb

@@ -20,73 +20,85 @@ require "spec_helper"
           ActiveRecord::Migration.create_table(:keys) { |t| t.string :name }
           class ::Key < ActiveRecord::Base; has_many :facts; end
 
-          ActiveRecord::Migration.create_table(:facts) { |t| t.string :value; t.integer :key_id; t.integer :key_value_id }
-          class ::Fact < ActiveRecord::Base; belongs_to :key; belongs_to :key_value; end
+          ActiveRecord::Migration.create_table(:facts) { |t| t.string :value; t.integer :key_id; t.integer :item_id }
+          class ::Fact < ActiveRecord::Base
+            belongs_to :key
+            belongs_to :item, :class_name => "MyItem", :foreign_key => :item_id
+          end
 
           # The class that will run the queries
-          ActiveRecord::Migration.create_table(:key_values) { |t| t.string :name }
-          class ::KeyValue < ActiveRecord::Base
+          ActiveRecord::Migration.create_table(:items) { |t| t.string :name }
+          class ::Item < ActiveRecord::Base
             has_many :facts
             has_many :keys, :through => :facts
             
             scoped_search :in => :facts, :on => :value, :rename => :facts, :in_key => :keys, :on_key => :name, :complete_value => true
           end
+          class ::MyItem < ::Item
+          end
 
           @key1 = Key.create!(:name => 'color')
           @key2 = Key.create!(:name => 'size')
 
-          @kv1 = KeyValue.create!(:name => 'bar')
-          @kv2 = KeyValue.create!(:name => 'barbary')
+          @kv1 = MyItem.create!(:name => 'bar')
+          @kv2 = MyItem.create!(:name => 'barbary')
 
-          Fact.create!(:value => 'green', :key => @key1, :key_value => @kv1)
-          Fact.create!(:value => 'gold' , :key => @key1, :key_value => @kv2)
-          Fact.create!(:value => '5'    , :key => @key2, :key_value => @kv1)
+          Fact.create!(:value => 'green', :key => @key1, :item => @kv1)
+          Fact.create!(:value => 'gold' , :key => @key1, :item => @kv2)
+          Fact.create!(:value => '5'    , :key => @key2, :item => @kv1)
 
         end
 
         after(:all) do
-          ScopedSearch::RSpec::Database.drop_model(KeyValue)
+          ScopedSearch::RSpec::Database.drop_model(Item)
           ScopedSearch::RSpec::Database.drop_model(Fact)
           ScopedSearch::RSpec::Database.drop_model(Key)
           Object.send :remove_const, :Fact
           Object.send :remove_const, :Key
-          Object.send :remove_const, :KeyValue
+          Object.send :remove_const, :Item
+          Object.send :remove_const, :MyItem
         end
 
         it "should find all bars with a fact name color and fact value green" do
-          KeyValue.search_for('facts.color = green').should have(1).items
+          Item.search_for('facts.color = green').should have(1).items
         end
 
-         it "should find all bars with a fact name color and fact value gold" do
-          KeyValue.search_for('facts.color = gold').first.name.should eql('barbary')
+        it "should find all bars with a fact name color and fact value gold" do
+          Item.search_for('facts.color = gold').first.name.should eql('barbary')
         end
 
         it "should find all bars with a fact name size and fact value 5" do
-          KeyValue.search_for('facts.size = 5').should have(1).items
+          Item.search_for('facts.size = 5').should have(1).items
         end
 
         it "should find all bars with a fact color green and fact size 5" do
-          KeyValue.search_for('facts.color = green and facts.size = 5').should have(1).items
+          Item.search_for('facts.color = green and facts.size = 5').should have(1).items
         end
 
         it "should find all bars with a fact color gold or green" do
-          KeyValue.search_for('facts.color = gold or facts.color = green').should have(2).items
+          Item.search_for('facts.color = gold or facts.color = green').should have(2).items
         end
 
         it "should find all bars that has size value" do
-          KeyValue.search_for('has facts.size').should have(1).items
+          Item.search_for('has facts.size').should have(1).items
         end
 
         it "should find all bars that has color value" do
-          KeyValue.search_for('has facts.color').should have(2).items
+          Item.search_for('has facts.color').should have(2).items
         end
 
         it "should complete facts names" do
-          KeyValue.complete_for('facts.').should have(2).items
+          Item.complete_for('facts.').should have(2).items
         end
 
-         it "should complete values for fact name = color" do
-          KeyValue.complete_for('facts.color = ').should have(2).items
+        it "should complete values for fact name = color" do
+          Item.complete_for('facts.color = ').should have(2).items
+        end
+
+        it "should find all bars with a fact name color and fact value gold of descendant class" do
+          if ActiveRecord::VERSION::MAJOR == 3
+            MyItem.search_for('facts.color = gold').first.name.should eql('barbary')
+          end
         end
 
       end

data/spec/integration/ordinal_querying_spec.rb

@@ -81,6 +81,16 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         lambda { @class.search_for('unindexed = 10') }.should raise_error(ScopedSearch::Exception)
       end
 
+      # Before Ruby 2.0 if a string had forced encoding and a nil was extracted from it during 
+      # any implicit type conversions to a string (+ or << operators) a TypeError would be raised.
+      # https://github.com/wvanbergen/scoped_search/issues/33 for more details
+      it "encoded string should not raise TypeError when querying non-indexed column without a value" do
+        if defined? Encoding
+          query = 'unindexed ='.force_encoding(Encoding::UTF_8).encode
+          lambda { @class.search_for(query) }.should_not raise_error(TypeError)
+        end
+      end
+
       it "should not return records for which the query matches unindex records" do
         @class.search_for('= 10').should have(0).item
       end
@@ -161,7 +171,8 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
     end
-    context 'humenized date and time query' do
+
+    context 'humanized date and time query' do
 
       before(:all) do
         @curent_record = @class.create!(:timestamp => Time.current, :date => Date.current)
@@ -213,7 +224,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
     end
 
-       context 'querying bitwize fields' do
+    context 'querying bitwise fields' do
 
       before(:all) do
         @foo = ScopedSearch::RSpec::Database.create_model(:int => :integer) do |klass|

data/spec/integration/string_querying_spec.rb

@@ -207,11 +207,8 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "resetting order when selecting distinct values" do
-        distinct_search = if ActiveRecord::VERSION::MAJOR == 2
+        distinct_search =
           @class.search_for('', :order => '').all(:select => 'DISTINCT(explicit)')
-        else
-          @class.search_for('', :order => '').select(:explicit).uniq
-        end
 
         Set.new(distinct_search.map(&:explicit)).should == Set['baz', nil]
       end

data/tasks/github-gem.rake

@@ -122,8 +122,8 @@ module GithubGem
         task(:check_not_diverged => :fetch_origin) { check_not_diverged_task }
 
         checks = [:check_current_branch, :check_clean_status, :check_not_diverged, :check_version]
-        checks.unshift('spec:basic') if has_specs?
-        checks.unshift('test:basic') if has_tests?
+        checks.unshift('spec:basic') if has_specs? && !skip_tests?
+        checks.unshift('test:basic') if has_tests? && !skip_tests?
         # checks.push << [:check_rubyforge] if gemspec.rubyforge_project
 
         desc "Perform all checks that would occur before a release"
@@ -278,6 +278,10 @@ module GithubGem
 
     private
 
+    def skip_tests?
+      !!ENV['SKIP_TESTS']
+    end
+
     # Checks whether this project has any RSpec files
     def has_specs?
       FileList[spec_pattern].any?

metadata

@@ -1,87 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: scoped_search
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 2.5.0
   prerelease: 
-  segments: 
-  - 2
-  - 4
-  - 1
-  version: 2.4.1
 platform: ruby
-authors: 
+authors:
 - Amos Benari
 - Willem van Bergen
 - Wes Hays
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2013-03-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.0
-  requirement: *id001
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  requirement: *id002
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-description: "    Scoped search makes it easy to search your ActiveRecord-based models.\n    \n    It will create a named scope :search_for that can be called with a query string. It will build an SQL query using\n    the provided query string and a definition that specifies on what fields to search. Because the functionality is\n    built on named_scope, the result of the search_for call can be used like any other named_scope, so it can be\n    chained with another scope or combined with will_paginate.\n    \n    Because it uses standard SQL, it does not require any setup, indexers or daemons. This makes scoped_search\n    suitable to quickly add basic search functionality to your application with little hassle. On the other hand,\n    it may not be the best choice if it is going to be used on very large datasets or by a large user base.\n"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "    Scoped search makes it easy to search your ActiveRecord-based
+  models.\n    \n    It will create a named scope :search_for that can be called with
+  a query string. It will build an SQL query using\n    the provided query string
+  and a definition that specifies on what fields to search. Because the functionality
+  is\n    built on named_scope, the result of the search_for call can be used like
+  any other named_scope, so it can be\n    chained with another scope or combined
+  with will_paginate.\n    \n    Because it uses standard SQL, it does not require
+  any setup, indexers or daemons. This makes scoped_search\n    suitable to quickly
+  add basic search functionality to your application with little hassle. On the other
+  hand,\n    it may not be the best choice if it is going to be used on very large
+  datasets or by a large user base.\n"
+email:
 - abenari@redhat.com
 - willem@railsdoctors.com
 - weshays@gbdev.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .infinity_test
 - .travis.yml
 - Gemfile
 - Gemfile.activerecord2
 - Gemfile.activerecord3
+- Gemfile.activerecord4
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -123,43 +129,42 @@ files:
 - vendor/assets/stylesheets/scoped_search.scss
 homepage: http://github.com/wvanbergen/scoped_search/wiki
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - scoped_search
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3717190913219406659
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3717190913219406659
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Easily search you ActiveRecord models with a simple query language using a named scope.
-test_files: 
+summary: Easily search you ActiveRecord models with a simple query language using
+  a named scope.
+test_files:
 - spec/integration/api_spec.rb
 - spec/integration/auto_complete_spec.rb
 - spec/integration/key_value_querying_spec.rb