scoped_search 3.3.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d62827c492fb99894adbd0b01e0a1341c6744a5
-  data.tar.gz: 2ee3ede28bcd6b96e12ca1a7629b7cbef38aee4d
+  metadata.gz: df5ac5265b984d6208df025b20dd336950d9bdbb
+  data.tar.gz: 3643c8835b43e6333e24d44473b1b29c3ec7ac91
 SHA512:
-  metadata.gz: 9e26efdc791ad2fde5e975f44c8512a5089c4774f41f299e68f2c03fab3657323be4668e0668deb86f448dce2b02fe92b95d8d180cfff76b6f7dacd6e4bb01df
-  data.tar.gz: 206daf327aa65a9de4b2ac8ed049620b4df5c4b71330b846413c9140d0f83aed95f612db37d9154d624d2f8c3a54a8d9fd785e41a76fa9e223b0b4e9b81a7497
+  metadata.gz: 7d760759a261eda13744cad755263a056213315859bc925e5ea814cd0e214e19941dc6b3e07572f80b0bf10058359d6895f663a9249b894fa53297c9f81a7efa
+  data.tar.gz: 4b9580f1b55aeaf6f74b64847318361d58f1e3a7477376b1db4921861ec95db3ba8594f7a6f5915f097fdd9313b2fb9bd30b26afc53c2199d3f367d8fa54c336

data/.travis.yml

@@ -11,7 +11,6 @@ script:
 - bundle exec rake
 
 rvm:
-- "1.9"
 - "2.0"
 - "2.1"
 - "2.2.2"
@@ -21,9 +20,6 @@ rvm:
 - jruby-head
 
 gemfile:
-- Gemfile.activerecord32
-- Gemfile.activerecord40
-- Gemfile.activerecord41
 - Gemfile.activerecord42
 - Gemfile.activerecord50
 
@@ -33,11 +29,7 @@ matrix:
     - rvm: jruby-head
     - rvm: jruby-19mode
   exclude:
-    - rvm: "1.9"
-      gemfile: Gemfile.activerecord50
     - rvm: "2.0"
       gemfile: Gemfile.activerecord50
     - rvm: "2.1"
       gemfile: Gemfile.activerecord50
-    - rvm: "2.3.1"
-      gemfile: Gemfile.activerecord32

data/CHANGELOG.rdoc

@@ -8,6 +8,26 @@ Please add an entry to the "Unreleased changes" section in your pull requests.
 
 *Nothing yet*
 
+=== Version 4.0.0
+
+- Drop support for Ruby 1.9
+- Drop support for ActiveRecord 3, 4.0, and 4.1
+- `scoped_search` registration deprecates `:in` in favor of `:relation`, and
+  `:alias` in favor of `aliases: [..]` to avoid clash with Ruby reserved words.
+- `sort` helper: any HTML options must now be given as a keyword argument,
+  instead of the third argument, i.e. `html_options: {..}`
+- `sort` helper now takes hash of `url_options`, defaulting to an unfiltered
+  `params`. Call `params.permit(..)` and pass in the result to safely generate
+  URLs and prevent non-sanitized errors under Rails 5.
+- Auto completion: remove autocomplete_* JavaScript helpers in favor of jQuery
+  method provided via asset pipeline. Call `$(..).scopedSearch` on autocomplete
+  text boxes to activate.
+- Auto completion: escape quotes in listed values (#138)
+- Add :validator option to definitions to validate user's search inputs
+- Fix incorrect association conditions being used on through relations
+- Use `#distinct` on Rails 4+
+- Test Rails 5.0.x releases, test latest AR adapters
+
 === Version 3.3.0
 
 - Support for ActiveRecord 5.0

data/Gemfile.activerecord42

@@ -10,7 +10,7 @@ platforms :jruby do
 end
 
 platforms :ruby do
-  gem 'sqlite3'
-  gem 'mysql2', '~> 0.3.11'
-  gem 'pg'
+  gem 'sqlite3', '~> 1.3.6'
+  gem 'mysql2', '>= 0.3.13', '< 0.5'
+  gem 'pg', '~> 0.15'
 end

data/Gemfile.activerecord50

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'activerecord', '5.0.0.rc1'
+gem 'activerecord', '~> 5.0.0'
 
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
@@ -10,7 +10,7 @@ platforms :jruby do
 end
 
 platforms :ruby do
-  gem 'sqlite3'
-  gem 'mysql2', '~> 0.3.11'
-  gem 'pg'
+  gem 'sqlite3', '~> 1.3.6'
+  gem 'mysql2', '>= 0.3.18', '< 0.5'
+  gem 'pg', '~> 0.18'
 end

data/README.rdoc

@@ -22,6 +22,9 @@ Add the following line in your Gemfile, and run <tt>bundle install</tt>:
 
   gem "scoped_search"
 
+Scoped search 4.x supports Rails 4.2 to 5.0, with Ruby 2.0.0 or higher. Use
+previous versions, e.g. 3.x to support older versions of Rails or Ruby.
+
 == Usage
 
 Scoped search requires you to define the fields you want to search in:

data/lib/scoped_search.rb

@@ -65,6 +65,7 @@ require 'scoped_search/definition'
 require 'scoped_search/query_language'
 require 'scoped_search/query_builder'
 require 'scoped_search/auto_complete_builder'
+require 'scoped_search/validators'
 
 # Import the search_on method in the ActiveReocrd::Base class
 ActiveRecord::Base.send(:extend, ScopedSearch::ClassMethods)

data/lib/scoped_search/auto_complete_builder.rb

@@ -178,7 +178,7 @@ module ScopedSearch
         .where(value_conditions(field_name, val))
         .select(field_name)
         .limit(20)
-        .uniq
+        .distinct
         .map(&field.key_field)
         .compact
         .map { |f| "#{name}.#{f} " }
@@ -205,10 +205,10 @@ module ScopedSearch
         .where(value_conditions(field.quoted_field, val))
         .select(field.quoted_field)
         .limit(20)
-        .uniq
+        .distinct
         .map(&field.field)
         .compact
-        .map { |v| v.to_s =~ /\s/ ? "\"#{v}\"" : v }
+        .map { |v| v.to_s =~ /\s/ ? "\"#{v.gsub('"', '\"')}\"" : v }
     end
 
     def completer_scope(field)

data/lib/scoped_search/definition.rb

@@ -16,44 +16,76 @@ module ScopedSearch
     class Field
 
       attr_reader :definition, :field, :only_explicit, :relation, :key_relation, :full_text_search,
-                  :key_field, :complete_value, :complete_enabled, :offset, :word_size, :ext_method, :operators
+                  :key_field, :complete_value, :complete_enabled, :offset, :word_size, :ext_method, :operators,
+                  :validator
 
       # Initializes a Field instance given the definition passed to the
       # scoped_search call on the ActiveRecord-based model class.
-      def initialize(definition, options = {})
-        @definition = definition
-        @definition.profile = options[:profile] if options[:profile]
-        @definition.default_order ||= default_order(options)
-
-        case options
-        when Symbol, String
-          @field = field.to_sym
-        when Hash
-          @field = options.delete(:on)
-
-          # Set attributes from options hash
-          @complete_value   = options[:complete_value]
-          @relation         = options[:in]
-          @key_relation     = options[:in_key]
-          @key_field        = options[:on_key]
-          @offset           = options[:offset]
-          @word_size        = options[:word_size] || 1
-          @ext_method       = options[:ext_method]
-          @operators        = options[:operators]
-          @only_explicit    = !!options[:only_explicit]
-          @full_text_search = options[:full_text_search]
-          @default_operator = options[:default_operator] if options.has_key?(:default_operator)
-          @complete_enabled = options[:complete_enabled].nil? ? true : options[:complete_enabled]
+      #
+      # Field name may be given in positional 'field' argument or 'on' named
+      # argument.
+      def initialize(definition,
+                     field = nil,
+                     aliases: [],
+                     complete_enabled: true,
+                     complete_value: nil,
+                     default_operator: nil,
+                     default_order: nil,
+                     ext_method: nil,
+                     full_text_search: nil,
+                     in_key: nil,
+                     offset: nil,
+                     on: field,
+                     on_key: nil,
+                     only_explicit: nil,
+                     operators: nil,
+                     profile: nil,
+                     relation: nil,
+                     rename: nil,
+                     validator: nil,
+                     word_size: 1,
+                     **kwargs)
+
+        # Prefer 'on' kw arg if given, defaults to the 'field' positional to allow either syntax
+        raise ArgumentError, "Missing field or 'on' keyword argument" if on.nil?
+        @field = on.to_sym
+
+        # Reserved Ruby keywords so access via kwargs instead, but deprecate them for future versions
+        if kwargs.key?(:in)
+          relation = kwargs.delete(:in)
+          ActiveSupport::Deprecation.warn("'in' argument deprecated, prefer 'relation' since scoped_search 4.0.0", caller(6))
         end
+        if kwargs.key?(:alias)
+          aliases += [kwargs.delete(:alias)]
+          ActiveSupport::Deprecation.warn("'alias' argument deprecated, prefer aliases: [..] since scoped_search 4.0.0", caller(6))
+        end
+        raise ArgumentError, "Unknown arguments to scoped_search: #{kwargs.keys.join(', ')}" unless kwargs.empty?
 
-        # Store this field is the field array
-        definition.fields[@field]                  ||= self unless options[:rename]
-        definition.fields[options[:rename].to_sym] ||= self if     options[:rename]
-        definition.unique_fields                   << self
-
-        # Store definition for alias / aliases as well
-        definition.fields[options[:alias].to_sym]                  ||= self   if options[:alias]
-        options[:aliases].each { |al| definition.fields[al.to_sym] ||= self } if options[:aliases]
+        @definition = definition
+        @definition.profile = profile if profile
+        @definition.default_order ||= generate_default_order(default_order, rename || @field) if default_order
+
+        # Set attributes from keyword arguments
+        @complete_enabled = complete_enabled
+        @complete_value   = complete_value
+        @default_operator = default_operator
+        @ext_method       = ext_method
+        @full_text_search = full_text_search
+        @key_field        = on_key
+        @key_relation     = in_key
+        @offset           = offset
+        @only_explicit    = !!only_explicit
+        @operators        = operators
+        @relation         = relation
+        @validator        = validator
+        @word_size        = word_size
+
+        # Store this field in the field array
+        definition.fields[rename ? rename.to_sym : @field] ||= self
+        definition.unique_fields << self
+
+        # Store definition for aliases as well
+        aliases.each { |al| definition.fields[al.to_sym] ||= self }
       end
 
       # The ActiveRecord-based class that belongs to this field.
@@ -82,11 +114,7 @@ module ScopedSearch
           if klass.columns_hash.has_key?(field.to_s)
             klass.columns_hash[field.to_s]
           else
-            if "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}".to_f < 4.1
-              raise ActiveRecord::UnknownAttributeError, "#{klass.inspect} doesn't have column #{field.inspect}."
-            else
-              raise ActiveRecord::UnknownAttributeError.new(klass, field)
-            end
+            raise ActiveRecord::UnknownAttributeError.new(klass, field)
           end
         end
       end
@@ -135,11 +163,9 @@ module ScopedSearch
         end
       end
 
-      def default_order(options)
-        return nil if options[:default_order].nil?
-        field_name = options[:rename].nil? ? options[:on] : options[:rename]
-        order = (options[:default_order].to_s.downcase.include?('desc')) ? "DESC" : "ASC"
-        return "#{field_name} #{order}"
+      def generate_default_order(default_order, field)
+        order = (default_order.to_s.downcase.include?('desc')) ? "DESC" : "ASC"
+        return "#{field} #{order}"
       end
 
       # Return 'table'.'column' with the correct database quotes
@@ -234,8 +260,8 @@ module ScopedSearch
     end
 
     # Defines a new search field for this search definition.
-    def define(options)
-      Field.new(self, options)
+    def define(*args)
+      Field.new(self, *args)
     end
 
     # Returns a reflection for a given klass and name
@@ -252,24 +278,13 @@ module ScopedSearch
       @klass.scope(:search_for, proc { |query, options|
         klass = definition.klass
 
-        search_scope = case ActiveRecord::VERSION::MAJOR
-          when 3
-            klass.scoped
-          when 4
-            (ActiveRecord::VERSION::MINOR < 1) ? klass.where(nil) : klass.all
-          when 5
-            klass.all
-          else
-            raise ScopedSearch::DefinitionError, 'version ' \
-              "#{ActiveRecord::VERSION::MAJOR} of activerecord is not supported"
-          end
-
+        search_scope = klass.all
         find_options = ScopedSearch::QueryBuilder.build_query(definition, query || '', options || {})
         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.joins(find_options[:joins])        if find_options[:joins]
         search_scope = search_scope.reorder(find_options[:order])      if find_options[:order]
-        search_scope = search_scope.references(find_options[:include]) if find_options[:include] && ActiveRecord::VERSION::MAJOR >= 4
+        search_scope = search_scope.references(find_options[:include]) if find_options[:include]
 
         search_scope
       })

data/lib/scoped_search/query_builder.rb

@@ -251,9 +251,9 @@ module ScopedSearch
 
     def find_has_many_through_association(field, through)
       middle_table_association = nil
-      field.klass.reflect_on_all_associations(:has_many).each do |reflection| 
+      field.klass.reflect_on_all_associations(:has_many).each do |reflection|
         class_name = reflection.options[:class_name].constantize.table_name if reflection.options[:class_name]
-        middle_table_association = reflection.name if class_name == through.to_s 
+        middle_table_association = reflection.name if class_name == through.to_s
         middle_table_association = reflection.plural_name if reflection.plural_name == through.to_s
       end
       middle_table_association
@@ -271,7 +271,7 @@ module ScopedSearch
 
       # primary and foreign keys + optional condition for the many to middle join
       pk1, fk1   = field.reflection_keys(definition.reflection_by_name(many_class, through))
-      condition1 = field.reflection_conditions(definition.reflection_by_name(field.klass, many_table_name))
+      condition1 = field.reflection_conditions(definition.reflection_by_name(field.klass, middle_table_name))
 
       # primary and foreign keys + optional condition for the endpoint to middle join
       middle_table_association = find_has_many_through_association(field, through) || middle_table_name
@@ -468,6 +468,10 @@ module ScopedSearch
           # Search only on the given field.
           field = definition.field_by_name(lhs.value)
           raise ScopedSearch::QueryNotSupported, "Field '#{lhs.value}' not recognized for searching!" unless field
+
+          # see if the value passes user defined validation
+          validate_value(field, rhs.value)
+
           builder.sql_test(field, operator, rhs.value,lhs.value, &block)
         end
 
@@ -485,6 +489,16 @@ module ScopedSearch
             raise ScopedSearch::QueryNotSupported, "Don't know how to handle this operator node: #{operator.inspect} with #{children.inspect}!"
           end
         end
+
+        private
+
+        def validate_value(field, value)
+          validator = field.validator
+          if validator
+            valid = validator.call(value)
+            raise ScopedSearch::QueryNotSupported, "Value '#{value}' is not valid for field '#{field.field}'" unless valid
+          end
+        end
       end
 
       # Defines the to_sql method for AST AND/OR operators

data/lib/scoped_search/rails_helper.rb

@@ -4,20 +4,31 @@ module ScopedSearch
     #
     # Examples:
     #
-    #   sort @search, :by => :username
-    #   sort @search, :by => :created_at, :as => "Created"
-    #   sort @search, :by => :created_at, :default => "DESC"
+    #   sort :username
+    #   sort :created_at, as: "Created"
+    #   sort :created_at, default: "DESC"
+    #
+    # * <tt>field</tt> - the name of the named scope. This helper will prepend this value with "ascend_by_" and "descend_by_"
     #
     # This helper accepts the following options:
     #
-    # * <tt>:by</tt> - the name of the named scope. This helper will prepend this value with "ascend_by_" and "descend_by_"
-    # * <tt>:as</tt> - the text used in the link, defaults to whatever is passed to :by
+    # * <tt>:as</tt> - the text used in the link, defaults to whatever is passed to `field`
     # * <tt>:default</tt> - default sorting order, DESC or ASC
-    def sort(field, options = {}, html_options = {})
+    # * <tt>:html_options</tt> - is a hash of HTML options for the anchor tag
+    # * <tt>:url_options</tt> - is a hash of URL parameters, defaulting to `params`, to preserve the current URL
+    #   parameters.
+    #
+    # On Rails 5 or higher, parameter whitelisting prevents any parameter being used in a link by
+    # default, so `params.permit(..)` should be passed for `url_options` for all known and
+    # permitted URL parameters, e.g.
+    #
+    #   sort :username, url_options: params.permit(:search)
+    #
+    def sort(field, as: nil, default: "ASC", html_options: {}, url_options: params)
 
-      unless options[:as]
-        id           = field.to_s.downcase == "id"
-        options[:as] = id ? field.to_s.upcase : field.to_s.humanize
+      unless as
+        id = field.to_s.downcase == "id"
+        as = id ? field.to_s.upcase : field.to_s.humanize
       end
 
       ascend  = "#{field} ASC"
@@ -30,151 +41,27 @@ module ScopedSearch
         when descend
           new_sort = ascend
         else
-          new_sort = ["ASC", "DESC"].include?(options[:default]) ? "#{field} #{options[:default]}" : ascend
+          new_sort = ["ASC", "DESC"].include?(default) ? "#{field} #{default}" : ascend
       end
 
       unless selected_sort.nil?
         css_classes = html_options[:class] ? html_options[:class].split(" ") : []
         if selected_sort == ascend
-          options[:as] = "&#9650;&nbsp;#{options[:as]}"
+          as = "&#9650;&nbsp;#{as}"
           css_classes << "ascending"
         else
-          options[:as] = "&#9660;&nbsp;#{options[:as]}"
+          as = "&#9660;&nbsp;#{as}"
           css_classes << "descending"
         end
         html_options[:class] = css_classes.join(" ")
       end
 
-      url_options = params.merge(:order => new_sort)
-
-      options[:as] = raw(options[:as]) if defined?(RailsXss)
-
-      a_link(options[:as], html_escape(url_for(url_options)),html_options)
-    end
-
-    # Adds AJAX auto complete functionality to the text input field with the
-    # DOM ID specified by +field_id+.
-    #
-    # Required   +options+ is:
-    # <tt>:url</tt>::                  URL to call for auto completion results
-    #                                  in url_for format.
-    #
-    # Additional +options+ are:
-    # <tt>:update</tt>::               Specifies the DOM ID of the element whose
-    #                                  innerHTML should be updated with the auto complete
-    #                                  entries returned by the AJAX request.
-    #                                  Defaults to <tt>field_id</tt> + '_auto_complete'
-    # <tt>:with</tt>::                 A JavaScript expression specifying the
-    #                                  parameters for the XMLHttpRequest. This defaults
-    #                                  to 'fieldname=value'.
-    # <tt>:frequency</tt>::            Determines the time to wait after the last keystroke
-    #                                  for the AJAX request to be initiated.
-    # <tt>:indicator</tt>::            Specifies the DOM ID of an element which will be
-    #                                  displayed while auto complete is running.
-    # <tt>:tokens</tt>::               A string or an array of strings containing
-    #                                  separator tokens for tokenized incremental
-    #                                  auto completion. Example: <tt>:tokens => ','</tt> would
-    #                                  allow multiple auto completion entries, separated
-    #                                  by commas.
-    # <tt>:min_chars</tt>::            The minimum number of characters that should be
-    #                                  in the input field before an Ajax call is made
-    #                                  to the server.
-    # <tt>:on_hide</tt>::              A Javascript expression that is called when the
-    #                                  auto completion div is hidden. The expression
-    #                                  should take two variables: element and update.
-    #                                  Element is a DOM element for the field, update
-    #                                  is a DOM element for the div from which the
-    #                                  innerHTML is replaced.
-    # <tt>:on_show</tt>::              Like on_hide, only now the expression is called
-    #                                  then the div is shown.
-    # <tt>:after_update_element</tt>:: A Javascript expression that is called when the
-    #                                  user has selected one of the proposed values.
-    #                                  The expression should take two variables: element and value.
-    #                                  Element is a DOM element for the field, value
-    #                                  is the value selected by the user.
-    # <tt>:select</tt>::               Pick the class of the element from which the value for
-    #                                  insertion should be extracted. If this is not specified,
-    #                                  the entire element is used.
-    # <tt>:method</tt>::               Specifies the HTTP verb to use when the auto completion
-    #                                  request is made. Defaults to POST.
-    def auto_complete_field(field_id, options = {})
-      function =  "var #{field_id}_auto_completer = new Ajax.Autocompleter("
-      function << "'#{field_id}', "
-      function << "'" + (options[:update] || "#{field_id}_auto_complete") + "', "
-      function << "'#{url_for(options[:url])}'"
-
-      js_options = {}
-      js_options[:tokens] = array_or_string_for_javascript(options[:tokens])            if options[:tokens]
-      js_options[:callback]   = "function(element, value) { return #{options[:with]} }" if options[:with]
-      js_options[:indicator]  = "'#{options[:indicator]}'"                              if options[:indicator]
-      js_options[:select]     = "'#{options[:select]}'"                                 if options[:select]
-      js_options[:paramName]  = "'#{options[:param_name]}'"                             if options[:param_name]
-      js_options[:frequency]  = "#{options[:frequency]}"                                if options[:frequency]
-      js_options[:method]     = "'#{options[:method].to_s}'"                            if options[:method]
-
-      { :after_update_element => :afterUpdateElement,
-        :on_show => :onShow, :on_hide => :onHide, :min_chars => :minChars }.each do |k,v|
-        js_options[v] = options[k] if options[k]
-      end
+      url_options = url_options.to_h if url_options.respond_to?(:permit)  # convert ActionController::Parameters if given
+      url_options = url_options.merge(:order => new_sort)
 
-      function << (', ' + options_for_javascript(js_options) + ')')
+      as = raw(as) if defined?(RailsXss)
 
-      javascript_tag(function)
-    end
-
-    def auto_complete_field_jquery(method, url, options = {})
-      function = <<-JAVASCRIPT
-        $.widget( "custom.catcomplete", $.ui.autocomplete, {
-          _renderMenu: function( ul, items ) {
-            var self = this,
-            currentCategory = "";
-            $.each( items, function( index, item ) {
-              if ( item.category != undefined && item.category != currentCategory ) {
-                ul.append( "<li class='ui-autocomplete-category'>" + item.category + "</li>" );
-                currentCategory = item.category;
-              }
-              if ( item.error != undefined ) {
-                ul.append( "<li class='ui-autocomplete-error'>" + item.error + "</li>" );
-              }
-              if( item.completed != undefined ) {
-                $( "<li></li>" ).data( "item.autocomplete", item )
-  				      .append( "<a>" + "<strong class='ui-autocomplete-completed'>" + item.completed + "</strong>" + item.part + "</a>" )
-  				      .appendTo( ul );
-              } else {
-                if(typeof(self._renderItemData) === "function") {
-                  self._renderItemData( ul, item );
-                } else {
-                  self._renderItem( ul, item );
-                }
-              }
-            });
-          }
-        });
-
-        $("##{method}")
-        .catcomplete({
-  			source: function( request, response ) {	$.getJSON( "#{url}", { #{method}: request.term }, response );	},
-  			minLength: #{options[:min_length] || 0},
-        delay: #{options[:delay] || 200},
-        select: function(event, ui) { $( this ).catcomplete( "search" , ui.item.value); },
-        search: function(event, ui) { $(".auto_complete_clear").hide(); },
-        open: function(event, ui) { $(".auto_complete_clear").show(); }
-        });
-
-        $("##{method}").bind( "focus", function( event ) {
-          if( $( this )[0].value == "" ) {
-  					$( this ).catcomplete( "search" );
-          }
-  			});
-
-      JAVASCRIPT
-
-      javascript_tag(function)
-    end
-
-    def auto_complete_clear_value_button(field_id)
-      html_options = {:tabindex => '-1',:class=>"auto_complete_clear",:title =>'Clear Search', :onclick=>"document.getElementById('#{field_id}').value = '';"}
-      a_link("", "#", html_options)
+      a_link(as, html_escape(url_for(url_options)),html_options)
     end
 
     def a_link(name, href, html_options)
@@ -182,41 +69,5 @@ module ScopedSearch
       link = "<a href=\"#{href}\"#{tag_options}>#{name}</a>"
       return link.respond_to?(:html_safe) ? link.html_safe : link
     end
-
-    # Use this method in your view to generate a return for the AJAX auto complete requests.
-    #
-    # The auto_complete_result can of course also be called from a view belonging to the
-    # auto_complete action if you need to decorate it further.
-    def auto_complete_result(entries, phrase = nil)
-      return unless entries
-      items = entries.map { |entry| content_tag("li", phrase ? highlight(entry, phrase) : h(entry)) }
-      content_tag("ul", items)
-    end
-
-    # Wrapper for text_field with added AJAX auto completion functionality.
-    #
-    # In your controller, you'll need to define an action called
-    # auto_complete_method to respond the AJAX calls,
-    def auto_complete_field_tag(method, val,tag_options = {}, completion_options = {})
-      auto_completer_options = { :url => { :action => "auto_complete_#{method}" } }.update(completion_options)
-      options = tag_options.merge(:class => "auto_complete_input " << tag_options[:class].to_s)
-      text_field_tag(method, val,options) +
-          auto_complete_clear_value_button(method) +
-          content_tag("div", "", :id => "#{method}_auto_complete", :class => "auto_complete") +
-          auto_complete_field(method, auto_completer_options)
-    end
-
-    # Wrapper for text_field with added JQuery auto completion functionality.
-    #
-    # In your controller, you'll need to define an action called
-    # auto_complete_method to respond the JQuery calls,
-    def auto_complete_field_tag_jquery(method, val,tag_options = {}, completion_options = {})
-      url = url_for(:action => "auto_complete_#{method}", :filter => completion_options[:filter])
-      options = tag_options.merge(:class => "auto_complete_input " << tag_options[:class].to_s)
-      text_field_tag(method, val, options) + auto_complete_clear_value_button(method) +
-          auto_complete_field_jquery(method, url, completion_options)
-    end
-    deprecate :auto_complete_field_tag_jquery, :auto_complete_field_tag, :auto_complete_result
-
   end
 end

data/lib/scoped_search/validators.rb

@@ -0,0 +1,7 @@
+module ScopedSearch
+  # This class will be used to store standard validators.
+  class Validators
+    NUMERIC = ->(value) { !!(value =~ ScopedSearch::Definition::NUMERICAL_REGXP) }
+    INTEGER = ->(value) { !!(value =~ ScopedSearch::Definition::INTEGER_REGXP) }
+  end
+end

data/lib/scoped_search/version.rb

@@ -1,3 +1,3 @@
 module ScopedSearch
-  VERSION = "3.3.0"
+  VERSION = "4.0.0"
 end

data/scoped_search.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = '>= 1.9.3'
-  gem.add_runtime_dependency('activerecord', '>= 3.2.0')
+  gem.required_ruby_version = '>= 2.0.0'
+  gem.add_runtime_dependency('activerecord', '>= 4.2.0')
   gem.add_development_dependency('rspec', '~> 3.0')
   gem.add_development_dependency('rake')
 

data/spec/integration/auto_complete_spec.rb

@@ -37,20 +37,20 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
         scoped_search :on => [:string, :date]
         scoped_search :on => [:int], :complete_value => true
-        scoped_search :on => :another,  :default_operator => :eq, :alias => :alias
+        scoped_search :on => :another,  :default_operator => :eq, :aliases => [:alias], :complete_value => true
         scoped_search :on => :explicit, :only_explicit => true, :complete_value => true
         scoped_search :on => :deprecated, :complete_enabled => false
-        scoped_search :on => :related, :in => :bars, :rename => 'bars.related'.to_sym
-        scoped_search :on => :other_a, :in => :bars, :rename => 'bars.other_a'.to_sym
-        scoped_search :on => :other_b, :in => :bars, :rename => 'bars.other_b'.to_sym
-        scoped_search :on => :other_c, :in => :bars, :rename => 'bars.other_c'.to_sym
+        scoped_search :on => :related, :relation => :bars, :rename => 'bars.related'.to_sym
+        scoped_search :on => :other_a, :relation => :bars, :rename => 'bars.other_a'.to_sym
+        scoped_search :on => :other_b, :relation => :bars, :rename => 'bars.other_b'.to_sym
+        scoped_search :on => :other_c, :relation => :bars, :rename => 'bars.other_c'.to_sym
       end
 
       class ::Infoo < ::Foo
       end
 
       @foo_1 = Foo.create!(:string => 'foo', :another => 'temp 1', :explicit => 'baz', :int => 9  , :date => 'February 8, 2011' , :unindexed => 10)
-      Foo.create!(:string => 'bar', :another => 'temp 2', :explicit => 'baz', :int => 22  , :date => 'February 10, 2011', :unindexed => 10)
+      Foo.create!(:string => 'bar', :another => 'temp "2"', :explicit => 'baz', :int => 22  , :date => 'February 10, 2011', :unindexed => 10)
       Foo.create!(:string => 'baz', :another => nil,      :explicit => nil  , :int => nil, :date => nil                 , :unindexed => nil)
       20.times { Foo.create!(:explicit => "aaa") }
 
@@ -143,6 +143,10 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       it "should complete values should contain baz" do
         Foo.complete_for('explicit = ').should contain('explicit =  baz')
       end
+
+      it "should complete values with quotes where required" do
+        Foo.complete_for('alias = ').should contain('alias =  "temp \"2\""')
+      end
     end
 
     context 'auto complete relations' do

data/spec/integration/key_value_querying_spec.rb

@@ -32,7 +32,7 @@ require "spec_helper"
             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
+            scoped_search :relation => :facts, :on => :value, :rename => :facts, :in_key => :keys, :on_key => :name, :complete_value => true
           end
           class ::MyItem < ::Item
           end

data/spec/integration/ordinal_querying_spec.rb

@@ -114,16 +114,6 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @class.search_for('date = 09-01-02').length.should == 1
       end
 
-      if RUBY_VERSION.to_f == 1.8
-        it "should accept MM/DD/YY as date format" do
-          @class.search_for('date = 01/02/09').length.should == 1
-        end
-
-        it "should accept MM/DD/YYYY as date format" do
-          @class.search_for('date = 01/02/2009').length.should == 1
-        end
-      end
-
       it "should accept YYYY/MM/DD as date format" do
         @class.search_for('date = 2009/01/02').length.should == 1
       end

data/spec/integration/relation_querying_spec.rb

@@ -46,7 +46,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         ActiveRecord::Migration.create_table(:loos) { |t| t.string :foo; t.integer :har_id }
         class Loo < ActiveRecord::Base
           belongs_to :har
-          scoped_search :in => :har, :on => :related
+          scoped_search :relation => :har, :on => :related
         end
 
         @har_record = Har.create!(:related => 'bar')
@@ -93,7 +93,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         class Goo < ActiveRecord::Base
           has_many :jars
           scoped_search :on => :foo
-          scoped_search :in => :jars, :on => :related
+          scoped_search :relation => :jars, :on => :related
         end
 
         @foo_1 = Goo.create!(:foo => 'foo')
@@ -158,7 +158,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         class Hoo < ActiveRecord::Base
           has_one :car
           scoped_search :on => :foo
-          scoped_search :in => :car, :on => :related
+          scoped_search :relation => :car, :on => :related
         end
 
         @hoo_1 = Hoo.create!(:foo => 'foo')
@@ -206,7 +206,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         # The class on which to call search_for
         class Joo < ActiveRecord::Base
           has_and_belongs_to_many :dars
-          scoped_search :in => :dars, :on => :related
+          scoped_search :relation => :dars, :on => :related
         end
 
         @joo_1 = Joo.create!(:foo => 'foo')
@@ -265,7 +265,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
           # as an indication for a polymorphic relation.
           has_many :bazs, :through => :mars, :source => :baz
 
-          scoped_search :in => :bazs, :on => :related
+          scoped_search :relation => :bazs, :on => :related
         end
 
         @koo_1 = Koo.create!(:foo => 'foo')
@@ -316,7 +316,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
           belongs_to :zar
           has_many :bazs, :through => :zar
 
-          scoped_search :in => :bazs, :on => :related
+          scoped_search :relation => :bazs, :on => :related
         end
 
         baz_1 = Baz.create(:related => 'baz')
@@ -362,7 +362,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
           has_many :taggables
           has_many :dogs, :through => :taggables, :source => :taggable, :source_type => 'Dog'
 
-          scoped_search :in => :dogs, :on => :related, :rename => :dog
+          scoped_search :relation => :dogs, :on => :related, :rename => :dog
         end
 
         # The class on which to call search_for
@@ -370,7 +370,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
           has_many :taggables, :as => :taggable
           has_many :tags, :through => :taggables
 
-          scoped_search :in => :tags, :on => :foo
+          scoped_search :relation => :tags, :on => :foo
         end
 
         class Cat < ActiveRecord::Base
@@ -438,7 +438,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
           has_many :zaps
           has_many :pazs, :through => :zaps
 
-          scoped_search :in => :pazs, :on => :related
+          scoped_search :relation => :pazs, :on => :related
         end
 
         @moo_1 = Moo.create!(:foo => 'foo')
@@ -471,6 +471,59 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
     end
 
+    context 'querying a :has_many => :through relation with same name on target class with custom condition' do
+
+      before do
+
+        # Create some tables
+        ActiveRecord::Migration.create_table(:user_groups) { |t| t.integer :user_id; t.integer :group_id }
+        ActiveRecord::Migration.create_table(:conflicts) { |t| t.integer :group_id; t.integer :user_id }
+        ActiveRecord::Migration.create_table(:groups) { |t| t.string :related; t.integer :user_id }
+        ActiveRecord::Migration.create_table(:users) { |t| t.string :foo }
+
+        # The related classes
+        class UserGroup < ActiveRecord::Base; belongs_to :user; belongs_to :group; end
+        class Conflict < ActiveRecord::Base; belongs_to :user; belongs_to :group; end
+        class Group < ActiveRecord::Base
+          has_many :user_groups
+          has_many :users, :through => :conflicts, :source_type => 'User', :source => :user
+        end
+
+        # The class on which to call search_for
+        class User < ActiveRecord::Base
+          has_many :user_groups
+          has_many :groups, :through => :user_groups
+
+          scoped_search :relation => :groups, :on => :related
+        end
+
+        @user_1 = User.create!(:foo => 'foo')
+        @user_2 = User.create!(:foo => 'foo too')
+        @user_3 = User.create!(:foo => 'foo three')
+
+        @group_1 = Group.create(:related => 'value')
+        @group_2 = Group.create(:related => 'value too!')
+
+        @bar_1 = UserGroup.create!(:user => @user_1, :group => @group_1)
+        @bar_2 = UserGroup.create!(:user => @user_1)
+        @bar_3 = UserGroup.create!(:user => @user_2, :group => @group_1)
+        @bar_3 = UserGroup.create!(:user => @user_2, :group => @group_2)
+        @bar_3 = UserGroup.create!(:user => @user_2, :group => @group_2)
+        @bar_4 = UserGroup.create!(:user => @user_3)
+      end
+
+      after do
+        ActiveRecord::Migration.drop_table(:user_groups)
+        ActiveRecord::Migration.drop_table(:users)
+        ActiveRecord::Migration.drop_table(:groups)
+        ActiveRecord::Migration.drop_table(:conflicts)
+      end
+
+      it "should find the one record that is related based on forward groups relation" do
+        User.search_for('related=value AND related="value too!"').length.should == 1
+      end
+    end
+
 
     context 'querying a :has_many => :through relation with modules' do
 
@@ -492,7 +545,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
             has_many :bazs, :through => :mars
             self.table_name = "zan_koos"
 
-            scoped_search :in => :bazs, :on => :related
+            scoped_search :relation => :bazs, :on => :related
           end
         end
 

data/spec/integration/string_querying_spec.rb

@@ -16,7 +16,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
           :description => :string
           ) do |klass|
         klass.scoped_search :on => :string
-        klass.scoped_search :on => :another,  :default_operator => :eq, :alias => :alias, :default_order => :desc
+        klass.scoped_search :on => :another,  :default_operator => :eq, :aliases => [:alias], :default_order => :desc
         klass.scoped_search :on => :explicit, :only_explicit => true
         klass.scoped_search :on => :description
       end

data/spec/unit/ast_spec.rb

@@ -150,7 +150,7 @@ describe ScopedSearch::QueryLanguage::AST::OperatorNode do
     end
 
     it "should raise an error of the LHS is requested" do
-      lambda { @node.lhs }.should raise_error
+      lambda { @node.lhs }.should raise_error(ScopedSearch::Exception, "Operator does not have a LHS")
     end
   end
 
@@ -187,11 +187,11 @@ describe ScopedSearch::QueryLanguage::AST::OperatorNode do
     end
 
     it "should raise an error of the LHS is requested" do
-      lambda { @node.lhs }.should raise_error
+      lambda { @node.lhs }.should raise_error(ScopedSearch::Exception, "Operators with more than 2 children do not have LHS/RHS")
     end
 
     it "should raise an error of the RHS is requested" do
-      lambda { @node.rhs }.should raise_error
+      lambda { @node.rhs }.should raise_error(ScopedSearch::Exception, "Operators with more than 2 children do not have LHS/RHS")
     end
   end
 end

data/spec/unit/definition_spec.rb

@@ -9,6 +9,42 @@ describe ScopedSearch::Definition do
   end
 
   describe ScopedSearch::Definition::Field do
+    describe '#initialize' do
+      it "should raise an exception with missing field or 'on' keyword" do
+        lambda {
+          @definition.define
+        }.should raise_error(ArgumentError, "Missing field or 'on' keyword argument")
+      end
+
+      it "should raise an exception with unknown keyword arguments" do
+        lambda {
+          @definition.define(:field, :nonexisting => 'foo')
+        }.should raise_error(ArgumentError, "Unknown arguments to scoped_search: nonexisting")
+      end
+
+      it "should alias :in to :relation" do
+        ActiveSupport::Deprecation.should_receive(:warn).with("'in' argument deprecated, prefer 'relation' since scoped_search 4.0.0", anything)
+        @definition.define(:field, :in => 'foo').relation.should eq('foo')
+      end
+
+      it "should accept :relation" do
+        ActiveSupport::Deprecation.should_not_receive(:warn)
+        @definition.define(:field, :relation => 'foo').relation.should eq('foo')
+      end
+
+      it "should alias :alias to :aliases" do
+        ActiveSupport::Deprecation.should_receive(:warn).with("'alias' argument deprecated, prefer aliases: [..] since scoped_search 4.0.0", anything)
+        @definition.define(:field, :alias => 'foo')
+        @definition.fields.keys.should eq([:field, :foo])
+      end
+
+      it "should accept :relation" do
+        ActiveSupport::Deprecation.should_not_receive(:warn)
+        @definition.define(:field, :aliases => ['foo'])
+        @definition.fields.keys.should eq([:field, :foo])
+      end
+    end
+
     describe '#column' do
       it "should raise an exception when using an unknown field" do
         lambda {

data/spec/unit/query_builder_spec.rb

@@ -33,4 +33,26 @@ describe ScopedSearch::QueryBuilder do
     @definition.klass.connection.stub("class").and_return(connection)
     ScopedSearch::QueryBuilder.class_for(@definition).should == ScopedSearch::QueryBuilder::PostgreSQLAdapter
   end
+
+  it "should validate value if validator selected" do
+    field = double('field')
+    field.stub(:only_explicit).and_return(true)
+    field.stub(:field).and_return(:test_field)
+    field.stub(:validator).and_return(->(_value) { false })
+
+    @definition.stub(:field_by_name).and_return(field)
+
+    lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = test_val') }.should raise_error(ScopedSearch::QueryNotSupported)
+  end
+
+  it "should display custom error from validator" do
+    field = double('field')
+    field.stub(:only_explicit).and_return(true)
+    field.stub(:field).and_return(:test_field)
+    field.stub(:validator).and_return(->(_value) { raise ScopedSearch::QueryNotSupported, 'my custom message' })
+
+    @definition.stub(:field_by_name).and_return(field)
+
+    lambda { ScopedSearch::QueryBuilder.build_query(@definition, 'test_field = test_val') }.should raise_error('my custom message')
+  end
 end

data/spec/unit/rails_helper_spec.rb

@@ -92,4 +92,24 @@ describe ScopedSearch::RailsHelper do
     params[:order] = "field DESC"
     sort("field")
   end
+
+  context 'with ActionController::Parameters' do
+    let(:ac_params) { double('ActionController::Parameters') }
+
+    it "should call to_h on passed params object" do
+      should_receive(:url_for).with(
+        "controller" => "resources",
+        "action" => "search",
+        "walrus" => "unicorns",
+        "order" => "field ASC"
+      ).and_return("/example")
+
+      params[:walrus] = "unicorns"
+
+      ac_params.should_receive(:respond_to?).with(:permit).and_return(true)
+      ac_params.should_receive(:to_h).and_return(params)
+
+      sort("field", url_options: ac_params)
+    end
+  end
 end

data/spec/unit/validators_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe ScopedSearch::Validators do
+  describe 'NUMERIC' do
+    it 'should accept integer value' do
+      ScopedSearch::Validators::NUMERIC.call('123').should eq(true)
+    end
+
+    it 'should accept float value' do
+      ScopedSearch::Validators::NUMERIC.call('123.5').should eq(true)
+    end
+
+    it 'should reject string value' do
+      ScopedSearch::Validators::NUMERIC.call('abc').should eq(false)
+    end
+  end
+
+  describe 'INTEGER' do
+    it 'should accept numeric value' do
+      ScopedSearch::Validators::INTEGER.call('123').should eq(true)
+    end
+
+    it 'should reject string value' do
+      ScopedSearch::Validators::INTEGER.call('abc').should eq(false)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_search
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Amos Benari
@@ -10,48 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -77,14 +77,11 @@ extra_rdoc_files:
 - CONTRIBUTING.rdoc
 - LICENSE
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - CONTRIBUTING.rdoc
 - Gemfile
-- Gemfile.activerecord32
-- Gemfile.activerecord40
-- Gemfile.activerecord41
 - Gemfile.activerecord42
 - Gemfile.activerecord50
 - LICENSE
@@ -105,6 +102,7 @@ files:
 - lib/scoped_search/query_language/tokenizer.rb
 - lib/scoped_search/rails_helper.rb
 - lib/scoped_search/railtie.rb
+- lib/scoped_search/validators.rb
 - lib/scoped_search/version.rb
 - scoped_search.gemspec
 - spec/database.jruby.yml
@@ -128,33 +126,34 @@ files:
 - spec/unit/query_builder_spec.rb
 - spec/unit/rails_helper_spec.rb
 - spec/unit/tokenizer_spec.rb
+- spec/unit/validators_spec.rb
 homepage: https://github.com/wvanbergen/scoped_search/wiki
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - scoped_search
-- --main
+- "--main"
 - README.rdoc
-- --line-numbers
-- --inline-source
+- "--line-numbers"
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Easily search you ActiveRecord models with a simple query language using
@@ -181,3 +180,4 @@ test_files:
 - spec/unit/query_builder_spec.rb
 - spec/unit/rails_helper_spec.rb
 - spec/unit/tokenizer_spec.rb
+- spec/unit/validators_spec.rb

data/Gemfile.activerecord32

@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 3.2.0'
-
-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/Gemfile.activerecord40

@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 4.0.0'
-
-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/Gemfile.activerecord41

@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-gemspec
-
-gem 'activerecord', '~> 4.1.0'
-
-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