discerner 1.2.2 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzBlMjgzOTM3YzMyMjgzOTE0OTQ4MGUyZGUxYmZhNTA4MjRkMzUzZA==
-  data.tar.gz: !binary |-
-    MzE3NWQ2YmZjZTZjZWFiZWMwMDAyMWM1M2ZkMjZmZDllYmE2NDVlNw==
+SHA1:
+  metadata.gz: 437463090eedaa431f1a8f6ee6756e032c76fc66
+  data.tar.gz: 81b389a852f9dfd70614aa5ac7fbca4be56bb14b
 SHA512:
-  metadata.gz: !binary |-
-    M2JlYmI0MThiOGZjMzZhNmJkNGZiYTVlNDg4N2Y5Yzg3ZDg2NzkxNmI4YWYx
-    ZGNmYWE4MDgzOTE3NzMyNGM0YjM3Nzk1YjM0NmZlMTVkYWNjNTU3YmM4MzI4
-    MTEyYTFhZGRkN2NiMzk1NWJmMTY0ZDE3Y2Y5NGE3ODZhNTVmM2U=
-  data.tar.gz: !binary |-
-    NDg2MDU5Yzk4MjIyZjFkOGEwNTg0ZGViODdkODgyZDc4MTcwZmQxMzhjMTYx
-    NjI4NTMxNThiM2FjMThiMmQyY2I1YWUyOTUzM2EwODdmMThjZGM5OGUxYWE3
-    ZDQzYjhhZGYzZjUwNWMwMTlmN2RmOGQ4NTg1OGRjODYzNGNlNzY=
+  metadata.gz: 5eddf1abe8dd28965b2ef2e62ea6f51d887d0ed7b8a56f7e221da15253d841b0e6afd7b7d861e9af960a9348ffd7bf13b70bde43d6a32fa449416d552eb9bb48
+  data.tar.gz: 408d70a34b256cd287f0439cde4586c0716ecfadd400b3a4bd49a1be022f1e23f1335a9cb7ff7ba86822ece06e17388b8cc4ed3cf7092a530bc6eae8de993d1e

data/app/assets/javascripts/discerner/application.js

@@ -12,9 +12,6 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require jquery.ui.widget
-//= require jquery.ui.autocomplete
-//= require jquery.ui.datepicker
-//= require jquery.ui.button
+//= require jquery-ui
 //= require discerner/jquery/jquery.blockUI
 //= require_tree .

data/app/assets/javascripts/discerner/search_parameter.js

@@ -110,6 +110,7 @@ Discerner.SearchParameter.UI = function (config) {
     }
     else if ($(selected_option).hasClass('list')){
       $($(predicate).find('.tmp_link')).remove();
+      console.log(parametersUrl.sub({ question_id: this.value }))
       $.get(parametersUrl.sub({ question_id: this.value }), function (data) {
         $.each(data.parameter_values, function() {
           $(add_button).click();

data/app/assets/javascripts/discerner/search_parameter_value.js

@@ -39,12 +39,8 @@ Discerner.SearchParameterValue.UI = function (config) {
         $(config.container).find('.additional_value').hide();
       } else if ($(selectedParameter).hasClass('combobox')) {                         // combobox parameters
         var input = $(row).find('input.parameter_value_id');
-        var offset = $(row).offset();
         $(config.container).find('.additional_value').hide();
         if (input.length > 0) {
-            $('.discerner-spinner').css({ left: offset.left });
-            $('.discerner-spinner').css({ top: offset.top });
-            $('.discerner-spinner').removeClass('hide');
             $.get( parametersUrl.sub({ question_id: selectedParameter.val(), search_parameter_value_id: input.closest('tr.search_parameter_value').attr('id') }), function( data ) {
               container = $(input).closest('td');
               $(input).detach();
@@ -52,7 +48,6 @@ Discerner.SearchParameterValue.UI = function (config) {
               container.find('select').attr('id', input.attr('id')).attr('name', input.attr('name')).combobox({ watermark:'a value'});
               handleParameterValuelPopupListClick(row);
               handleParameterValueAutocompleterButtonLink(row);
-              $('.discerner-spinner').addClass('hide');
             });
           }
         $(config.container).find('.parameter_value, .remove').show();

data/app/assets/stylesheets/discerner/application.css

@@ -9,8 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require jquery.ui.autocomplete
- *= require jquery.ui.datepicker
- *= require jquery.ui.button
+ *= require jquery-ui
  *= require_tree .
  */

data/app/assets/stylesheets/discerner/discerner.sass

@@ -49,11 +49,3 @@
   :height 200px
   :width 410px
 
-.discerner-spinner
-  :position fixed
-  :text-align center
-  :padding 10px
-  :margin-left -50px
-  :margin-top -50px
-  :z-index 2
-  :overflow auto

data/app/views/discerner/searches/_form.html.haml

@@ -1,4 +1,3 @@
-= image_tag asset_path('discerner/ajax-loader.gif'), class: 'discerner-spinner hide'
 - unless @discerner_search.blank?
   = render 'discerner/shared/error_messages', :object => @discerner_search
 

data/lib/discerner/methods/controllers/parameters_controller.rb

@@ -7,7 +7,7 @@ module Discerner
         end
 
         def values
-          @parameter_values = @parameter.parameter_values.joins('LEFT JOIN discerner_parameter_value_categorizations ON discerner_parameter_values.id = discerner_parameter_value_categorizations.parameter_value_id LEFT JOIN discerner_parameter_value_categories ON discerner_parameter_value_categorizations.parameter_value_category_id = discerner_parameter_value_categories.id ').not_deleted.ordered_by_name.select('discerner_parameter_values.*, discerner_parameter_value_categories.name AS category_name')
+          @parameter_values = @parameter.parameter_values.includes(:parameter_value_category).not_deleted.ordered_by_name
           @search_parameter_value_id = params[:search_parameter_value_id]
           @searchable_parameter_values = {}
           @searchable_parameter_values[@parameter.id] = @parameter_values

data/lib/discerner/methods/controllers/searches_controller.rb

@@ -17,7 +17,7 @@ module Discerner
         end
 
         def create
-          @discerner_search           = Discerner::Search.new(params[:search])
+          @discerner_search           = Discerner::Search.new(search_params)
           @discerner_search.username  = discerner_user.username unless discerner_user.blank?
 
           set_searchable_dictionaries
@@ -60,7 +60,7 @@ module Discerner
           set_searchable_dictionaries
           set_searchables
           respond_to do |format|
-            if @discerner_search.update_attributes(params[:search])
+            if @discerner_search.update_attributes(search_params)
               format.html { redirect_to(edit_search_path(@discerner_search), :notice => 'Search was successfully updated.') }
               format.js
             else
@@ -186,11 +186,10 @@ module Discerner
             searchable_values = {}
 
             # getting all values at once to save database calls
-            values_available = Discerner::ParameterValue.joins('LEFT JOIN discerner_parameter_value_categorizations ON discerner_parameter_values.id = discerner_parameter_value_categorizations.parameter_value_id LEFT JOIN discerner_parameter_value_categories ON discerner_parameter_value_categorizations.parameter_value_category_id = discerner_parameter_value_categories.id ').not_deleted.where(:parameter_id => @searchable_parameters.map(&:id)).ordered_by_parameter_and_name.select('discerner_parameter_values.*, discerner_parameter_value_categories.name AS category_name').to_a
-
+            values_available = Discerner::ParameterValue.includes(:parameter_value_category).not_deleted.where(:parameter_id => @searchable_parameters.map(&:id)).ordered_by_parameter_and_name.to_a
             values_used = []
             if @discerner_search && @discerner_search.persisted?
-              values_used = Discerner::ParameterValue.joins('LEFT JOIN discerner_parameter_value_categorizations ON discerner_parameter_values.id = discerner_parameter_value_categorizations.parameter_value_id LEFT JOIN discerner_parameter_value_categories ON discerner_parameter_value_categorizations.parameter_value_category_id = discerner_parameter_value_categories.id ').joins(:search_parameter_values => :search_parameter).where(:discerner_search_parameters => {:search_id => @discerner_search.id}).ordered_by_parameter_and_name.select('discerner_parameter_values.*, discerner_parameter_value_categories.name AS category_name').to_a
+              values_used = Discerner::ParameterValue.includes(:parameter_value_category).joins(:search_parameter_values => :search_parameter).where(:discerner_search_parameters => {:search_id => @discerner_search.id}).ordered_by_parameter_and_name.to_a
             end
 
             @searchable_parameters.each do |sp|
@@ -199,6 +198,13 @@ module Discerner
             end
             searchable_values
           end
+
+          def search_params
+            params.require(:search).permit(:id, :dictionary_id, :deleted_at, :name, :username, :_destroy,
+              search_combinations_attributes: [:display_order, :operator_id, :combined_search_id, :_destroy],
+              search_parameters_attributes: [:display_order, :parameter_id, :_destroy, :id,
+                search_parameter_values_attributes: [:id, :display_order, :operator_id, :chosen, :parameter_value_id, :value, :additional_value, :_destroy]])
+          end
      end
     end
   end

data/lib/discerner/methods/helpers/searches_helper.rb

@@ -39,8 +39,7 @@ module Discerner
         def operator_options(type=nil)
           operators = Discerner::Operator.not_deleted
           unless type.blank?
-            operators = operators.joins(:parameter_types).where("discerner_parameter_types.name in (?)", type).
-            select('DISTINCT text, discerner_operators.id, discerner_operators.operator_type')
+            operators = operators.joins(:parameter_types).where("discerner_parameter_types.name in (?)", type)
           end
           operators.includes(:parameter_types).uniq.map {|o| [o.text, o.id, {:class => o.css_class_name}]}
         end
@@ -80,7 +79,15 @@ module Discerner
         end
 
         def parameter_value_options(searchable_values, base_id=nil)
-          searchable_values.map { |pv| [(pv.category_name.nil? ? pv.name : "#{pv.category_name} - #{pv.name}"), pv.id, base_id.nil? ? {} : { id: searchable_object_index(pv, base_id) }] }
+          options = []
+          searchable_values.each do |pv|
+            option = [pv.display_name, pv.id]
+            html_options = {}
+            html_options[:id] = searchable_object_index(pv, base_id) unless base_id.blank?
+            option << html_options
+            options << option
+          end
+          options
         end
 
         def searchable_object_index(object, base_id=nil)

data/lib/discerner/methods/models/dictionary.rb

@@ -14,9 +14,6 @@ module Discerner
 
           # Hooks
           base.send :after_commit, :cascade_delete_parameter_categories, :on => :update, :if => Proc.new { |record| record.previous_changes.include?('deleted_at') }
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :name, :deleted_at
         end
 
         # Instance Methods

data/lib/discerner/methods/models/export_parameter.rb

@@ -15,9 +15,6 @@ module Discerner
 
           # Validations
           base.send :validates, :parameter, :search, :presence => { :message => "for export parameter can't be blank" }
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :parameter_id, :search_id, :parameter, :search
         end
 
         # Instance Methods

data/lib/discerner/methods/models/operator.rb

@@ -14,9 +14,6 @@ module Discerner
           base.send :validates, :symbol, :presence => true, :uniqueness => {:message => "for operator has already been taken"}
           base.send :validates, :operator_type, :presence => true
           base.send :validate,  :type_supported?
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :operator_type, :symbol, :text, :deleted_at
         end
 
         # Instance Methods

data/lib/discerner/methods/models/parameter.rb

@@ -25,10 +25,6 @@ module Discerner
 
           # Hooks
           base.send :after_commit, :cascade_delete_parameter_values, :on => :update, :if => Proc.new { |record| record.previous_changes.include?('deleted_at') }
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :name, :parameter_category, :parameter_category_id, :parameter_type, :parameter_type_id,
-                    :search_model, :search_method, :unique_identifier, :export_model, :export_method
         end
 
         # Instance Methods

data/lib/discerner/methods/models/parameter_category.rb

@@ -14,15 +14,12 @@ module Discerner
           base.send :validates, :dictionary, :presence => { :message => "for parameter category can't be blank" }
 
           # Scopes
-          base.send(:scope, :searchable, -> {base.includes(:parameters).where('discerner_parameters.search_model is not null and discerner_parameters.search_method is not null and discerner_parameters.deleted_at is null')})
-          base.send(:scope, :exportable, -> {base.includes(:parameters).where('discerner_parameters.export_model is not null and discerner_parameters.export_method is not null and discerner_parameters.deleted_at is null')})
+          base.send(:scope, :searchable, -> {base.includes(:parameters).where('discerner_parameters.search_model is not null and discerner_parameters.search_method is not null and discerner_parameters.deleted_at is null').references(:discerner_parameters)})
+          base.send(:scope, :exportable, -> {base.includes(:parameters).where('discerner_parameters.export_model is not null and discerner_parameters.export_method is not null and discerner_parameters.deleted_at is null').references(:discerner_parameters)})
           base.send(:scope, :ordered_by_name, -> {base.order('discerner_parameter_categories.name ASC')})
 
           # Hooks
           base.send :after_commit, :cascade_delete_parameters, :on => :update, :if => Proc.new { |record| record.previous_changes.include?('deleted_at') }
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :deleted_at, :dictionary, :dictionary_id, :name
         end
 
         # Instance Methods

data/lib/discerner/methods/models/parameter_type.rb

@@ -12,9 +12,6 @@ module Discerner
           # Validations
           base.send :validates, :name, :presence => true, :uniqueness => {:message => "for parameter type has already been taken"}
           base.send :validate,  :name_supported?
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :deleted_at, :name
         end
 
         # Instance Methods

data/lib/discerner/methods/models/parameter_value.rb

@@ -26,9 +26,6 @@ module Discerner
           base.send :after_commit, :update_search_parameter_values, :on => :update, :if => Proc.new { |record| record.previous_changes.include?('deleted_at') }
           base.send :scope, :categorized, -> {base.joins(:parameter_value_category)}
           base.send :scope, :uncategorized, -> {base.includes(:parameter_value_category).where(:discerner_parameter_value_categories => {:name => nil})}
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :search_value, :name, :parameter, :parameter_id
         end
 
         # Instance Methods

data/lib/discerner/methods/models/parameter_value_categorization.rb

@@ -11,9 +11,6 @@ module Discerner
 
           # Validations
           base.send :validates_presence_of, :parameter_value_category, :parameter_value
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :parameter_value_category_id, :parameter_value_id, :parameter_value_category, :parameter_value
         end
       end
     end

data/lib/discerner/methods/models/parameter_value_category.rb

@@ -18,9 +18,6 @@ module Discerner
           base.send :validates_presence_of, :parameter, :unique_identifier, :name
           base.send :validates, :unique_identifier, :uniqueness => {:scope => [:parameter_id, :deleted_at], :message => "for parameter value category has already been taken"}
           base.send :validate, :parameter_value_belongs_to_parameter
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :parameter, :parameter_id, :unique_identifier, :name
         end
 
         def css_class

data/lib/discerner/methods/models/search.rb

@@ -29,10 +29,6 @@ module Discerner
 
           # Hooks
           base.send :after_commit, :update_associations, :on => :update, :if => Proc.new { |record| record.previous_changes.include?('deleted_at') }
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :deleted_at, :name, :username, :search_parameters, :search_parameters_attributes,
-          :dictionary, :dictionary_id, :search_combinations_attributes
         end
 
         # Instance Methods

data/lib/discerner/methods/models/search_combination.rb

@@ -17,9 +17,6 @@ module Discerner
           # Validations
           base.send :validates_presence_of, :search, :combined_search
           base.send :validate, :validate_searches
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :combined_search_id, :display_order, :operator_id, :search_id, :search, :combined_search
         end
 
         # Instance Methods

data/lib/discerner/methods/models/search_parameter.rb

@@ -24,9 +24,6 @@ module Discerner
 
           # Hooks
           base.send :after_commit, :update_associations, :on => :update, :if => Proc.new { |record| record.previous_changes.include?('deleted_at') }
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :search, :search_id, :parameter, :parameter_id, :search_parameter_values_attributes, :display_order
         end
 
         # Instance Methods

data/lib/discerner/methods/models/search_parameter_value.rb

@@ -22,9 +22,6 @@ module Discerner
           # Hooks
           base.send :before_validation, :cleanup_parameter_values
           base.send :after_commit, :destroy_if_deleted_parameter_value, :on => :update
-
-          # Whitelisting attributes
-          base.send :attr_accessible, :additional_value, :chosen, :display_order, :operator_id, :parameter_value_id, :search_parameter_id, :value, :parameter_value, :operator, :search_parameter
         end
 
         # Instance Methods

data/lib/discerner/parser.rb

@@ -86,7 +86,7 @@ module Discerner
       error_message 'dictionary name cannot be blank' if dictionary_name.blank?
       notification_message "processing dictionary '#{dictionary_name}'"
 
-      dictionary = Discerner::Dictionary.find_or_initialize_by_name(dictionary_name)
+      dictionary = Discerner::Dictionary.find_or_initialize_by(name: dictionary_name)
       dictionary.deleted_at = nil
 
       if dictionary.new_record?
@@ -109,7 +109,7 @@ module Discerner
       error_message 'parameter category name cannot be blank' if parameter_category_name.blank?
       notification_message "processing parameter category  '#{parameter_category_name}'"
 
-      parameter_category = Discerner::ParameterCategory.where(:name => parameter_category_name, :dictionary_id => dictionary.id).first_or_initialize
+      parameter_category = Discerner::ParameterCategory.where(name: parameter_category_name, dictionary_id: dictionary.id).first_or_initialize
       parameter_category.deleted_at = nil
 
       if parameter_category.new_record?
@@ -136,9 +136,10 @@ module Discerner
       error_message "unique_identifier cannot be blank", parameter_name if unique_identifier.blank?
 
       existing_parameter    = Discerner::Parameter.
-                              includes({:parameter_category => :dictionary}).
-                              where('discerner_parameters.unique_identifier = ? and discerner_dictionaries.id = ?', unique_identifier, parameter_category.dictionary.id).first
-      parameter             = existing_parameter || Discerner::Parameter.new(:unique_identifier => unique_identifier, :parameter_category => parameter_category)
+                              includes({parameter_category: :dictionary}).
+                              where('discerner_parameters.unique_identifier = ? and discerner_dictionaries.id = ?', unique_identifier, parameter_category.dictionary.id).
+                              references(:discerner_parameters, :discerner_dictionaries).first
+      parameter             = existing_parameter || Discerner::Parameter.new(unique_identifier: unique_identifier, parameter_category: parameter_category)
 
       parameter.name        = parameter_name
       parameter.deleted_at  = nil
@@ -277,7 +278,7 @@ module Discerner
          operators_from_file.each do |operator_from_file|
            error_message 'unique identifier has to be defined' if operator_from_file[:unique_identifier].blank?
 
-           operator = Discerner::Operator.find_or_initialize_by_unique_identifier(operator_from_file[:unique_identifier])
+           operator = Discerner::Operator.find_or_initialize_by(unique_identifier: operator_from_file[:unique_identifier])
            if operator.new_record?
              notification_message "creating operator '#{operator_from_file[:unique_identifier]}'"
              operator.created_at = Time.now
@@ -309,7 +310,7 @@ module Discerner
       error_message "'integer' parameter type has been replaced with 'numeric', please update your dictionary definition" if /integer/.match(name.downcase)
 
       ## find or initialize parameter type
-      parameter_type = Discerner::ParameterType.find_or_initialize_by_name(name.downcase)
+      parameter_type = Discerner::ParameterType.find_or_initialize_by(name: name.downcase)
       if parameter_type.new_record?
         notification_message "Creating parameter type '#{name}'"
         parameter_type.created_at = Time.now
@@ -325,7 +326,7 @@ module Discerner
       search_value = search_value.to_s
       notification_message "processing parameter value '#{search_value}'"
 
-      parameter_value = Discerner::ParameterValue.where(:search_value => search_value, :parameter_id => parameter.id).first_or_initialize
+      parameter_value = Discerner::ParameterValue.where(search_value: search_value, parameter_id: parameter.id).first_or_initialize
       if parameter_value.new_record?
         notification_message "creating parameter value ..."
         parameter_value.created_at = Time.now
@@ -335,7 +336,7 @@ module Discerner
       end
 
       unless parameter_value_category_identifier.blank?
-        parameter_value_category = Discerner::ParameterValueCategory.where(:unique_identifier => parameter_value_category_identifier, :parameter_id => parameter.id).first_or_initialize
+        parameter_value_category = Discerner::ParameterValueCategory.where(unique_identifier: parameter_value_category_identifier, parameter_id: parameter.id).first_or_initialize
         if parameter_value_category.blank?
           error_message "parameter value category with unique identifier #{parameter_value_category_identifier} is not found for parameter #{parameter.name}"
         else
@@ -358,7 +359,7 @@ module Discerner
       unique_identifier = unique_identifier.to_s
       notification_message "processing parameter value category '#{unique_identifier}'"
 
-      parameter_value_category = Discerner::ParameterValueCategory.where(:unique_identifier => unique_identifier, :parameter_id => parameter.id).first_or_initialize
+      parameter_value_category = Discerner::ParameterValueCategory.where(unique_identifier: unique_identifier, parameter_id: parameter.id).first_or_initialize
       if parameter_value_category.new_record?
         notification_message "creating parameter value category..."
         parameter_value_category.created_at = Time.now

data/lib/discerner/version.rb

@@ -1,3 +1,3 @@
 module Discerner
-  VERSION = "1.2.2"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,335 +1,315 @@
 --- !ruby/object:Gem::Specification
 name: discerner
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ! '>='
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - ! '>='
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ! '>='
+        version: '5.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ! '>='
+        version: '5.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
-    - - ! '>='
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.5
-    - - ! '>='
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.5
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.6
-    - - ! '>='
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.6
-    - - ! '>='
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.9
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.2
-    - - ! '>='
+        version: 3.0.2
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.2
+        version: 3.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.2
-    - - ! '>='
+        version: 3.0.2
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.2
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.1
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.1
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.1
-- !ruby/object:Gem::Dependency
-  name: cucumber-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
-    - - ! '>='
+        version: 2.4.1
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
-    - - ! '>='
+        version: 2.4.1
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.41.0
-    - - ! '>='
+        version: 2.42.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.41.0
+        version: 2.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.41.0
-    - - ! '>='
+        version: 2.42.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.41.0
+        version: 2.42.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - ! '>='
+        version: 1.3.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
-    - - ! '>='
+        version: 1.3.0
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.3
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.3
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
-    - - ! '>='
+        version: 2.12.1
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
-    - - ! '>='
+        version: 2.12.1
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7.3
-    - - ! '>='
+        version: 0.8.7.4
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7.3
+        version: 0.8.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7.3
-    - - ! '>='
+        version: 0.8.7.4
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7.3
+        version: 0.8.7.4
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
-    - - ! '>='
+        version: 3.1.2
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
-    - - ! '>='
+        version: 3.1.2
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 description: Discerner is an engine for Rails that provides basic search UI, search
   reqults export UI and allows to configure available search parameters/values. Discerner
   is not aimed to be a SQL-generator, but it allows the host application to access
@@ -514,17 +494,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails engine that provides dictionary-based search functionality