abstractor 2.1.0 → 2.1.01

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWUzYjczYWRlYjNkMzRiNzc2YTRjYjQ3YjIyM2IyZDAwYjE2ZGNkZg==
+    YmUyMzBmNjgwNGM2MGZhMjBiMjI2YzQ4ODIyYjM2YzRlMWVlMWM1Yg==
   data.tar.gz: !binary |-
-    MDczMzEzODRiNGE1ZjM5NmYyYmQxM2Q1ODUyOGQ5NGQ2N2Y4MjY4Yw==
+    YmM5ZWE3ZDhhMTY1NzEzMjM0NjQyODEzMzNmNWZmYmU2NTQyYzU1NA==
 SHA512:
   metadata.gz: !binary |-
-    MTRlNzg5ZDFiOTlhMDBmMDc4YmNhZDkyYTY1Nzc0YjU0ZmEzYWJmYmY1YzEz
-    OGRkMGE2MTkwZDUzNTcxODRjZjcwYTI4ODlmN2NlMzExN2U4YjBiNzM0ZTI0
-    MzFlMTkzOWU2NDc4MWZkOTBhYmMzMDJkZmZiYzBhMWI2MTg4OWI=
+    ZjMwNjNhMGQzNjY4MGQwZThmZDVkZjhiMTBjMWM1NGI1ZmFkMGYzZjFmNWU5
+    OTgyMzUzMjFiZjE0YjRkMTQwNzdmMzU0NTdmZTQwOTYwOTU5ZWVmNjA0YTk2
+    NzAwMjNmNWFmMWU2MDdhMzUxOTk5ZjQ2Mzc0MzAzYjhjOTViYjY=
   data.tar.gz: !binary |-
-    NGY1YTAzNmZiYWU4NWUxZThiOTExZmQxYWMyYjcwYTVkNTVkZTQzZThjMzc1
-    MTAxYmFkNmYzMjQ3ZjUyOGYyMWFhZTgzODAyMWI3OWIwMDJmYWY3ZjE0N2Fi
-    NTZhOWJjNjVmMDgzN2QxYzEyZDA3NmRmZjc4YmE5ODRiMWNjYzI=
+    MjZmMjA3MDQ4NDUzZWFlMDA0Mjc1NzcwZmFhOTBiNGUxYjQ4YmY5YzVkNDg2
+    N2RmYzU0YTg2ZWY2NGEzYjFmYWEzNTdkMjZmMDdkNDkwZDY5OTQ4N2NiNTAy
+    ZGY4MzRkMGQzZmZkYTY2MDIyNzFhZjBjNjBiNjllZDRhOGM0M2E=

data/app/views/abstractor/abstractor_abstractions/edit.html.haml

@@ -46,12 +46,13 @@
       - abstraction_sources = abstractor_abstraction.abstractor_subject.abstractor_abstraction_sources.select { |s| s.abstractor_abstraction_source_type.name != 'indirect' }
       - abstraction_sources.each do |abstraction_source|
         - abstraction_source.normalize_from_method_to_sources(abstractor_abstraction.about).each do |source|
-          - dom_id = "#{abstraction_source.id}_#{source[:source_type]}_#{source[:source_id]}_#{source[:source_method]}"
-          %span{ :class => 'abstractor_abstraction_source_tooltip_img label', :rel =>"#abstraction_text_#{dom_id}", :title => "#{source[:source_type].to_s} #{source[:source_method]}"}
-            = image_tag('abstractor/page.png', :id => "abstraction_text_link_#{dom_id}")
-            %br
-          %div{ :id => "abstraction_text_#{dom_id}", :class => 'tooltip'}
-            = simple_format(source[:source_type].find(source[:source_id]).send(source[:source_method]))
+          - if source[:source_type] && source[:source_id] && source[:source_method]
+            - dom_id = "#{abstraction_source.id}_#{source[:source_type]}_#{source[:source_id]}_#{source[:source_method]}"
+            %span{ :class => 'abstractor_abstraction_source_tooltip_img label', :rel =>"#abstraction_text_#{dom_id}", :title => "#{source[:source_type].to_s} #{source[:source_method]}"}
+              = image_tag('abstractor/page.png', :id => "abstraction_text_link_#{dom_id}")
+              %br
+            %div{ :id => "abstraction_text_#{dom_id}", :class => 'tooltip'}
+              = simple_format(source[:source_type].find(source[:source_id]).send(source[:source_method]))
     .column-4
       = f.submit 'Save', :class => 'button positive'
       = link_to 'Cancel', abstractor_abstraction, :class => 'button negative', :remote => true

data/lib/abstractor/abstractable.rb

@@ -60,9 +60,9 @@ module Abstractor
       def abstractor_abstractions_by_abstractor_abstraction_status(abstractor_abstraction_status)
         case abstractor_abstraction_status
         when 'needs_review'
-          abstractor_abstractions.select { |abstractor_abstraction| abstractor_abstraction.value.blank? && abstractor_abstraction.unknown.blank? && abstractor_abstraction.not_applicable.blank? }
+          abstractor_abstractions.not_deleted.select { |abstractor_abstraction| abstractor_abstraction.value.blank? && abstractor_abstraction.unknown.blank? && abstractor_abstraction.not_applicable.blank? }
         when 'reviewed'
-          abstractor_abstractions.select { |abstractor_abstraction| !abstractor_abstraction.value.blank? || !abstractor_abstraction.unknown.blank? || !abstractor_abstraction.not_applicable.blank? }
+          abstractor_abstractions.not_deleted.select { |abstractor_abstraction| !abstractor_abstraction.value.blank? || !abstractor_abstraction.unknown.blank? || !abstractor_abstraction.not_applicable.blank? }
         end
       end
 
@@ -100,9 +100,9 @@ module Abstractor
       def by_abstractor_abstraction_status(abstractor_abstraction_status)
         case abstractor_abstraction_status
         when 'needs_review'
-          where(["EXISTS (SELECT 1 FROM abstractor_abstractions aa WHERE aa.about_type = '#{self.to_s}' AND #{self.table_name}.id = aa.about_id AND (aa.value IS NULL OR aa.value = '') AND (aa.unknown IS NULL OR aa.unknown = ?) AND (aa.not_applicable IS NULL OR aa.not_applicable = ?))", false, false])
+          where(["EXISTS (SELECT 1 FROM abstractor_abstractions aa WHERE aa.deleted_at IS NULL AND aa.about_type = '#{self.to_s}' AND #{self.table_name}.id = aa.about_id AND (aa.value IS NULL OR aa.value = '') AND (aa.unknown IS NULL OR aa.unknown = ?) AND (aa.not_applicable IS NULL OR aa.not_applicable = ?))", false, false])
         when 'reviewed'
-          where(["EXISTS (SELECT 1 FROM abstractor_abstractions aa WHERE aa.about_type = '#{self.to_s}' AND #{self.table_name}.id = aa.about_id) AND NOT EXISTS (SELECT 1 FROM abstractor_abstractions aa WHERE aa.about_type = '#{self.to_s}' AND #{self.table_name}.id = aa.about_id AND COALESCE(aa.value, '') = '' AND COALESCE(aa.unknown, ?) != ? AND COALESCE(aa.not_applicable, ?) != ?)", false, true, false, true])
+          where(["EXISTS (SELECT 1 FROM abstractor_abstractions aa WHERE aa.deleted_at IS NULL AND aa.about_type = '#{self.to_s}' AND #{self.table_name}.id = aa.about_id) AND NOT EXISTS (SELECT 1 FROM abstractor_abstractions aa WHERE aa.deleted_at IS NULL AND aa.about_type = '#{self.to_s}' AND #{self.table_name}.id = aa.about_id AND COALESCE(aa.value, '') = '' AND COALESCE(aa.unknown, ?) != ? AND COALESCE(aa.not_applicable, ?) != ?)", false, true, false, true])
         else
           where(nil)
         end

data/lib/abstractor/version.rb

@@ -1,3 +1,3 @@
 module Abstractor
-  VERSION = '2.1.0'
+  VERSION = '2.1.01'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.01
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova