abstractor 1.0.12 → 1.0.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWMyMmU4Y2Q1ZWVjMDk1YjY1MzQ2MmI4OGMwNjQ2ZGNlNTY1MGQ0Mg==
+    ODE2ODcyZDAyMTdjM2I5ODg3ZjExMTZkMTVkM2QwMGUzNzZiNmFiYg==
   data.tar.gz: !binary |-
-    M2MxOThhYzIzYmY1YTBkNTE4OWYwMmE5YmI5MGQ3NjA1YmJhYzYwMA==
+    YTU1NzA5OGM3MTI5MjUyYThiNTc0MDAyYjU4MGViZmU3MTkyMTliNA==
 SHA512:
   metadata.gz: !binary |-
-    ZjMxNzBhNjU5MDBiN2I1NDZkNjVkZTcwMDc5ZWVlYTZhNDIxODUyY2E0YzQ1
-    YjM0YmNhNTQxYWRlNGMxZTczY2Q5N2M4NjlmYzliMTUxYTA1MjE0ZGM5NjI4
-    Mjk0ZDEyNDFkZmQyMDI1MzM2MjI1ZTc4OWRmNjVhMDZiYTU0NGI=
+    MWRkMGRjZTRkMWZhZDYyMzUyYWEwYjJlZDhiYThhYTA1MmVlNjZjMDFiMjYz
+    MDFmNTQ1OWFlZGQ3Mzg3NWM3YzQ2ZjViMWI4NzU1OTdmYTk4ZjBmNWIwMmUw
+    YjFmZjQ3YTZjYzI3OGM3MmQ0YWE0YmUwMDIxMDAzN2M5ZGMxMzY=
   data.tar.gz: !binary |-
-    OGY0ZTMzZThhNGI3MDdhMTAwN2QyZGE1YmQxYzEyNmRiZmRlMzE0MDNiNGY3
-    NjIyODNhNzg2ZTkyYzI5MzIzYzhkMjQ3NDFiMTFmM2ZjMzk5M2QwMmE5MmE0
-    YzQyMGU2ZGRmMGYwZWMzYzQ0ZTQ0MWQ4ZWM1ZTQ3MzBmOGRlNzc=
+    MWI3N2ZhMDdlOWYzM2JmNWE2YmYxYTNlMDZjNDkzZTBkZGI1OTQ0NzdkNzM4
+    NzZhZTdmMjM4ZWRiZTJlYWU2OWE3OTUzNTZjNjFlZjQ2OGIzMjQwNDk3ZjRl
+    OTdjNmJkNWIzYWQxMTNlNzhiYWIwMjQxMzNmNzFhNGFjMjZmZWI=

data/lib/abstractor/abstractable.rb

@@ -79,24 +79,47 @@ module Abstractor
         end
       end
 
-      def abstractor_subjects
-        Abstractor::AbstractorSubject.where(subject_type: self.to_s)
+      ##
+      # Reports 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
+      # @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)
+        subjects = case options[:grouped]
+        when true
+          subjects.select{ |s| s.abstractor_subject_group_member}
+        when false
+          subjects.reject{ |s| s.abstractor_subject_group_member}
+        when nil
+          subjects
+        end
+        subjects
       end
 
-      def abstractor_abstraction_schemas
-        abstractor_subjects.map(&:abstractor_abstraction_schema)
+      ##
+      # Reports 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
+      # @return ActiveRecord::Relation list of Abstactor::AbstractorAbstractionSchema objects
+      def abstractor_abstraction_schemas(options= {})
+        options = { grouped: nil }.merge(options)
+        abstractor_subjects(options).map(&:abstractor_abstraction_schema)
       end
 
       def abstractor_subject_groups
-        abstractor_subjects.map(&:abstractor_subject_group).uniq
-      end
-
-      def prepare_pivot_select
-        select =[]
-        abstractor_abstraction_schemas.map(&:predicate).each do |predicate|
-          select << "MAX(CASE WHEN data.predicate = '#{predicate}' THEN data.value ELSE NULL END) AS #{predicate}"
-        end
-        select = select.join(',')
+        abstractor_subjects.map(&:abstractor_subject_group).compact.uniq
       end
 
       ##
@@ -113,8 +136,8 @@ module Abstractor
       #
       # @return ActiveRecord::Relation
       def pivot_abstractions
-        select = prepare_pivot_select
-        joins = "JOIN
+        select = prepare_pivot_select(grouped: false)
+        joins = "LEFT JOIN
         (
         SELECT #{self.table_name}.id AS subject_id,
         #{select}
@@ -157,11 +180,10 @@ module Abstractor
       #
       # @param [String] abstractor_subject_groups_name name of {Abstractor::Methods::Models:AbtractorSubjectGroup}
       # @return ActiveRecord::Relation
-      # @see Abstractor::Methods::Models:AbtractorSubjectGroup
-
+      # @see Abstractor::Methods::Models:AbstractorSubjectGroup
       def pivot_grouped_abstractions(abstractor_subject_groups_name)
         abstractor_subject_group = abstractor_subject_groups.detect { |abstractor_subject_group| abstractor_subject_group.name ==  abstractor_subject_groups_name }
-        select = prepare_pivot_select
+        select = prepare_pivot_select(grouped: true)
         joins = "JOIN
         (
         SELECT #{self.table_name}.id AS subject_id,
@@ -185,6 +207,18 @@ module Abstractor
         "
         joins(joins).select("#{self.table_name}.*, pivoted_abstractions.*")
       end
+
+      private
+
+        def prepare_pivot_select(options= {})
+          options.reverse_merge!({ grouped: nil })
+          options = { grouped: nil }.merge(options)
+          select =[]
+          abstractor_abstraction_schemas(options).map(&:predicate).each do |predicate|
+            select << "MAX(CASE WHEN data.predicate = '#{predicate}' THEN data.value ELSE NULL END) AS #{predicate}"
+          end
+          select = select.join(',')
+        end
     end
   end
 end

data/lib/abstractor/version.rb

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

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

@@ -3,6 +3,7 @@ require "rails/generators"
 
 module Abstractor
   class InstallGenerator < Rails::Generators::Base
+    class_option "no-migrations", :type => :boolean
     class_option "customize-all", :type => :boolean
     class_option "customize-controllers", :type => :boolean
     class_option "customize-models", :type => :boolean

data/lib/tasks/abstractor_tasks.rake

@@ -8,7 +8,7 @@ namespace :abstractor do
       Abstractor::Setup.system
     end
 
-    desc "Setup Stanford CoreNLP library in lib/stanford-core-nlp directory"
+    desc "Setup Stanford CoreNLP library in lib/stanford-corenlp-full-2014-01-04/ directory"
     task :stanford_core_nlp => :environment do
       puts 'Please be patient...This could take a while.'
       file = "#{Rails.root}/lib/stanford-corenlp-full-2014-01-04.zip"
@@ -23,7 +23,7 @@ namespace :abstractor do
 
       file = "#{Rails.root}/lib/stanford-corenlp-full-2014-01-04/bridge.jar"
       open(file, 'wb') do |fo|
-        fo.print open('https://github.com/louismullie/stanford-core-nlp/blob/master/bin/bridge.jar').read
+        fo.print open('https://github.com/louismullie/stanford-core-nlp/blob/master/bin/bridge.jar?raw=true').read
       end
     end
   end

metadata

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