abstractor 2.1.01 → 2.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmUyMzBmNjgwNGM2MGZhMjBiMjI2YzQ4ODIyYjM2YzRlMWVlMWM1Yg==
+    NGYyMTA2ODY2YWM5ZTgzNzNhM2Y4NmM3ZDBiMDhlZWRmYjcwZmVmYg==
   data.tar.gz: !binary |-
-    YmM5ZWE3ZDhhMTY1NzEzMjM0NjQyODEzMzNmNWZmYmU2NTQyYzU1NA==
+    YjhkNzBiNTMwMzAzNTQyYWZlNTJmMzgzYjc2ZTcyYjc3NWM0YzcyMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjMwNjNhMGQzNjY4MGQwZThmZDVkZjhiMTBjMWM1NGI1ZmFkMGYzZjFmNWU5
-    OTgyMzUzMjFiZjE0YjRkMTQwNzdmMzU0NTdmZTQwOTYwOTU5ZWVmNjA0YTk2
-    NzAwMjNmNWFmMWU2MDdhMzUxOTk5ZjQ2Mzc0MzAzYjhjOTViYjY=
+    OGQ3NWMwNmNmYzlkYzgyZjUxNDYyOTg4M2E0MmNjMmFkOTAwMjU1Yzg0YTAz
+    NDVmN2Q2MzVmY2VmYWI5MjkwMjZjZDcyN2VlOTYwNmFmZjVhZjFmNzJmZDZi
+    NDIzYTA3YTgwY2M4MWU2ZWVjMGU0NTY0NzE4MzUwM2MwZTEyNzg=
   data.tar.gz: !binary |-
-    MjZmMjA3MDQ4NDUzZWFlMDA0Mjc1NzcwZmFhOTBiNGUxYjQ4YmY5YzVkNDg2
-    N2RmYzU0YTg2ZWY2NGEzYjFmYWEzNTdkMjZmMDdkNDkwZDY5OTQ4N2NiNTAy
-    ZGY4MzRkMGQzZmZkYTY2MDIyNzFhZjBjNjBiNjllZDRhOGM0M2E=
+    ZTI0YmIyMDI2N2Q0ODk5ZDdmYzU3YTI0NDUzYTBlZjQ1OTA1OWY4Mjg1OWU1
+    MTVmNzQ0YjI2NjQxZmJmODc1MGE4OWU1ZjU1OTA0ZGM5MjJiNzNhNTQxMDBi
+    ZWJlZTZiZWJjYjlmYmE0YTRjN2U0NDNmYzQxMWMzOTNmMjYzYmU=

data/lib/abstractor/methods/models/abstractor_abstraction.rb

@@ -59,10 +59,12 @@ module Abstractor
             end
           end
 
-          def detect_abstractor_suggestion(suggested_value)
+          def detect_abstractor_suggestion(suggested_value, unknown, not_applicable)
             abstractor_suggestion = nil
             abstractor_suggestion = abstractor_suggestions(true).detect do |abstractor_suggestion|
-              abstractor_suggestion.suggested_value == suggested_value
+              abstractor_suggestion.suggested_value == suggested_value &&
+              abstractor_suggestion.unknown == unknown &&
+              abstractor_suggestion.not_applicable == not_applicable
             end
           end
 
@@ -121,6 +123,12 @@ module Abstractor
                       abstractor_suggestion.save!
                     end
                   end
+
+                  if abstractor_abstraction.abstractor_suggestions.empty?
+                    abstractor_abstraction.unknown = unknown
+                    abstractor_abstraction.not_applicable = not_applicable
+                    abstractor_abstraction.save!
+                  end
                 end
               end
             end

data/lib/abstractor/methods/models/abstractor_subject.rb

@@ -266,7 +266,7 @@ module Abstractor
               abstractor_object_value = suggested_value
               suggested_value = suggested_value.value
             end
-            abstractor_suggestion = abstractor_abstraction.detect_abstractor_suggestion(suggested_value) unless suggested_value.nil?
+            abstractor_suggestion = abstractor_abstraction.detect_abstractor_suggestion(suggested_value, unknown, not_applicable)
             if !abstractor_suggestion
               abstractor_suggestion_status_needs_review = Abstractor::AbstractorSuggestionStatus.where(name: 'Needs review').first
               abstractor_suggestion = Abstractor::AbstractorSuggestion.create(
@@ -280,7 +280,7 @@ module Abstractor
               abstractor_suggestion.abstractor_suggestion_object_value = Abstractor::AbstractorSuggestionObjectValue.new(abstractor_object_value: abstractor_object_value) if abstractor_object_value
             end
 
-            abstractor_suggestion_source = abstractor_suggestion.detect_abstractor_suggestion_source(abstractor_abstraction_source, sentence_match_value, source_id, source_type)
+            abstractor_suggestion_source = abstractor_suggestion.detect_abstractor_suggestion_source(abstractor_abstraction_source, sentence_match_value, source_id, source_type, source_method)
             if !abstractor_suggestion_source
               Abstractor::AbstractorSuggestionSource.create(
                                                 abstractor_abstraction_source: abstractor_abstraction_source,
@@ -332,7 +332,7 @@ module Abstractor
           def create_unknown_abstractor_suggestion(about, abstractor_abstraction, abstractor_abstraction_source)
             #Create an 'unknown' suggestion based on matching nothing only if we have not made a suggstion
             abstractor_abstraction_source.normalize_from_method_to_sources(about).each do |source|
-              if abstractor_abstraction.abstractor_suggestions(true).empty?
+              if abstractor_abstraction.abstractor_suggestions(true).select { |abstractor_suggestion| abstractor_suggestion.unknown != true }.empty?
                 suggest(abstractor_abstraction, abstractor_abstraction_source, nil, nil, source[:source_id], source[:source_type].to_s, source[:source_method], nil, true, nil, nil, nil)
               end
             end

data/lib/abstractor/methods/models/abstractor_suggestion.rb

@@ -74,12 +74,13 @@ module Abstractor
           abstractor_abstraction.abstractor_suggestions.where('id != ?', id)
         end
 
-        def detect_abstractor_suggestion_source(abstractor_abstraction_source, sentence_match_value, source_id, source_type)
+        def detect_abstractor_suggestion_source(abstractor_abstraction_source, sentence_match_value, source_id, source_type, source_method)
           abstractor_suggestion_source = abstractor_suggestion_sources.detect do |abstractor_suggestion_source|
             abstractor_suggestion_source.abstractor_abstraction_source == abstractor_abstraction_source &&
             abstractor_suggestion_source.sentence_match_value == sentence_match_value &&
             abstractor_suggestion_source.source_id == source_id &&
-            abstractor_suggestion_source.source_type == source_type
+            abstractor_suggestion_source.source_type == source_type &&
+            abstractor_suggestion_source.source_method == source_method
           end
         end
       end

data/lib/abstractor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 2.1.01
+  version: 2.1.2
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails