abstractor 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e12e1a6577e6efe1216cce735b4bf8430bb6d2c6
-  data.tar.gz: d92a5873f58d49d1bb637b604d5a9e387b437b7f
+  metadata.gz: d36a4ea709f125c6e0645f86a4ed3b465e636d21
+  data.tar.gz: f15970922eafe5c42cfcc3ac4ee3963d21e338cf
 SHA512:
-  metadata.gz: 9dbc5beb80be2775fa9776557fc565d6fed3480a891c893c4252df7297facff07f5c17c46a15f03d9fecb0c1ec2fc97b6e417938bc1a9c9ccfec4e4ee6708705
-  data.tar.gz: 764ae53872aafc7c7aac5628609d8f208a60f2cb24ac3468d90903555e74b6fac565120f1d0721e2e28454d7ef50bce4d12ea40a8a5b4780d923ed249411db11
+  metadata.gz: 827b8ec3e819dfad2c5730f5a3f006480e30b581f0fde61d065e640eee227bcb85df97abb3e3be4a196a6032b63e28c3932ef42bbded2d1156f98aaa8ef1cb49
+  data.tar.gz: 5a14b265e150a75900ff975526b41d5d6636ce24994cb8f4565d5babdb5dae33972c557044601165e84b2ea814c53ce8d6bf3419750207a5d16265776656a9b7

data/lib/abstractor/abstractable.rb

@@ -32,7 +32,7 @@ module Abstractor
       end
 
       ##
-      # Returns all abstractions for the abstractable entity by abstraction schemas.
+      # Returns all abstractions for the abstractable entity by abstraction options.
       #
       # @param [Hash] options the options to filter the list of abstractions to a namespace.
       # @option options [Array] :abstractor_abstraction_schema_ids List of [Abstractor::AbstractorAbstractionSchema] ids
@@ -194,6 +194,42 @@ module Abstractor
     end
 
     module ClassMethods
+      ##
+      # Returns all abstractable entities filtered by the parameter abstractor_suggestion_type:
+      #
+      # * 'unknown': Filter abstractable entites having at least one suggestion withat a suggested value of 'unknown'
+      # * 'not unknown': Filter abstractable entites having at least one suggestion with an acutal value
+      #
+      # @param [String] abstractor_suggestion_type Filter abstactable entities that have a least one 'unknwon' or at least one 'not unknown' suggestion
+      # @param [Hash] options The options to filter the entities returned.
+      # @option options [String] :namespace_type The type parameter of the namespace to filter the entities.
+      # @option options [Integer] :namespace_id The instance parameter of the namespace to filter the entities.
+      # @option options [List of Integer, List of ActiveRecord::Relation] :abstractor_abstraction_schemas The list of abstractor abstraction schemas to filter upon.  Defaults to all abstractor abstraction schemas if not specified.
+      # @return [ActiveRecord::Relation] List of abstractable entities.
+      def by_abstractor_suggestion_type(abstractor_suggestion_type, options = {})
+        options = { namespace_type: nil, namespace_id: nil }.merge(options)
+        options = { abstractor_abstraction_schemas: abstractor_abstraction_schemas }.merge(options)
+        if options[:namespace_type] || options[:namespace_id]
+          case abstractor_suggestion_type
+          when Abstractor::Enum::ABSTRACTION_SUGGESTION_TYPE_UNKNOWN
+            where(["EXISTS (SELECT 1 FROM abstractor_abstractions aa JOIN abstractor_subjects sub ON aa.abstractor_subject_id = sub.id AND sub.namespace_type = ? AND sub.namespace_id = ? AND sub.abstractor_abstraction_schema_id IN (?) JOIN abstractor_suggestions sug ON aa.id = sug.abstractor_abstraction_id WHERE aa.deleted_at IS NULL AND aa.about_type = '#{self.to_s}' AND #{self.table_name}.id = aa.about_id AND sug.unknown = ?)", options[:namespace_type], options[:namespace_id], options[:abstractor_abstraction_schemas], true])
+          when Abstractor::Enum::ABSTRACTION_SUGGESTION_TYPE_NOT_UNKNOWN
+            where(["EXISTS (SELECT 1 FROM abstractor_abstractions aa JOIN abstractor_subjects sub ON aa.abstractor_subject_id = sub.id AND sub.namespace_type = ? AND sub.namespace_id = ? AND sub.abstractor_abstraction_schema_id IN (?) JOIN abstractor_suggestions sug ON aa.id = sug.abstractor_abstraction_id WHERE aa.deleted_at IS NULL AND aa.about_type = '#{self.to_s}' AND #{self.table_name}.id = aa.about_id AND COALESCE(sug.unknown, ?) = ? AND sug.suggested_value IS NOT NULL AND COALESCE(sug.suggested_value, '') != '' )", options[:namespace_type], options[:namespace_id], options[:abstractor_abstraction_schemas], false, false])
+          else
+            where(["EXISTS (SELECT 1 FROM abstractor_abstractions aa JOIN abstractor_subjects sub ON aa.abstractor_subject_id = sub.id AND sub.namespace_type = ? AND sub.namespace_id = ? AND sub.abstractor_abstraction_schema_id IN (?) WHERE aa.deleted_at IS NULL AND aa.about_type = '#{self.to_s}' AND #{self.table_name}.id = aa.about_id)", options[:namespace_type], options[:namespace_id], options[:abstractor_abstraction_schemas]])
+          end
+        else
+          case abstractor_suggestion_type
+          when Abstractor::Enum::ABSTRACTION_SUGGESTION_TYPE_UNKNOWN
+            where(["EXISTS (SELECT 1 FROM abstractor_abstractions aa JOIN abstractor_subjects sub ON aa.abstractor_subject_id = sub.id AND sub.abstractor_abstraction_schema_id IN (?) JOIN abstractor_suggestions sug ON aa.id = sug.abstractor_abstraction_id WHERE aa.deleted_at IS NULL AND aa.about_type = '#{self.to_s}' AND #{self.table_name}.id = aa.about_id AND sug.unknown = ?)", options[:abstractor_abstraction_schemas], true])
+          when Abstractor::Enum::ABSTRACTION_SUGGESTION_TYPE_NOT_UNKNOWN
+            where(["EXISTS (SELECT 1 FROM abstractor_abstractions aa JOIN abstractor_subjects sub ON aa.abstractor_subject_id = sub.id AND sub.abstractor_abstraction_schema_id IN (?) JOIN abstractor_suggestions sug ON aa.id = sug.abstractor_abstraction_id WHERE aa.deleted_at IS NULL AND aa.about_type = '#{self.to_s}' AND #{self.table_name}.id = aa.about_id AND COALESCE(sug.unknown, ?) = ? AND sug.suggested_value IS NOT NULL AND COALESCE(sug.suggested_value, '') != '' )", options[:abstractor_abstraction_schemas], false, false])
+          else
+            where(nil)
+          end
+        end
+      end
+
       ##
       # Returns all abstractable entities filtered by the parameter abstractor_abstraction_status:
       #

