abstractor 4.1.1 → 4.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzNmZjFiYzZmN2M4YjMzMTA1YWE4ZTRmNjU4N2FmMTI4OTdiMDlkYg==
+    ZjQyY2M5OTQwNjg5YjliODI4MGE5YzQ4ODI2MWQxNDZkZjlhNzNlMg==
   data.tar.gz: !binary |-
-    YzRlM2RiNzI4NzQ2MWNkYzM1NDRjZjVhNGQ1MmZhYzU0ZTFhMDM0Mg==
+    Zjc4ODNkNjU1MDI2OGVkNWNjNWI2MTQ3OGRjYjM5YjAwZmVjYmUxZA==
 SHA512:
   metadata.gz: !binary |-
-    OWQwYjM2MDI5ZDgwN2E5YWU3OGY3MmJiNWI0MGFlODNmYjExNzRkOTVmMTA4
-    Yzk1ZmY3NWQ4ZWEwYmUzMzMwZWY3N2ZkYzQ2YTRjZjg1NTM5MWZhYTQ0MDQz
-    YWRkNmVlMTE5YzhiOGM0YjJlYmJkYzQwYzNkZDY5Yzc0MDBlNGU=
+    N2E1ZTcwZjZmNDg5NjNhMDcwNWE5OGFjNjcyY2Y1M2E1ZWE3YWE3ZjkzMTVh
+    YzBlYmI3ZjFmNmFhYThiMGExNWExZjBjZjNmMTM0ZWRmMWU1OWJlZWY2MTMz
+    MWIyOWU5ZDgzNzlmMjVkMWVjM2RlYTg4MmYwNGUxNjMzNTFhYTE=
   data.tar.gz: !binary |-
-    ZGIyYmUyZmU3MGNkYWJkZmQzYWYyYjdiYzQ3NTRhNTBlNWE0ZDkzNGZlZWE4
-    Yjk0OGM4M2RhY2QwYTk3OTg0ZmYyYTIxMGZlYWRkYjlkZmVkOTFlZjYxMWQ4
-    MDkxNGM5YjE2ZTU5N2JmNGRiYzM0NDhhZDA4MTU4OTY1YzIyZTY=
+    MjE4YzhiNzkwNmI0N2RkN2MyYzc4ZjI1MzAyMWUyMWVmMTEzZDkyMjUxNjlk
+    NmQyODQ2NDI0Y2M1ZGU2OTUwNjBjYjVjMDEwZTc4NzAyNWI5MzcxZDg1Zjll
+    YjhlYWNiNjZkYTIxNDFkYWVjZThkNjY5MjVhYTM0ODhhMmEyOGY=

data/app/assets/stylesheets/abstractor/{abstractor_abstractions.css → abstractor_abstractions.css.scss}

@@ -141,14 +141,14 @@
   margin-left: 5px;
 }
 .abstractor_abstractions fieldset .abstractor_abstraction_source_tooltip_img i {
-  background: url('page.png') no-repeat;
+  background: asset_url('abstractor/page.png') no-repeat;
   vertical-align: text-bottom;
   padding: 2px 10px;
   vertical-align: middle;
 }
 
 .abstractor_abstractions fieldset .abstractor_abstraction_source_tooltip_img i.abstraction_text_link_match {
-  background: url('page_green.png') no-repeat;
+  background: asset_url('abstractor/page_green.png') no-repeat;
 }
 
 .abstractor_abstractions fieldset .hidden {

data/app/assets/stylesheets/abstractor/jquery.ui.override.css.scss

@@ -59,14 +59,14 @@ table.ui-datepicker-calendar td {
 }
 .accordion_box h3 a,
 .accordion_box h3 a.visible {
-  background: #DDDDDD url(../../images/switch_minus.gif) 1% 50% no-repeat;
+  background: #DDDDDD asset_url('abstractor/switch_minus.gif') 1% 50% no-repeat;
   padding-left: 3%;
   display:block;
   border:none;
 }
 .accordion_box h3 a.hidden,
 .accordion_box h3 a.hidden:hover {
-  background-image: url(../../images/switch_plus.gif);
+  background-image: asset_url('abstractor/switch_plus.gif');
 }
 .accordion_box h3 a:hover {
   color: black;

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

@@ -56,11 +56,10 @@
       - else
         - abstractor_abstraction.abstractor_subject.abstractor_abstraction_sources.select { |s| s.abstractor_abstraction_source_type.name == 'nlp suggestion' }.each do |abstractor_abstraction_source|
           - abstractor_abstraction_source.normalize_from_method_to_sources(abstractor_abstraction.about).each do |source|
-            - dom_id = "#{abstractor_abstraction_source.id}_#{source[:source_type]}_#{source[:source_id]}_#{source[:source_method]}"
-            %span{ class: 'abstractor_abstraction_source_tooltip_img', rel: "#abstraction_text_#{dom_id}", title: "#{source[:source_type].to_s} #{source[:source_method]}"}
+            - abstractor_text = Abstractor::AbstractorAbstractionSource.abstractor_text(source)
+            - dom_id = "#{abstractor_abstraction_source.id}_#{source[:source_type]}_#{source[:source_id]}_#{source[:source_method]}#{'_'+ source[:section_name].parameterize.underscore if source[:section_name]}"
+            %span{ class: 'abstractor_abstraction_source_tooltip_img', rel: "#abstraction_text_#{dom_id}", title: "#{source[:source_type].to_s} #{source[:source_method]} #{source[:section_name]}"}
               %i{ id: "abstraction_text_link_#{dom_id}" }
-              %br
             %div{ id: "abstraction_text_#{dom_id}", class: 'tooltip'}
-              - abstractor_text = Abstractor::AbstractorAbstractionSource.abstractor_text(source)
               = simple_format(abstractor_text)
     .clear

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

@@ -46,13 +46,11 @@
       - abstraction_sources.each do |abstraction_source|
         - abstraction_source.normalize_from_method_to_sources(abstractor_abstraction.about).each do |source|
           - abstractor_text = Abstractor::AbstractorAbstractionSource.abstractor_text(source)
-          - if abstractor_text
-            - dom_id = "#{abstraction_source.id}_#{source[:source_type]}_#{source[:source_id]}_#{source[:source_method]}"
-            %span{ :class => 'abstractor_abstraction_source_tooltip_img', :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(abstractor_text)
+          - dom_id = "#{abstraction_source.id}_#{source[:source_type]}_#{source[:source_id]}_#{source[:source_method]}#{'_'+ source[:section_name].parameterize.underscore if source[:section_name]}"
+          %span{ class: 'abstractor_abstraction_source_tooltip_img', rel: "#abstraction_text_#{dom_id}", title: "#{source[:source_type]} #{source[:source_method]} #{source[:section_name]}"}
+            %i{ id: "abstraction_text_link_#{dom_id}" }
+          %div{ id: "abstraction_text_#{dom_id}", class: 'abstractor_abstraction_source_tooltip'}
+            = simple_format(abstractor_text)
     .abstraction_edit_abstraction_actions
       = f.submit 'Save'
       = link_to 'Cancel', abstractor_abstraction, :remote => true

data/db/migrate/20141120044606_add_system_generated_to_abstractor_abstraction_groups.rb

@@ -0,0 +1,5 @@
+class AddSystemGeneratedToAbstractorAbstractionGroups < ActiveRecord::Migration
+  def change
+    add_column :abstractor_abstraction_groups, :system_generated, :boolean, default: false
+  end
+end

data/db/migrate/20150110002921_create_indexes_for_performance.rb

@@ -0,0 +1,27 @@
+class CreateIndexesForPerformance < ActiveRecord::Migration
+  def change
+    #abstractor_abstraction_group_members
+    add_index :abstractor_abstraction_group_members, [:abstractor_abstraction_id], unique: false , name: 'index_abstractor_abstraction_id'
+    add_index :abstractor_abstraction_group_members, [:abstractor_abstraction_group_id], unique: false , name: 'index_abstractor_abstraction_group_id'
+
+    #abstractor_abstraction_groups
+    add_index :abstractor_abstraction_groups, [:about_id, :about_type, :deleted_at], unique: false , name: 'index_about_id_about_type_deleted_at'
+
+    #abstractor_abstractions
+    add_index :abstractor_abstractions, [:about_id, :about_type, :deleted_at], unique: false , name: 'index_about_id_about_type_deleted_at_2'
+    add_index :abstractor_abstractions, [:abstractor_subject_id], unique: false , name: 'index_abstractor_subject_id'
+
+    #abstractor_subject_group_members
+    add_index :abstractor_subject_group_members, [:abstractor_subject_id], unique: false , name: 'index_abstractor_subject_id_2'
+
+    #abstractor_subjects
+    add_index :abstractor_subjects, [:subject_type], unique: false , name: 'index_subject_type'
+    add_index :abstractor_subjects, [:namespace_type, :namespace_id], unique: false , name: 'index_namespace_type_namespace_id'
+
+    #abstractor_suggestion_sources
+    add_index :abstractor_suggestion_sources, [:abstractor_suggestion_id], unique: false , name: 'index_abstractor_suggestion_id'
+
+    #abstractor_suggestions
+    add_index :abstractor_suggestions, [:abstractor_abstraction_id], unique: false , name: 'index_abstractor_abstraction_id_2'
+  end
+end

data/lib/abstractor/abstractable.rb

@@ -24,11 +24,11 @@ module Abstractor
       # @return [ActiveRecord::Relation] List of [Abstractor::AbstractorAbstraction].
       def abstractor_abstractions_by_namespace(options = {})
         options = { namespace_type: nil, namespace_id: nil }.merge(options)
+        abstractions = abstractor_abstractions.not_deleted
         if options[:namespace_type] || options[:namespace_id]
-          abstractor_abstractions.not_deleted.where(abstractor_subject_id: self.class.abstractor_subjects(options).map(&:id))
-        else
-          abstractor_abstractions.not_deleted
+          abstractions = abstractions.where(abstractor_subject_id: self.class.abstractor_subjects(options).map(&:id))
         end
+        abstractions
       end
       ##
       # Returns all abstraction groups for the abstractable entity by a namespace.
@@ -40,7 +40,7 @@ module Abstractor
       def abstractor_abstraction_groups_by_namespace(options = {})
         options = { namespace_type: nil, namespace_id: nil }.merge(options)
         if options[:namespace_type] || options[:namespace_id]
-          groups = abstractor_abstractions_by_namespace(options).map(&:abstractor_abstraction_group).compact.uniq
+          groups = abstractor_abstraction_groups.find(abstractor_abstractions_by_namespace(options).joins(:abstractor_abstraction_group).includes(:abstractor_abstraction_group).map{|s| s.abstractor_abstraction_group.id})
         else
           groups = abstractor_abstraction_groups.not_deleted
         end
@@ -99,7 +99,7 @@ module Abstractor
       def find_or_initialize_abstractor_abstraction_group(abstractor_subject_group)
         if abstractor_abstraction_group = detect_abstractor_abstraction_group(abstractor_subject_group)
         else
-          abstractor_abstraction_group = Abstractor::AbstractorAbstractionGroup.new(abstractor_subject_group: abstractor_subject_group, about: self)
+          abstractor_abstraction_group = Abstractor::AbstractorAbstractionGroup.new(abstractor_subject_group: abstractor_subject_group, about: self, system_generated: true)
         end
         abstractor_abstraction_group
       end
@@ -219,13 +219,13 @@ module Abstractor
         options = { grouped: nil, namespace_type: nil, namespace_id: nil }.merge(options)
         subjects = Abstractor::AbstractorSubject.where(subject_type: self.to_s)
         if options[:namespace_type] || options[:namespace_id]
-          subjects = subjects.select { |subject| subject.namespace_type == options[:namespace_type] && subject.namespace_id == options[:namespace_id] }
+          subjects = subjects.where(namespace_type: options[:namespace_type], namespace_id: options[:namespace_id])
         end
         subjects = case options[:grouped]
         when true
-          subjects.select{ |s| s.abstractor_subject_group_member }
+          subjects.joins(:abstractor_subject_group).includes(:abstractor_subject_group)
         when false
-          subjects.reject{ |s| s.abstractor_subject_group_member }
+          subjects.where("not exists (select 'a' from abstractor_subject_group_members where abstractor_subject_id = abstractor_subjects.id)")
         when nil
           subjects
         end
@@ -248,7 +248,7 @@ module Abstractor
 
       def abstractor_subject_groups(options = {})
         options = { grouped: true, namespace_type: nil, namespace_id: nil }.merge(options)
-        abstractor_subjects(options).map(&:abstractor_subject_group).compact.uniq
+        Abstractor::AbstractorSubjectGroup.find(abstractor_subjects(options).map{|s| s.abstractor_subject_group.id})
       end
 
       ##

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

@@ -29,7 +29,7 @@ module Abstractor
           #
           # @return [Boolean]
           def removable?
-            abstractor_abstractions.map(&:abstractor_suggestions).flatten.empty?
+            !system_generated
           end
 
           private

data/lib/abstractor/version.rb

@@ -1,3 +1,3 @@
 module Abstractor
-  VERSION = '4.1.1'
+  VERSION = '4.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -442,8 +442,8 @@ files:
 - app/assets/javascripts/abstractor/application.js
 - app/assets/javascripts/abstractor/combobox.js
 - app/assets/javascripts/abstractor/jquery/jquery.form.js
-- app/assets/stylesheets/abstractor/abstractor_abstractions.css
-- app/assets/stylesheets/abstractor/application.css
+- app/assets/stylesheets/abstractor/abstractor_abstractions.css.scss
+- app/assets/stylesheets/abstractor/application.css.scss
 - app/assets/stylesheets/abstractor/jquery.ui.override.css.scss
 - app/controllers/abstractor/abstractor_abstraction_groups_controller.rb
 - app/controllers/abstractor/abstractor_abstractions_controller.rb
@@ -517,6 +517,8 @@ files:
 - db/migrate/20140816005228_add_namespace_to_abstractor_subjects.rb
 - db/migrate/20141028020332_add_cardinality_to_abstractor_subject_group.rb
 - db/migrate/20141107171413_add_sectioning.rb
+- db/migrate/20141120044606_add_system_generated_to_abstractor_abstraction_groups.rb
+- db/migrate/20150110002921_create_indexes_for_performance.rb
 - db/seeds.rb
 - lib/abstractor.rb
 - lib/abstractor/abstractable.rb