abstractor 1.0.13 → 1.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODE2ODcyZDAyMTdjM2I5ODg3ZjExMTZkMTVkM2QwMGUzNzZiNmFiYg==
+    YWYyNzk5NjkxOTcyZjMyZjg2MDM0OWQ0MzgwZWVhZTZkMGFhMzY4OA==
   data.tar.gz: !binary |-
-    YTU1NzA5OGM3MTI5MjUyYThiNTc0MDAyYjU4MGViZmU3MTkyMTliNA==
+    ZWYxNTJlNjA1NDYzYjJkMDdjOTYzMDk5NjMyMjM5NTRhOTYyNmQ3ZA==
 SHA512:
   metadata.gz: !binary |-
-    MWRkMGRjZTRkMWZhZDYyMzUyYWEwYjJlZDhiYThhYTA1MmVlNjZjMDFiMjYz
-    MDFmNTQ1OWFlZGQ3Mzg3NWM3YzQ2ZjViMWI4NzU1OTdmYTk4ZjBmNWIwMmUw
-    YjFmZjQ3YTZjYzI3OGM3MmQ0YWE0YmUwMDIxMDAzN2M5ZGMxMzY=
+    MTNhZDQ1Mzg0MzRiYTI4Nzc4ODE3ZTFiMmMzZWRhNzE3NjlmNzA2NTQ1MjAy
+    YzhlMTJhN2IxMWFlODA5YjdjMjliOWEwYTI2Y2ZiZGFkNGRhZGYxNzliODBk
+    M2U1ZTk4MjE4Zjk0ZmU4MGY1MmZlMjhlZWE2YzQxODhmNDY0ZDM=
   data.tar.gz: !binary |-
-    MWI3N2ZhMDdlOWYzM2JmNWE2YmYxYTNlMDZjNDkzZTBkZGI1OTQ0NzdkNzM4
-    NzZhZTdmMjM4ZWRiZTJlYWU2OWE3OTUzNTZjNjFlZjQ2OGIzMjQwNDk3ZjRl
-    OTdjNmJkNWIzYWQxMTNlNzhiYWIwMjQxMzNmNzFhNGFjMjZmZWI=
+    OTI1ZTUyZGQ3YzAxZDVjNDUxNjdhOGZmY2MyOTE0Y2NjNzJlYzlkOGJiZWJj
+    MTc4MTE1ZTU3MmEyY2UzNzk1YjQ4ODAzMmIzNDYzZDQ3ODhhZDljYzNjZTlh
+    ZmQ3MGEzMmI0ZDk5ZTg3ODZmNmI1NzFiODQwZjUzOTlkMjgwZTc=

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

@@ -35,15 +35,15 @@
                 = abstractor_suggestion.display_value
                 - if abstractor_suggestion.abstractor_suggestion_sources.any?
                   - abstractor_suggestion.abstractor_suggestion_sources.each do |abstractor_suggestion_source|
-                    - from_method = abstractor_suggestion_source.abstractor_abstraction_source.from_method
+                    - from_method = abstractor_suggestion_source.source_method
                     - if about.respond_to?(from_method)
                       %span{ :class => 'abstractor_abstraction_source_tooltip_img label', :rel => "#abstraction_text_#{abstractor_suggestion_source.id}", :title => "#{about.class.to_s} #{from_method}"}
                         = image_tag('abstractor/page.png', :id => "abstraction_text_link_#{abstractor_suggestion_source.id}")
                       %div{ :id => "abstraction_text_#{abstractor_suggestion_source.id}", :class => 'abstractor_abstraction_source_tooltip'}
                         - abstractable_from_column = about.send(from_method)
                         - unless abstractable_from_column.nil?
-                          - if abstractor_suggestion_source.match_value
-                            = Abstractor::UserInterface.highlight(simple_format(abstractable_from_column.clone), abstractor_suggestion_source.match_value.strip)
+                          - if abstractor_suggestion_source.sentence_match_value
+                            = Abstractor::UserInterface.highlight(simple_format(abstractable_from_column.clone), abstractor_suggestion_source.sentence_match_value.strip)
                           - else
                             = simple_format(abstractable_from_column.clone)
             .column-3

data/lib/abstractor/abstractable.rb

@@ -51,14 +51,16 @@ module Abstractor
         abstractor_abstractions.map(&:abstractor_suggestions).flatten.select { |as| Array.new(abstractor_suggestion_statuses).any? { |abstractor_suggestion_status| as.abstractor_suggestion_status == abstractor_suggestion_status } }
       end
 
-      def remove_abstractions
+      def remove_abstractions(only_unreviewed = true)
         abstractor_abstractions.each do |abstractor_abstraction|
-          abstractor_abstraction.abstractor_suggestions.each do |abstractor_suggestion|
-            abstractor_suggestion.abstractor_suggestion_sources.destroy_all
-            abstractor_suggestion.abstractor_suggestion_object_value.destroy
-            abstractor_suggestion.destroy
+          if !only_unreviewed || (only_unreviewed && abstractor_abstraction.unreviewed?)
+            abstractor_abstraction.abstractor_suggestions.each do |abstractor_suggestion|
+              abstractor_suggestion.abstractor_suggestion_sources.destroy_all
+              abstractor_suggestion.abstractor_suggestion_object_value.destroy
+              abstractor_suggestion.destroy
+            end
+            abstractor_abstraction.destroy
           end
-          abstractor_abstraction.destroy
         end
       end
     end
@@ -80,15 +82,14 @@ module Abstractor
       end
 
       ##
-      # Reports the abstractor subjects associated with the abstractable entity.
+      # Returns the abstractor subjects associated with the abstractable entity.
+      #
       # By default, the method will return all abstractor subjects.
-      # The :grouped option allows the filtration to grouped or non-grouped
-      # abstractor subjects.
-      # grouped: true filters to only grouped abstractor subjects.
-      # grouped: false filters to only nont-grouped abstractor subjects.
       #
-      # @param [Hash] options to filter the the list of abstractor subjects
+      # @param [Hash] options the options to filter the objects returned
+      # @option options [Boolean] :grouped Filters the list of Abstactor::AbstractorSubject objects to grouped and non-grouped.  Defaults to nil which returns all objects.
       # @return ActiveRecord::Relation list of Abstactor::AbstractorSubject objects
+
       def abstractor_subjects(options = {})
         options = { grouped: nil }.merge(options)
         subjects = Abstractor::AbstractorSubject.where(subject_type: self.to_s)
@@ -104,14 +105,12 @@ module Abstractor
       end
 
       ##
-      # Reports the abstractor abstraction schemas associated with the abstractable entity.
+      # Returns the abstractor abstraction schemas associated with the abstractable entity.
+      #
       # By default, the method will return all abstractor abstraction schemas.
-      # the :grouped options allows the filtration to grouped or non-grouped
-      # abstractor abstraction schemas.
-      # grouped: true filters to only grouped abstractor abstraction schemas.
-      # grouped: false filters to only nont-grouped abstractor abstraction schemas.
       #
-      # @param [Hash] options to filter the the list of abstractor abstractions schemas
+      # @param [Hash] options the options to filter the objects returned
+      # @option options [Boolean] :grouped Filters the list of Abstractor::AbstractorAbstractionSchema objects to grouped and non-grouped.  Defaults to nil which returns all objects.
       # @return ActiveRecord::Relation list of Abstactor::AbstractorAbstractionSchema objects
       def abstractor_abstraction_schemas(options= {})
         options = { grouped: nil }.merge(options)

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

@@ -59,6 +59,11 @@ module Abstractor
             abstractor_suggestion.suggested_value == suggested_value
           end
         end
+
+        def unreviewed?
+          abstractor_suggestion_status_needs_review = Abstractor::AbstractorSuggestionStatus.where(name: 'Needs review').first
+          abstractor_suggestions.any? { |abstractor_suggestion| abstractor_suggestion.abstractor_suggestion_status == abstractor_suggestion_status_needs_review }
+        end
       end
     end
   end

data/lib/abstractor/version.rb

@@ -1,3 +1,3 @@
 module Abstractor
-  VERSION = '1.0.13'
+  VERSION = '1.0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails