discerner 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 152d1ee5ab4203b8e029b97857a9597929036fb7
-  data.tar.gz: 8b2b268454d31fbd708b46df3775be727115e416
+  metadata.gz: 3476a1439a17068f33eb8cf1996b1ad007dec278
+  data.tar.gz: 1fd944b53a9116ab86a5137bc71d443c71007240
 SHA512:
-  metadata.gz: 9ce4a79a3ccc095d2207c80f8e412073661677f338d4dcbc3b5478cb52c1a39d752b9440a1c94a4ff1a9d02136642683494244c5e0a10cb667924fe74ab89ca0
-  data.tar.gz: e8b84675a1a3ab72da72ecafbde6d27cab590f6445bee82e5045c2429dadffc74e78b318114454774b599d9dcc7fa6895da23acd36bb12d99041519965bae1b2
+  metadata.gz: 41ae1bcbe6ba8fda2278c2b38300bca455aa16e6cccd843dcaf7e0ac7752c7f9677e1e725840243dcbe78fd9fb901359443ad3edfd6a05b1f0e9755beb810b17
+  data.tar.gz: a37122ec487ecbdca468ec86652bc8edc3737c7a6cf1c41143ea697095c02639192a266b37975071cab601560381254206c4b6212f967d55c30bc8edb6d0cf28

data/lib/discerner/parser.rb

@@ -1,6 +1,7 @@
 module Discerner
   class Parser
-    attr_accessor :options, :errors, :updated_dictionaries, :updated_categories, :updated_parameters, :updated_parameter_value_categories, :updated_parameter_values, :blank_parameter_values
+    attr_accessor :options, :errors, :updated_dictionaries, :updated_categories, :updated_parameters, :updated_parameter_value_categories, :updated_parameter_values, :blank_parameter_values,
+                  :abandoned_dictionaries
 
     def initialize(options={})
       self.options = options
@@ -15,6 +16,7 @@ module Discerner
       self.updated_parameter_values = []
       self.updated_parameter_value_categories = []
       self.blank_parameter_values = []
+      self.abandoned_dictionaries = []
     end
 
     def parse_dictionaries(str)
@@ -348,7 +350,7 @@ module Discerner
       parameter_value.deleted_at = nil
       error_message "parameter value #{search_value} could not be saved: #{parameter_value.errors.full_messages}" unless parameter_value.save
       notification_message 'parameter value saved'
-      updated_parameter_values << parameter_value unless silent
+      updated_parameter_values << parameter_value
       parameter_value
     end
 
@@ -402,6 +404,7 @@ module Discerner
 
     private
       def cleanup
+        self.abandoned_dictionaries  = Discerner::Dictionary.order(:id).to_a - updated_dictionaries
         cleanup_parameter_value_categories
         cleanup_parameter_values
         cleanup_parameters
@@ -411,9 +414,8 @@ module Discerner
 
       def cleanup_dictionaries
         if self.options[:prune_dictionaries].blank?
-          notification_message "if option --prune_dictionaries is not specified, dictionaries removed from the definition file should be deleted manually. Use `rake discerner:delete_dictionary' NAME='My dictionary name'"
+          notification_message "if option --prune_dictionaries is not specified, dictionaries that are not in parsed definition file should be deleted manually. Use `rake discerner:delete_dictionary' NAME='My dictionary name'"
         else
-          abandoned_dictionaries  = Discerner::Dictionary.order(:id).to_a - updated_dictionaries
           used_dictionaries       = abandoned_dictionaries.reject{|d| d.searches.blank?}
           not_used_dictionaries   = abandoned_dictionaries - used_dictionaries
 
@@ -432,6 +434,12 @@ module Discerner
 
       def cleanup_categories
         abandoned_categories = Discerner::ParameterCategory.order(:id).to_a - updated_categories
+
+        if self.options[:prune_dictionaries].blank?
+          notification_message "if option --prune_dictionaries is not specified, caterories for dictionaries that are not in parsed definition file should be deleted manually. Use `rake discerner:delete_dictionary' NAME='My dictionary name'"
+          abandoned_categories = abandoned_categories.reject{|c| abandoned_dictionaries.include?(c.dictionary)}
+        end
+
         used_categories      = abandoned_categories.reject{|c| c.parameters.blank? || c.parameters.select{|p| p.used_in_search?}.blank?}
         not_used_categories  = abandoned_categories - used_categories
 
@@ -449,6 +457,12 @@ module Discerner
 
       def cleanup_parameters
         abandoned_parameters = Discerner::Parameter.order(:id).to_a - updated_parameters
+
+        if self.options[:prune_dictionaries].blank?
+          notification_message "if option --prune_dictionaries is not specified, parameters for dictionaries that are not in parsed definition file should be deleted manually. Use `rake discerner:delete_dictionary' NAME='My dictionary name'"
+          abandoned_parameters = abandoned_parameters.reject{|p| abandoned_dictionaries.include?(p.parameter_category.dictionary)}
+        end
+
         used_parameters      = abandoned_parameters.select{|p| p.used_in_search?}
         not_used_parameters  = abandoned_parameters - used_parameters
 
@@ -466,6 +480,12 @@ module Discerner
 
       def cleanup_parameter_value_categories
         abandoned_categories = Discerner::ParameterValueCategory.order(:id).to_a - updated_parameter_value_categories
+
+        if self.options[:prune_dictionaries].blank?
+          notification_message "if option --prune_dictionaries is not specified, parameter value categories for dictionaries that are not in parsed definition file should be deleted manually. Use `rake discerner:delete_dictionary' NAME='My dictionary name'"
+          abandoned_categories = abandoned_categories.reject{|c| abandoned_dictionaries.include?(c.parameter.parameter_category.dictionary)}
+        end
+
         used_categories      = abandoned_categories.reject{|c| c.parameter_values.blank? || c.parameter_values.select{|v| v.used_in_search?}.blank?}
         not_used_categories  = abandoned_categories - used_categories
 
@@ -480,10 +500,17 @@ module Discerner
           not_used_categories.each{|r| r.destroy}
         end
       end
+
       # this also marks search_parameter_values that reference this value and are chosen as deleted
       # and destroys search_parameter_values that reference this value but are not chosen (list options)
       def cleanup_parameter_values
         abandoned_parameter_values = Discerner::ParameterValue.order(:id).to_a - updated_parameter_values - blank_parameter_values
+
+        if self.options[:prune_dictionaries].blank?
+          notification_message "if option --prune_dictionaries is not specified, parameter values for dictionaries that are not in parsed definition file should be deleted manually. Use `rake discerner:delete_dictionary' NAME='My dictionary name'"
+          abandoned_parameter_values = abandoned_parameter_values.reject{|v| abandoned_dictionaries.include?(v.parameter.parameter_category.dictionary)}
+        end
+
         used_parameter_values      = abandoned_parameter_values.select{|p| p.used_in_search?}
         not_used_parameter_values  = abandoned_parameter_values - used_parameter_values
 

data/lib/discerner/version.rb

@@ -1,3 +1,3 @@
 module Discerner
-  VERSION = "2.0.6"
+  VERSION = "2.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discerner
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails