discerner 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d003dc673d344a81ba57493c85359cb204d4ec25
-  data.tar.gz: e640b76a3ac01c8651a0daf029fbced903dccac4
+  metadata.gz: 152d1ee5ab4203b8e029b97857a9597929036fb7
+  data.tar.gz: 8b2b268454d31fbd708b46df3775be727115e416
 SHA512:
-  metadata.gz: 965d91c637899dd9d029de35bb03181605bccc6ae5bd76c0742a41f179ebb3b0fc2f747d4e0f853d158ffbd685a253c0edae7fab75f55d097733bea966c7ee23
-  data.tar.gz: 218fb8fdcc5d94e91bb2056214f86f137749ab79d8f157ebb468abd50b230aed202659a61a4209f3b32f297f7e46ae68124df42a7bb4ba96fb54bf37bcd4880b
+  metadata.gz: 9ce4a79a3ccc095d2207c80f8e412073661677f338d4dcbc3b5478cb52c1a39d752b9440a1c94a4ff1a9d02136642683494244c5e0a10cb667924fe74ab89ca0
+  data.tar.gz: e8b84675a1a3ab72da72ecafbde6d27cab590f6445bee82e5045c2429dadffc74e78b318114454774b599d9dcc7fa6895da23acd36bb12d99041519965bae1b2

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

@@ -1,29 +1,20 @@
 /* Link styles */
 #discerner_searches, #discerner_search
-  .icon_link
+  .discerner-icon-link
     :padding 2px 2px 2px 20px
-    :text-decoration none !important
+    :text-decoration none
 
-  .add_link, .add_link:hover
-    :background url(add.png) 0 2px no-repeat !important
+  .discerner-add-link, .discerner-add-link:hover
+    :background url(add.png) 0 2px no-repeat
 
-  .add_person_link, .add_person_link:hover
-    :background url(user_add.png) 0 2px no-repeat !important
+  .discerner-edit-link, .discerner-edit-link:hover
+    :background url(edit.png) 0 2px no-repeat
 
-  .edit_link, .edit_link:hover
-    :background url(edit.png) 0 2px no-repeat !important
+  .discerner-show-link, .discerner-show-link:hover
+    :background url(show.png) 0 2px no-repeat
 
-  .search_link, .search_link:hover
-    :background url(find.png) 0 2px no-repeat !important
+  .discerner-delete-link, .discerner-delete-link:hover
+    :background url(delete.png) 0 2px no-repeat
 
-  .show_link, .show_link:hover
-    :background url(show.png) 0 2px no-repeat !important
-
-  .list_link, .list_link:hover
-    :background url(list.png) 0 2px no-repeat !important
-
-  .delete_link, .delete_link:hover
-    :background url(delete.png) 0 2px no-repeat !important
-
-  .options_link, .options_link:hover
-    :background url(cog.png) 0 2px no-repeat !important
+  .discerner-options-link, .discerner-options-link:hover
+    :background url(cog.png) 0 2px no-repeat

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

@@ -15,7 +15,7 @@
       %span.discerner_search_name
         = @discerner_search.display_name
       %span.discerner_search_name_edit
-        = link_to 'Edit', '#', class: "edit_link icon_link"
+        = link_to 'Edit', '#', class: "discerner-edit-link discerner-icon-link"
 
   - else
     .discerner_dictionary_required_message

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

@@ -12,6 +12,6 @@
         %td
           = discerner_format_datetime(search.updated_at)
         %td
-          = link_to 'Open', edit_search_path(search), class: 'show_link icon_link'
-          = link_to 'Export options', export_parameters_path(search), class: 'options_link icon_link' if export_discerner_results?
-          = link_to 'Delete', search_path(search), data: {confirm: 'Are you sure?'}, method: :delete, class: "icon_link delete_link"
+          = link_to 'Open', edit_search_path(search), class: 'discerner-show-link discerner-icon-link'
+          = link_to 'Export options', export_parameters_path(search), class: 'discerner-options-link discerner-icon-link' if export_discerner_results?
+          = link_to 'Delete', search_path(search), data: {confirm: 'Are you sure?'}, method: :delete, class: "discerner-icon-link discerner-delete-link"

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

@@ -19,13 +19,13 @@ module Discerner
 
         def discerner_link_to_add_fields(name, association, html_options={})
           css_class = html_options[:class] || ' '
-          css_class += "add_#{association.to_s} add add_link icon_link"
+          css_class += "add_#{association.to_s} add discerner-add-link discerner-icon-link"
           html_options[:class] = css_class
           link_to(name, 'javascript:void(0);', html_options)
         end
 
         def discerner_link_to_remove_fields(name, f, association)
-          f.hidden_field(:_destroy) + link_to(name, "javascript:void(0);", class: "delete_#{association.to_s} delete_link icon_link")
+          f.hidden_field(:_destroy) + link_to(name, "javascript:void(0);", class: "delete_#{association.to_s} discerner-delete-link discerner-icon-link")
         end
 
         def discerner_nested_record_id(builder, assocation)

data/lib/discerner/parser.rb

@@ -410,19 +410,23 @@ module Discerner
       end
 
       def cleanup_dictionaries
-        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
-
-        used_dictionaries.each do |r|
-          notification_message("marking dictionary #{r.name} as deleted");
-          r.deleted_at = Time.now
-          error_message "dictionary could not be updated: #{r.errors.full_messages}", r.name unless r.save
-        end
+        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'"
+        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
+
+          used_dictionaries.each do |r|
+            notification_message("marking dictionary #{r.name} as deleted");
+            r.deleted_at = Time.now
+            error_message "dictionary could not be updated: #{r.errors.full_messages}", r.name unless r.save
+          end
 
-        unless not_used_dictionaries.blank?
-          notification_message("permanently deleting dictionaries #{not_used_dictionaries.map{|r| r.name}.join(', ')}");
-          not_used_dictionaries.each{|r| r.destroy}
+          unless not_used_dictionaries.blank?
+            notification_message("permanently deleting dictionaries #{not_used_dictionaries.map{|r| r.name}.join(', ')}");
+            not_used_dictionaries.each{|r| r.destroy}
+          end
         end
       end
 

data/lib/discerner/version.rb

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

data/lib/tasks/discerner_tasks.rake

@@ -5,12 +5,12 @@
 
 namespace :discerner do
   namespace :setup do
-    desc 'Load dictionaries (specify file to parse with FILE=myfile.yml) '
+    desc 'Load dictionaries (specify file to parse with FILE=myfile.yml), --trace gives back tracing messages, --prune_dictionaries removes dictionaries that are not specified in the definition file unless they are used in search'
     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, prune_dictionaries: Rake.application.options.prune_dictionaries)
       parser.parse_dictionaries(File.read(file))
     end
 
@@ -27,4 +27,12 @@ namespace :discerner do
     Discerner::Search.destroy_all
     Discerner::Dictionary.destroy_all
   end
+
+  desc "Delete dictionary (specify dictionary to remove with NAME='My dictionary name')"
+  task delete_dictionary: :environment do
+    dictionary = Discerner::Dictionary.where(name: ENV["NAME"]).last
+    raise "Dictionary does not exist: #{ENV["NAME"]}" if dictionary.blank?
+    Discerner::Search.where(dictionary_id: dictionary.id).destroy_all
+    dictionary.delete
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: discerner
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -511,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails engine that provides dictionary-based search functionality