discerner 2.0.0 → 2.0.1

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

@@ -6,8 +6,8 @@ module Discerner
           base.send :include, SoftDelete
 
           # Associations
-          base.send :belongs_to, :parameter_value_category, :inverse_of => :parameter_value_categorizations
-          base.send :belongs_to, :parameter_value,          :inverse_of => :parameter_value_categorization
+          base.send :belongs_to, :parameter_value_category, inverse_of: :parameter_value_categorizations
+          base.send :belongs_to, :parameter_value,          inverse_of: :parameter_value_categorization
 
           # Validations
           base.send :validates_presence_of, :parameter_value_category, :parameter_value

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

@@ -6,9 +6,9 @@ module Discerner
           base.send :include, SoftDelete
 
           # Associations
-          base.send :belongs_to, :parameter,                       :inverse_of => :parameter_value_categories
-          base.send :has_many,   :parameter_value_categorizations, :dependent => :destroy
-          base.send :has_many,   :parameter_values, :through => :parameter_value_categorizations
+          base.send :belongs_to, :parameter,                       inverse_of: :parameter_value_categories
+          base.send :has_many,   :parameter_value_categorizations, dependent: :destroy
+          base.send :has_many,   :parameter_values, through: :parameter_value_categorizations
 
           # Scopes
           base.send(:scope, :ordered_by_name, -> { base.order('discerner_parameter_value_categories.name ASC') })
@@ -16,7 +16,7 @@ module Discerner
 
           # Validations
           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 :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
         end
 

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

@@ -8,27 +8,27 @@ module Discerner
 
           # Associations
           base.send :belongs_to, :dictionary
-          base.send :has_many, :search_parameters,    :inverse_of => :search
-          base.send :has_many, :search_combinations,  :inverse_of => :search
-          base.send :has_many, :combined_searches,    :through => :search_combinations
-          base.send :has_many, :export_parameters,    :inverse_of => :search
+          base.send :has_many, :search_parameters,    inverse_of: :search
+          base.send :has_many, :search_combinations,  inverse_of: :search
+          base.send :has_many, :combined_searches,    through: :search_combinations
+          base.send :has_many, :export_parameters,    inverse_of: :search
 
           # Validations
-          base.send :validates, :dictionary, :presence => { :message => "for search can't be blank" }
+          base.send :validates, :dictionary, presence: { message: "for search can't be blank" }
           base.send :validate, :validate_search_parameters
 
           # Scopes
-          base.send(:scope, :by_user, ->(username) { base.where(:username => username) unless username.blank?})
+          base.send(:scope, :by_user, ->(username) { base.where(username: username) unless username.blank?})
 
           # Nested attributes
-          base.send :accepts_nested_attributes_for, :search_parameters, :allow_destroy => true,
-            :reject_if => proc { |attributes| attributes['parameter_id'].blank? && attributes['parameter'].blank? }
+          base.send :accepts_nested_attributes_for, :search_parameters, allow_destroy: true,
+            reject_if: proc { |attributes| attributes['parameter_id'].blank? && attributes['parameter'].blank? }
 
-          base.send :accepts_nested_attributes_for, :search_combinations, :allow_destroy => true,
-            :reject_if => proc { |attributes| attributes['combined_search_id'].blank? && attributes['combined_search'].blank? }
+          base.send :accepts_nested_attributes_for, :search_combinations, allow_destroy: true,
+            reject_if: proc { |attributes| attributes['combined_search_id'].blank? && attributes['combined_search'].blank? }
 
           # Hooks
-          base.send :after_commit, :update_associations, :on => :update, :if => Proc.new { |record| record.previous_changes.include?('deleted_at') }
+          base.send :after_commit, :update_associations, on: :update, if: Proc.new { |record| record.previous_changes.include?('deleted_at') }
         end
 
         # Instance Methods
@@ -70,7 +70,7 @@ module Discerner
           all_search_parameters.concat(search_parameters).flatten!
 
           all_search_parameters.each do |search_parameter|
-            search_models[search_parameter.parameter.search_model] = { :search_parameters => [], :conditions => nil } unless search_models.has_key?(search_parameter.parameter.search_model)
+            search_models[search_parameter.parameter.search_model] = { search_parameters: [], conditions: nil } unless search_models.has_key?(search_parameter.parameter.search_model)
             search_models[search_parameter.parameter.search_model][:search_parameters] << search_parameter
           end
 

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

@@ -7,9 +7,9 @@ module Discerner
           base.send :include, Warning
 
           # Associations
-          base.send :belongs_to, :operator, :inverse_of => :search_combinations
-          base.send :belongs_to, :search,   :inverse_of => :search_combinations,  :foreign_key => :search_id
-          base.send :belongs_to, :combined_search, :foreign_key => :combined_search_id, :class_name => 'Discerner::Search'
+          base.send :belongs_to, :operator, inverse_of: :search_combinations
+          base.send :belongs_to, :search,   inverse_of: :search_combinations,  foreign_key: :search_id
+          base.send :belongs_to, :combined_search, foreign_key: :combined_search_id, class_name: 'Discerner::Search'
 
           # Scopes
           base.send(:scope, :ordered_by_display_order, -> { base.order('discerner_search_combinations.display_order ASC') })

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

@@ -7,9 +7,9 @@ module Discerner
           base.send :include, Warning
 
           # Associations
-          base.send :belongs_to,  :search,     :inverse_of => :search_parameters
-          base.send :belongs_to,  :parameter,  :inverse_of => :search_parameters
-          base.send :has_many,    :search_parameter_values, :dependent => :destroy, :inverse_of => :search_parameter
+          base.send :belongs_to,  :search,     inverse_of: :search_parameters
+          base.send :belongs_to,  :parameter,  inverse_of: :search_parameters
+          base.send :has_many,    :search_parameter_values, dependent: :destroy, inverse_of: :search_parameter
 
           # Scopes
           base.send(:scope, :by_parameter_category, ->(parameter_category) { base.includes(:parameter).where('discerner_parameters.parameter_category_id' => parameter_category.id) unless parameter_category.blank?})
@@ -20,10 +20,10 @@ module Discerner
           base.send :validates_presence_of, :search, :parameter
 
           # Nested attributes
-          base.send :accepts_nested_attributes_for, :search_parameter_values, :allow_destroy => true
+          base.send :accepts_nested_attributes_for, :search_parameter_values, allow_destroy: true
 
           # Hooks
-          base.send :after_commit, :update_associations, :on => :update, :if => Proc.new { |record| record.previous_changes.include?('deleted_at') }
+          base.send :after_commit, :update_associations, on: :update, if: Proc.new { |record| record.previous_changes.include?('deleted_at') }
         end
 
         # Instance Methods

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

@@ -7,21 +7,21 @@ module Discerner
           base.send :include, Warning
 
           # Associations
-          base.send :belongs_to, :search_parameter, :inverse_of => :search_parameter_values
-          base.send :belongs_to, :parameter_value,  :inverse_of => :search_parameter_values
-          base.send :belongs_to, :operator,         :inverse_of => :search_parameter_values
+          base.send :belongs_to, :search_parameter, inverse_of: :search_parameter_values
+          base.send :belongs_to, :parameter_value,  inverse_of: :search_parameter_values
+          base.send :belongs_to, :operator,         inverse_of: :search_parameter_values
 
           # Scopes
-          base.send(:scope, :chosen, -> { base.where(:chosen => true) })
+          base.send(:scope, :chosen, -> { base.where(chosen: true) })
           base.send(:scope, :ordered_by_display_order, -> { base.order('discerner_search_parameter_values.display_order ASC') })
 
           #Validations
           base.send :validate,  :validate_operator
-          base.send :validates, :search_parameter, :presence => true
+          base.send :validates, :search_parameter, presence: true
 
           # Hooks
           base.send :before_validation, :cleanup_parameter_values
-          base.send :after_commit, :destroy_if_deleted_parameter_value, :on => :update
+          base.send :after_commit, :destroy_if_deleted_parameter_value, on: :update
         end
 
         # Instance Methods

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

@@ -4,7 +4,7 @@ module Discerner
       module SoftDelete
         def self.included(base)
           attr_accessor :soft_delete
-          base.send(:scope, :not_deleted, -> { base.where(:deleted_at => nil) })
+          base.send(:scope, :not_deleted, -> { base.where(deleted_at: nil) })
         end
 
         def process_soft_delete

data/lib/discerner/version.rb

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

data/lib/generators/discerner/dictionary/dictionary_generator.rb

@@ -1,11 +1,11 @@
 module Discerner
   class DictionaryGenerator < Rails::Generators::Base
-    class_option "no-load",   :type => :boolean
-    class_option "no-models", :type => :boolean
-    class_option "no-views",  :type => :boolean
+    class_option "no-load",   type: :boolean
+    class_option "no-models", type: :boolean
+    class_option "no-views",  type: :boolean
 
     source_root File.expand_path('../templates', __FILE__)
-    argument :dictionary_file_path, :type => :string
+    argument :dictionary_file_path, type: :string
 
     def parse_dictionary_file
       rake("discerner:setup:dictionaries FILE=#{dictionary_file_path}") unless options["no-load"]
@@ -19,7 +19,7 @@ module Discerner
     end
 
     def add_excel_mime_type
-      inject_into_file("#{Rails.root}/config/initializers/mime_types.rb", 'Mime::Type.register "application/xls", :xls', :after => "# Be sure to restart your server when you modify this file.\n")
+      inject_into_file("#{Rails.root}/config/initializers/mime_types.rb", 'Mime::Type.register "application/xls", :xls', after: "# Be sure to restart your server when you modify this file.\n")
     end
 
     private

data/lib/generators/discerner/install/install_generator.rb

@@ -3,13 +3,13 @@ require "rails/generators"
 
 module Discerner
   class InstallGenerator < Rails::Generators::Base
-    class_option "no-migrate", :type => :boolean
-    class_option "customize-all", :type => :boolean
-    class_option "customize-controllers", :type => :boolean
-    class_option "customize-models", :type => :boolean
-    class_option "customize-helpers", :type => :boolean
-    class_option "customize-layout", :type => :boolean
-    class_option "current-user-helper", :type => :string
+    class_option "no-migrate", type: :boolean
+    class_option "customize-all", type: :boolean
+    class_option "customize-controllers", type: :boolean
+    class_option "customize-models", type: :boolean
+    class_option "customize-helpers", type: :boolean
+    class_option "customize-layout", type: :boolean
+    class_option "current-user-helper", type: :string
 
     def self.source_paths
       paths = self.superclass.source_paths
@@ -41,7 +41,7 @@ module Discerner
 }
       inject_into_file("#{Rails.root}/app/controllers/application_controller.rb",
                        discerner_user_method,
-                       :after => "ActionController::Base\n", :force => false)
+                       after: "ActionController::Base\n", force: false)
     end
 
     def add_discerner_view_helpers
@@ -62,7 +62,7 @@ module Discerner
 }
       inject_into_file("#{Rails.root}/app/helpers/application_helper.rb",
                        discerner_helper_methods,
-                       :after => "ApplicationHelper\n")
+                       after: "ApplicationHelper\n")
     end
 
     def run_migrations
@@ -81,8 +81,8 @@ module Discerner
 
     def mount_engine
       puts "Mounting Discerner::Engine at \"/\" in config/routes.rb..."
-      insert_into_file("#{Rails.root}/config/routes.rb", :after => /routes.draw.do\n/) do
-        %Q{  mount Discerner::Engine, :at => "/"\n}
+      insert_into_file("#{Rails.root}/config/routes.rb", after: /routes.draw.do\n/) do
+        %Q{  mount Discerner::Engine, at: "/"\n}
       end
     end
 
@@ -141,7 +141,7 @@ module Discerner
         output += "-- Seed operators were loaded into your database.\n"
       end
       output += "-- The engine was mounted in your config/routes.rb file using this line:
-        mount Discerner::Engine, :at => \"/\""
+        mount Discerner::Engine, at: \"/\""
       output += "\nIf you want to change where the searches are located, just change the \"/searches\" path at the end of this line to whatever you want."
       output += "\n--  Sample search dictionary was copied into lib/setup. If you want to try it out, run `rails generate discerner:dictionary lib/setup/dictionaries.yml`. This will:\n"
       output += "\n-- parse dictionary definitions from lib/setup/dictionaries.yml into the database."

data/lib/generators/discerner/install/templates/dictionaries.yml

@@ -15,7 +15,7 @@
 #               :parameter_type: numeric/date/list/combobox/text/string         # used to define applicable operators/display options. does not have to be restricted to the given list, but additional parameters will require adding operators to match
 #               :parameter_value_categories_source:                             # used to define parameter value categories
 #                 :model: string                                                # source model to be used to load parameter value categiories
-#                 :method: string                                               # method in the source model that returns parameter_value_categories in a form of [{:name => 'string, :unique_identifier => 'adventure', :display_order => 1, :collapse => true}]
+#                 :method: string                                               # method in the source model that returns parameter_value_categories in a form of [{name: 'string, unique_identifier: 'adventure', display_order: 1, collapse: true}]
 #               :parameter_value_categories:                                    # used to define parameter value categories
 #                 - :name: string
 #                   :unique_identifier: string                                  # has to be unique within parameter

data/lib/generators/discerner/install/templates/models/book.rb

@@ -1,15 +1,15 @@
 class Book
   def self.genres
     [
-      {:name => 'Adventure', :unique_identifier => 'adventure', :display_order => 1, :collapse => true},
-      {:name => 'Drama', :unique_identifier => 'drama', :display_order => 2, :collapse => false},
+      {name: 'Adventure', unique_identifier: 'adventure', display_order: 1, collapse: true},
+      {name: 'Drama', unique_identifier: 'drama', display_order: 2, collapse: false},
     ]
   end
 
   def self.generes
     [
-      {:name => 'Adventure', :display_order => 1, :collapse => true},
-      {:name => 'Drama', :unique_identifier => 'drama', :display_order => 2, :collapse => false},
+      {name: 'Adventure', display_order: 1, collapse: true},
+      {name: 'Drama', unique_identifier: 'drama', display_order: 2, collapse: false},
     ]
   end
 end

data/lib/generators/discerner/install/templates/views/layouts/searches.html.erb

@@ -2,7 +2,7 @@
 <html>
 <head>
   <%= yield :title %>
-  <%= stylesheet_link_tag    "discerner/application", :media => "all" %>
+  <%= stylesheet_link_tag    "discerner/application", media: "all" %>
   <%= javascript_include_tag "discerner/application" %>
   <%= csrf_meta_tags %>
 </head>

data/lib/tasks/cucumber.rake

@@ -1,6 +1,6 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
@@ -14,26 +14,26 @@ begin
   require 'cucumber/rake/task'
 
   namespace :cucumber do
-    Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
+    Cucumber::Rake::Task.new({ok: 'db:test:prepare'}, 'Run features that should pass') do |t|
       t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'default'
     end
 
-    Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
+    Cucumber::Rake::Task.new({wip: 'db:test:prepare'}, 'Run features that are being worked on') do |t|
       t.binary = vendored_cucumber_bin
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'wip'
     end
 
-    Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
+    Cucumber::Rake::Task.new({rerun: 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
       t.binary = vendored_cucumber_bin
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'rerun'
     end
 
     desc 'Run all features'
-    task :all => [:ok, :wip]
+    task all: [:ok, :wip]
 
     task :statsetup do
       require 'rails/code_statistics'
@@ -42,11 +42,11 @@ begin
     end
   end
   desc 'Alias for cucumber:ok'
-  task :cucumber => 'cucumber:ok'
+  task cucumber: 'cucumber:ok'
 
-  task :default => :cucumber
+  task default: :cucumber
 
-  task :features => :cucumber do
+  task features: :cucumber do
     STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
   end
 
@@ -54,7 +54,7 @@ begin
   task 'db:test:prepare' do
   end
 
-  task :stats => 'cucumber:statsetup'
+  task stats: 'cucumber:statsetup'
 rescue LoadError
   desc 'cucumber rake task not available (cucumber not installed)'
   task :cucumber do

data/lib/tasks/discerner_tasks.rake

@@ -6,24 +6,24 @@
 namespace :discerner do
   namespace :setup do
     desc 'Load dictionaries (specify file to parse with FILE=myfile.yml) '
-    task :dictionaries => :environment do
+    task dictionaries: :environment do
       file = ENV["FILE"]
       raise "File name has to be provided" if file.blank?
       raise "File does not exist: #{file}" unless FileTest.exists?(file)
-      parser = Discerner::Parser.new(:trace => Rake.application.options.trace)
+      parser = Discerner::Parser.new(trace: Rake.application.options.trace)
       parser.parse_dictionaries(File.read(file))
     end
 
     desc 'Load operators'
-    task :operators => :environment do
+    task operators: :environment do
       file = File.join(Discerner::Engine.root, 'lib/setup/operators.yml')
       raise "File does not exist: #{file}" unless FileTest.exists?(file)
-      Discerner::Parser.new(:trace => Rake.application.options.trace).parse_operators(File.read(file))
+      Discerner::Parser.new(trace: Rake.application.options.trace).parse_operators(File.read(file))
     end
   end
 
   desc 'Unload all dictionaries'
-  task :unload_dictionaries => :environment do
+  task unload_dictionaries: :environment do
     Discerner::Search.destroy_all
     Discerner::Dictionary.destroy_all
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discerner
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -432,6 +432,8 @@ files:
 - db/migrate/20140204170625_create_discerner_parameter_value_categories.rb
 - db/migrate/20140204170646_create_discerner_parameter_value_categorizations.rb
 - db/migrate/20140227191827_remove_blank_parameter_values_from_export_parameters.rb
+- db/migrate/20140815214547_add_namespace_to_discerner_searches.rb
+- db/migrate/20140815214629_add_namespace_to_discerner_dictionaries.rb
 - db/seeds.rb
 - lib/discerner.rb
 - lib/discerner/engine.rb