data/lib/abstractor/enum.rb

@@ -8,8 +8,13 @@ module Abstractor
     ABSTRACTION_STATUS_REVIEWED = 'reviewed'
     ABSTRACTION_STATUSES = [ABSTRACTION_STATUS_NEEDS_REVIEW, ABSTRACTION_STATUS_REVIEWED]
 
+    ABSTRACTION_SUGGESTION_TYPE_UNKNOWN = 'unknown'
+    ABSTRACTION_SUGGESTION_TYPE_NOT_UNKNOWN = 'not unknown'
+    ABSTRACTION_SUGGESTION_TYPES = [ABSTRACTION_SUGGESTION_TYPE_UNKNOWN, ABSTRACTION_SUGGESTION_TYPE_NOT_UNKNOWN]
+
     ABSTRACTOR_SECTION_TYPE_CUSTOM = 'custom'
     ABSTRACTOR_SECTION_TYPE_NAME_VALUE = 'name/value'
+    ABSTRACTOR_SECTION_TYPES = [ABSTRACTOR_SECTION_TYPE_CUSTOM, ABSTRACTOR_SECTION_TYPE_NAME_VALUE]
 
     ABSTRACTOR_SUGGESTION_STATUS_NEEDS_REVIEW = 'Needs review'
     ABSTRACTOR_SUGGESTION_STATUS_ACCEPTED = 'Accepted'

data/lib/abstractor/version.rb

@@ -1,3 +1,3 @@
 module Abstractor
-  VERSION = '4.3.0'
+  VERSION = '4.3.1'
 end

data/lib/generators/abstractor/install/install_generator.rb

@@ -10,7 +10,7 @@ module Abstractor
     class_option "customize-helpers", :type => :boolean
     class_option "customize-layout", :type => :boolean
     class_option "current-user-helper", :type => :string
-    class_option "install-stanford-core-nlp", :type => :boolean
+    class_option "no-install-stanford-core-nlp", :type => :boolean
 
     def self.source_paths
       paths = self.superclass.source_paths
@@ -55,7 +55,7 @@ module Abstractor
     end
 
     def setup_stanford_core_nlp
-      unless options["install-stanford-core-nlp"]
+      unless options["no-install-stanford-core-nlp"]
         puts "Running rake abstractor:setup:stanford_core_nlp"
         puts 'Please be patient...this could take a while.'
         `rake abstractor:setup:stanford_core_nlp`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails