abstractor 4.0.1 → 4.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODI2YTMwYzQzYWNkM2RkYmMwNDQyNTVlMzJhMWM5ZGVlYTRiN2NmNw==
+    NmFjZjhkYzhlZWVkZGI1M2Q2YWZkNmUxNTk2OGZjMDljMzc5NWNjNA==
   data.tar.gz: !binary |-
-    ZjE0MDk4NzdkNzE2YjM2MjUyM2VjODgxMzAzZGE5Y2U4MzI3OGQwMw==
+    NzNmMzg2ZTI1Mjc3ZTU2MjI1YmEyNjE3NjVlMTRhMmU0YWIzZjI2Mw==
 SHA512:
   metadata.gz: !binary |-
-    Y2EzZDU0N2ZhNWRhMWQwYjk4NmM4MjI3MzE0M2Y3Mjc3MTc3ZWRkYTY4NDM5
-    MzgxZGU0YWIwMmEwZDQxM2FhMjE0Njc0NjE0N2Y3NjM1ODk5YmNjYjRkMzFl
-    MDEwNjYzYjBlYWZmMmZhYTVhZWM1YWI3MGI3MWI0MzQ3MDJlOWI=
+    MDEwYzc1NWM5MDZjMDYwMGIxZjY1OGQ2NGU2ZGU4MzUxYmE4MTllYTkwYTg3
+    ZWYzNjE3YTBkNTVmMzY2MjczZGZiMGMxZTQ1MzVhNjljMjA1MjQwNWIyMTVm
+    ZTg3OGI4YWU0YjA3OGE5NzkxYjI2YjZlZTFkNGY2ZGNhYjM1YzA=
   data.tar.gz: !binary |-
-    NzJmMjZiMjc5ZDkwMDg5ZDkxNmI5YzYwMGRlYjFlNDc2OTk3OTYyNGM5ZTg5
-    MzkzYzcyMzg2MDMwOTZhMzA1NzNhMzNmZDU5MGVhZmFjNDkwMDIzODhhZTEz
-    OGFlZGFmYmUxYTc5MTllMDkyZGQ2OGZhNjE4M2NiNmU5NDNiMGE=
+    NDMyM2FkYTAwYjQ4ZDc2MGY5NmU4OTM1MzQxNDhhNWEyZmZiZTE3MTFmOTQx
+    NmRmOGZiNTQzOGI4YTVmMWQ2MDg5YWM4MWQyNmYzMWRjYTQxZDg1ODI0NWYx
+    YzQ4MTlmNmQyMzI4NTI3ZThkNjk0YTQ0ODI1MDQzOTk3NjgxMGM=

data/app/assets/stylesheets/abstractor/abstractor_abstractions.css

@@ -51,146 +51,53 @@
   margin: 0.1em 0 0.25em !important;
 }
 
-.abstractor_abstractions fieldset .column-1-5 {
-  display: inline;
-  float: left;
-  margin-right: 10px;
-  width: 62.625px;
-}
-
-* html .abstractor_abstractions fieldset .column-1-5 {
-  overflow-x: hidden;
-}
-
-.abstractor_abstractions fieldset .column-1 {
-  display: inline;
-  float: left;
-  margin-right: 10px;
-  width: 38.41667px;
-}
-
-* html .abstractor_abstractions fieldset .column-1 {
-  overflow-x: hidden;
-}
-
-.abstractor_abstractions fieldset .column-2 {
-  display: inline;
-  float: left;
-  margin-right: 10px;
-  width: 86.83333px;
-}
-
-* html .abstractor_abstractions fieldset .column-2 {
-  overflow-x: hidden;
-}
-
-.abstractor_abstractions fieldset .column-3 {
+.abstractor_abstractions fieldset .abstractor_abstraction_schema_name,
+.abstractor_abstractions fieldset .abstractor_suggestion_status,
+.abstractor_abstractions fieldset .abstractor_suggestion_sources {
   display: inline;
   float: left;
   margin-right: 10px;
   width: 135.25px;
 }
 
-* html .abstractor_abstractions fieldset .column-3 {
-  overflow-x: hidden;
-}
-
-.abstractor_abstractions fieldset .column-4 {
+.abstractor_abstractions fieldset .abstraction_edit_abstraction_actions {
   display: inline;
   float: left;
   margin-right: 10px;
   width: 183.66667px;
 }
 
-* html .abstractor_abstractions fieldset .column-4 {
-  overflow-x: hidden;
-}
-
-.abstractor_abstractions fieldset .column-5 {
+.abstractor_abstractions fieldset .abstractor_abstraction_value,
+.abstractor_abstractions fieldset .abstractor_suggestion_values {
   display: inline;
   float: left;
   margin-right: 10px;
   width: 232.08333px;
 }
 
-* html .abstractor_abstractions fieldset .column-5 {
-  overflow-x: hidden;
-}
 
-.abstractor_abstractions fieldset .column-6 {
-  display: inline;
-  float: left;
-  margin-right: 10px;
-  width: 280.5px;
-}
-
-* html .abstractor_abstractions fieldset .column-6 {
-  overflow-x: hidden;
-}
-
-.abstractor_abstractions fieldset .column-7 {
+.abstractor_abstractions fieldset .abstraction_edit_abstraction_value {
   display: inline;
   float: left;
   margin-right: 10px;
   width: 328.91667px;
 }
 
-* html .abstractor_abstractions fieldset .column-7 {
-  overflow-x: hidden;
-}
-
-.abstractor_abstractions fieldset .column-8 {
-  display: inline;
-  float: left;
-  margin-right: 10px;
-  width: 377.33333px;
-}
-
-* html .abstractor_abstractions fieldset .column-8 {
-  overflow-x: hidden;
-}
-
-.abstractor_abstractions fieldset .column-9 {
+.abstractor_abstractions fieldset .abstractor_suggestions {
   display: inline;
   float: left;
   margin-right: 10px;
   width: 425.75px;
 }
 
-* html .abstractor_abstractions fieldset .column-9 {
-  overflow-x: hidden;
-}
-
-.abstractor_abstractions fieldset .column-10 {
-  display: inline;
-  float: left;
-  margin-right: 10px;
-  width: 474.16667px;
-}
-
-* html .abstractor_abstractions fieldset .column-10 {
-  overflow-x: hidden;
-}
-
-.abstractor_abstractions fieldset .column-11 {
-  display: inline;
-  float: left;
-  margin-right: 10px;
-  width: 522.58333px;
-}
-
-* html .abstractor_abstractions fieldset .column-11 {
-  overflow-x: hidden;
-}
-
-.abstractor_abstractions fieldset .column-12 {
-  display: inline;
-  float: left;
-  margin-right: 10px;
-  width: 571px;
-}
-
-* html .abstractor_abstractions fieldset .column-12 {
+* html .abstractor_abstractions fieldset .abstractor_abstraction_schema_name,
+* html .abstractor_abstractions fieldset .abstractor_suggestion_status,
+* html .abstractor_abstractions fieldset .abstractor_suggestion_sources,
+* html .abstractor_abstractions fieldset .abstraction_edit_abstraction_actions,
+* html .abstractor_abstractions fieldset .abstractor_abstraction_value,
+* html .abstractor_abstractions fieldset .abstractor_suggestion_values,
+* html .abstractor_abstractions fieldset .abstraction_edit_abstraction_value,
+* html .abstractor_abstractions fieldset .abstractor_suggestions {
   overflow-x: hidden;
 }
 
@@ -198,7 +105,7 @@
   clear: both;
 }
 
-.abstractor_abstractions fieldset .abstraction_schema_name {
+.abstractor_abstractions fieldset .abstractor_abstraction_schema_name {
   font-weight: bold;
   margin-bottom: 0.3em;
 }
@@ -230,8 +137,18 @@
   margin-right: .5em;
 }
 
-.abstractor_abstractions fieldset .abstractor_abstraction_source_tooltip_img img {
+.abstractor_abstractions fieldset .abstractor_abstraction_source_tooltip_img {
+  margin-left: 5px;
+}
+.abstractor_abstractions fieldset .abstractor_abstraction_source_tooltip_img i {
+  background: url('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;
 }
 
 .abstractor_abstractions fieldset .hidden {
@@ -253,15 +170,9 @@
 ul.ui-autocomplete, .ui-dialog {
   z-index: 1000 !important;
 }
-.abstractor_abstractions hr {
-  background: #dddddd;
-  color: #dddddd;
-  clear: both;
-  float: none;
-  width: 100%;
-  height: 0.1em;
-  margin: 0 0 1.45em;
-  border: none;
+.abstractor_bottom_border {
+  border-bottom: 1px solid #dddddd;
+  overflow: auto;
 }
 
 /* Tooltips */
@@ -324,7 +235,7 @@ span.tooltip_img {
   font-style:italic
 }
 
-.abstractor_abstraction_actions {
+.abstractor_abstraction_actions  a{
   float: right;
 }
 .abstractor_abstraction_actions a {
@@ -357,4 +268,16 @@ span.tooltip_img {
 
 .abstractor_suggestion_values .custom_explanation label {
   font-weight: bold !important;
-}
+}
+ul.abstractor_suggestion_status_group {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+.abstractor_abstractions_header,
+.abstractor_abstraction_group_member,
+.abstractor_abstraction_group_actions {
+  border-bottom: 1px solid #dddddd;
+  overflow: auto;
+  padding-bottom: 0.25em;
+}

data/app/views/abstractor/abstractor_abstraction_groups/_form.html.haml

@@ -1,13 +1,13 @@
 - abstractor_abstraction_group ||= @abstractor_abstraction_group
 
 .abstractor_abstraction_group
-  - abstractor_abstraction_group.abstractor_abstractions.not_deleted.joins(:abstractor_subject => :abstractor_subject_group_member).order('abstractor_subject_group_members.display_order').each do |abstractor_abstraction|
-    %div{ class: "abstractor_abstraction #{Abstractor::Utility.dehumanize(abstractor_abstraction.abstractor_subject.abstractor_abstraction_schema.predicate)}" }
-      = render :partial => 'abstractor/abstractor_abstractions/fields', :locals => {:abstractor_abstraction => abstractor_abstraction}
-
-  .abstractor_abstraction_actions
+  .abstractor_abstraction_group_member
+    - abstractor_abstractions = abstractor_abstraction_group.abstractor_abstractions.not_deleted.joins(:abstractor_subject => :abstractor_subject_group_member).order('abstractor_subject_group_members.display_order')
+    - abstractor_abstractions.each_with_index do |abstractor_abstraction, index|
+      %div{ class: "abstractor_abstraction #{Abstractor::Utility.dehumanize(abstractor_abstraction.abstractor_subject.abstractor_abstraction_schema.predicate)} #{'abstractor_bottom_border' if index < abstractor_abstractions.length - 1}" }
+        = render :partial => 'abstractor/abstractor_abstractions/fields', :locals => {:abstractor_abstraction => abstractor_abstraction}
+  .abstractor_abstraction_group_actions.abstractor_abstraction_actions
     = link_to 'Not applicable group ', Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_group_path(abstractor_abstraction_group, abstractor_abstraction_value: 'not applicable')), data: { confirm: 'Are you sure?'} , method: :put, class: "abstractor_group_not_applicable_all_link", remote: true
     = link_to 'Unknown group ', Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_group_path(abstractor_abstraction_group, abstractor_abstraction_value: 'unknown')), data: { confirm: 'Are you sure?'}, method: :put, class: 'abstractor_group_unknown_all_link', remote: true
     - if abstractor_abstraction_group.removable?
-      = link_to 'Delete group', Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_group_path(abstractor_abstraction_group)), data: { confirm: 'Are you sure?'}, method: :delete, class: "abstractor_group_delete_link", remote: true
-  %hr
+      = link_to 'Delete group', Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_group_path(abstractor_abstraction_group)), data: { confirm: 'Are you sure?'}, method: :delete, class: "abstractor_group_delete_link", remote: true

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

@@ -0,0 +1,17 @@
+- if versions.any?
+  %br
+  %b History:
+  - versions.each do |version|
+    .version
+      .version_date
+        %i
+          Date:
+        = version.created_at.to_date.to_s(:date)
+      .version_value
+        %i
+          Value:
+        = version.reify.display_value
+      .version_user
+        %i
+          User:
+        = version.originator

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

@@ -6,41 +6,23 @@
   - about = abstractor_abstraction.about
 
   .abstractor_abstraction_display
-    .column-3
-      .abstraction_schema_name
-        = abstractor_abstraction_schema.display_name
-    .column-5
-      .abstractor_abstraction_value
-        - if rejected_suggestions.length == abstractor_suggestions.length
-          %span.editable_abstraction
-            = abstractor_abstraction.display_value
-          = link_to 'edit', Abstractor::UserInterface.abstractor_relative_path(abstractor.edit_abstractor_abstraction_path(abstractor_abstraction)), :class=>'icon_link edit_link'
-        - else
+    .abstractor_abstraction_schema_name
+      = abstractor_abstraction_schema.display_name
+    .abstractor_abstraction_value
+      - if rejected_suggestions.length == abstractor_suggestions.length
+        %span.editable_abstraction
           = abstractor_abstraction.display_value
-        - versions = abstractor_abstraction.versions.sort{|a,b| b.created_at <=> a.created_at}.reject{|v| v.reify.blank? || v.reify.display_value =~ /not set/i}
-        - if versions.any?
-          %br
-          %b History:
-          - versions.each do |version|
-            .version
-              .version_date
-                %i
-                  Date:
-                = "#{version.created_at.to_date.to_s(:date)}"
-              .version_value
-                %i
-                  Value:
-                = "#{version.reify.display_value}"
-              .version_user
-                %i
-                  User:
-                = "#{version.originator}"
-    - if abstractor_suggestions.any?
-      .column-9
-        - abstractor_suggestions.each do |abstractor_suggestion|
-          = form_for [abstractor_abstraction, abstractor_suggestion], url: Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_abstractor_suggestion_path(abstractor_abstraction, abstractor_suggestion)), method: :put, remote: true, html: { class: 'edit_abstractor_suggestion' } do |f|
-            = render 'abstractor/shared/error_messages', :object => f.object
-            .column-5
+        = link_to 'edit', Abstractor::UserInterface.abstractor_relative_path(abstractor.edit_abstractor_abstraction_path(abstractor_abstraction)), :class=>'icon_link edit_link'
+      - else
+        = abstractor_abstraction.display_value
+      - versions = abstractor_abstraction.versions.sort{|a,b| b.created_at <=> a.created_at}.reject{|v| v.reify.blank? || v.reify.display_value =~ /not set/i}
+      = render partial: 'abstractor/abstractor_abstractions/abstraction_history', locals: { versions: versions }
+    .abstractor_suggestions
+      - if abstractor_suggestions.any?
+        - abstractor_suggestions.each_with_index do |abstractor_suggestion, index|
+          .abstractor_suggestion{ class: "#{'abstractor_bottom_border' if index < abstractor_suggestions.length - 1}"}
+            = form_for [abstractor_abstraction, abstractor_suggestion], url: Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_abstractor_suggestion_path(abstractor_abstraction, abstractor_suggestion)), method: :put, remote: true, html: { class: 'edit_abstractor_suggestion' } do |f|
+              = render 'abstractor/shared/error_messages', object: f.object
               .abstractor_suggestion_values
                 = abstractor_suggestion.display_value
                 - if abstractor_suggestion.abstractor_suggestion_sources.any?
@@ -48,38 +30,37 @@
                     - source_about = abstractor_suggestion_source.source_type.constantize.find(abstractor_suggestion_source.source_id)
                     - from_method = abstractor_suggestion_source.source_method
                     - if from_method && source_about.respond_to?(from_method)
-                      %span{ :class => 'abstractor_abstraction_source_tooltip_img', :rel => "#abstraction_text_#{abstractor_suggestion_source.id}", :title => "#{source_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 = source_about.send(from_method)
-                        - unless abstractable_from_column.nil?
-                          - 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)
+                      - abstractable_from_column = source_about.send(from_method)
+                      - has_text_match = abstractable_from_column && abstractor_suggestion_source.sentence_match_value
+                      %span{ class: 'abstractor_abstraction_source_tooltip_img', rel: "#abstraction_text_#{abstractor_suggestion_source.id}", title: "#{source_about.class.to_s} #{from_method}"}
+                        %i{ id: "abstraction_text_link_#{abstractor_suggestion_source.id}", class: "#{'abstraction_text_link_match' if has_text_match}" }
+                      %div{ id: "abstraction_text_#{abstractor_suggestion_source.id}", class: 'abstractor_abstraction_source_tooltip'}
+                        - if has_text_match
+                          = Abstractor::UserInterface.highlight(simple_format(abstractable_from_column.clone), abstractor_suggestion_source.sentence_match_value.strip)
+                        - else
+                          = simple_format(abstractable_from_column.clone)
                     - if abstractor_suggestion_source.custom_explanation
                       .custom_explanation
                         %label
                           Explanation:
                         .explanation_text
                           = abstractor_suggestion_source.custom_explanation
-            .column-3
-              - values = Abstractor::AbstractorSuggestionStatus.all.sort_by(&:name).map{|s| [s.name, s.id] }
-              -  values.each do |value|
-                - id = "abstractor_suggestion_abstractor_suggestion_status_id_#{value.last}_#{abstractor_suggestion.id}"
-                = f.radio_button :abstractor_suggestion_status_id, value.last, id: id, class: 'abstractor_suggestion_status_selection'
-                = f.label :abstractor_suggestion_status_id, value.first, value: value.last, for: id
-                %br
-              = f.radio_button :abstractor_suggestion_status_id, '', {:style => 'display:none;' }
-            %hr
-    - else
-      .column-9
+              .abstractor_suggestion_status
+                %ul.abstractor_suggestion_status_group
+                  - values = Abstractor::AbstractorSuggestionStatus.all.sort_by(&:name).map{|s| [s.name, s.id] }
+                  -  values.each do |value|
+                    - id = "abstractor_suggestion_abstractor_suggestion_status_id_#{value.last}_#{abstractor_suggestion.id}"
+                    %li
+                      = f.radio_button :abstractor_suggestion_status_id, value.last, id: id, class: 'abstractor_suggestion_status_selection'
+                      = f.label :abstractor_suggestion_status_id, value.first, value: value.last, for: id, class: "abstractor_suggestion_status_selection_label #{f.object.abstractor_suggestion_status_id == value.last ? 'abstractor_suggestion_status_selection_label_active' : 'abstractor_suggestion_status_selection_label_inactive' }"
+                = f.radio_button :abstractor_suggestion_status_id, '', { style: 'display:none;' }
+      - 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]}"}
-              = image_tag('abstractor/page.png', :id => "abstraction_text_link_#{dom_id}")
+            %span{ class: 'abstractor_abstraction_source_tooltip_img', rel: "#abstraction_text_#{dom_id}", title: "#{source[:source_type].to_s} #{source[:source_method]}"}
+              %i{ id: "abstraction_text_link_#{dom_id}" }
               %br
-            %div{ :id => "abstraction_text_#{dom_id}", :class => 'tooltip'}
+            %div{ id: "abstraction_text_#{dom_id}", class: 'tooltip'}
               = simple_format(source[:source_type].find(source[:source_id]).send(source[:source_method]))
     .clear

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

@@ -0,0 +1,23 @@
+.abstractor_abstractions_grouped
+  - abstractor_subject_groups = about.class.abstractor_subject_groups(namespace_type: namespace_type, namespace_id: namespace_id)
+  - abstractor_subject_groups.each do |abstractor_subject_group|
+    .abstractor_subject_groups_container
+      %b= abstractor_subject_group.name
+      %fieldset
+        .abstractor_abstractions_header
+          .abstractor_abstraction_schema_name
+            %b Name
+          .abstractor_abstraction_value
+            %b Value
+          .abstractor_suggestions
+            .abstractor_suggestion_values
+              %b Suggestions
+            .abstractor_suggestion_status
+              %b Status
+        .clear
+        .abstractor_abstractions_body.abstractor_subject_groups
+          - abstractor_abstraction_groups = about.abstractor_abstraction_groups_by_namespace(namespace_type: namespace_type, namespace_id: namespace_id, abstractor_subject_group_id: abstractor_subject_group.id)
+          - abstractor_abstraction_groups.each do |abstractor_abstraction_group|
+            = render partial: 'abstractor/abstractor_abstraction_groups/form', locals: {abstractor_abstraction_group: abstractor_abstraction_group}
+        = link_to 'Add group', Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_groups_path(about_id: about.id, about_type: about.class.name, abstractor_subject_group_id: abstractor_subject_group.id)),  data: { confirm: 'Are you sure?'}, method: :post, class: 'abstractor_group_add_link', remote: true
+.clear

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

@@ -1,43 +1,12 @@
 - about ||= @about
 - namespace_type ||= @namespace_type
 - namespace_id ||= @namespace_id
+
 .abstractor_abstractions
   = link_to 'Not applicable all', Abstractor::UserInterface.abstractor_relative_path(abstractor.update_all_abstractor_abstractions_path(about_type: about.class, about_id: about.id, abstractor_abstraction_value: 'not applicable')), data: { confirm: 'Are you sure?'}, method: :put, class: 'abstractor_not_applicable_all_link'
   = link_to 'Unknown all', Abstractor::UserInterface.abstractor_relative_path(abstractor.update_all_abstractor_abstractions_path(about_type: about.class, about_id: about.id, abstractor_abstraction_value: 'unknown')), data: { confirm: 'Are you sure?'}, method: :put,  class: 'abstractor_unknown_all_link'
-  - abstractor_subject_groups = about.class.abstractor_subject_groups(namespace_type: namespace_type, namespace_id: namespace_id)
-  - abstractor_subject_groups.each do |abstractor_subject_group|
-    .abstractor_subject_groups_container
-      %b= abstractor_subject_group.name
-      %fieldset
-        .column-3
-          %b Name
-        .column-5
-          %b Value
-        .column-5
-          %b Suggestions
-        .column-3
-          %b Status
-        %hr
-        .abstractor_subject_groups
-          - abstractor_abstraction_groups = about.abstractor_abstraction_groups_by_namespace(namespace_type: namespace_type, namespace_id: namespace_id, abstractor_subject_group_id: abstractor_subject_group.id)
-          - abstractor_abstraction_groups.each_with_index do |abstractor_abstraction_group, index|
-            = render partial: 'abstractor/abstractor_abstraction_groups/form', locals: {abstractor_abstraction_group: abstractor_abstraction_group}
-        = link_to 'Add group', Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_groups_path(about_id: about.id, about_type: about.class.name, abstractor_subject_group_id: abstractor_subject_group.id)),  data: { confirm: 'Are you sure?'}, method: :post, class: 'abstractor_group_add_link', remote: true
-  .clear
-  - ungrouped_subjects = about.class.abstractor_subjects(grouped: false, namespace_type: namespace_type, namespace_id: namespace_id)
-  - if ungrouped_subjects.any?
-    %fieldset
-      .column-3
-        %b Name
-      .column-5
-        %b Value
-      .column-5
-        %b Suggestions
-      .column-3
-        %b Status
-      %hr
-      - ungrouped_subjects.each do |ungrouped_subject|
-        - ungrouped_subject.abstractor_abstractions.not_deleted.where(:about_id => about.id).each do |abstractor_abstraction|
-          %div{ class: "abstractor_abstraction #{Abstractor::Utility.dehumanize(abstractor_abstraction.abstractor_subject.abstractor_abstraction_schema.predicate)}" }
-            = render :partial => 'abstractor/abstractor_abstractions/fields', :locals => {:abstractor_abstraction => abstractor_abstraction}
+
+  = render partial: 'abstractor/abstractor_abstractions/grouped_abstractions_list',   locals: { about: about, namespace_type: namespace_type, namespace_id: namespace_id}
+  = render partial: 'abstractor/abstractor_abstractions/ungrouped_abstractions_list', locals: { about: about, namespace_type: namespace_type, namespace_id: namespace_id}
+
 #abstractor_abstraction_dialog_tooltip

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

@@ -0,0 +1,22 @@
+.abstractor_abstractions_ungrouped
+  - ungrouped_subjects = about.class.abstractor_subjects(grouped: false, namespace_type: namespace_type, namespace_id: namespace_id)
+  - if ungrouped_subjects.any?
+    %fieldset
+      .abstractor_abstractions_header
+        .abstractor_abstraction_schema_name
+          %b Name
+        .abstractor_abstraction_value
+          %b Value
+        .abstractor_suggestions
+          .abstractor_suggestion_values
+            %b Suggestions
+          .abstractor_suggestion_status
+            %b Status
+      .clear
+      .abstractor_abstractions_body
+        - ungrouped_subjects.each_with_index do |ungrouped_subject, index|
+          - abstractor_abstractions = ungrouped_subject.abstractor_abstractions.not_deleted.where(:about_id => about.id)
+          - abstractor_abstractions.each do |abstractor_abstraction|
+            %div{ class: "abstractor_abstraction #{Abstractor::Utility.dehumanize(abstractor_abstraction.abstractor_subject.abstractor_abstraction_schema.predicate)} #{'abstractor_bottom_border' if index < ungrouped_subjects.length - 1}" }
+              = render :partial => 'abstractor/abstractor_abstractions/fields', :locals => {:abstractor_abstraction => abstractor_abstraction}
+.clear

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

@@ -3,10 +3,9 @@
 
 .abstractor_abstraction_edit
   = form_for abstractor_abstraction, url: Abstractor::UserInterface.abstractor_relative_path(abstractor.abstractor_abstraction_path(abstractor_abstraction)), method: :put, :remote => true do |f|
-    .column-3
-      .abstraction_schema_name
-        = abstraction_schema.display_name
-    .column-7
+    .abstractor_abstraction_schema_name
+      = abstraction_schema.display_name
+    .abstraction_edit_abstraction_value
       - case abstraction_schema.abstractor_object_type.value
       - when 'date'
         = f.text_field :value, class: 'abstractor_datepicker'
@@ -41,7 +40,7 @@
        
       = f.check_box :unknown
       = f.label :unknown, 'unknown'
-    .column-3
+    .abstractor_suggestion_sources
       - abstractor_abstraction = f.object
       - abstraction_sources = abstractor_abstraction.abstractor_subject.abstractor_abstraction_sources.select { |s| s.abstractor_abstraction_source_type.name != 'indirect' }
       - abstraction_sources.each do |abstraction_source|
@@ -53,7 +52,7 @@
               %br
             %div{ :id => "abstraction_text_#{dom_id}", :class => 'tooltip'}
               = simple_format(source[:source_type].find(source[:source_id]).send(source[:source_method]))
-    .column-4
+    .abstraction_edit_abstraction_actions
       = f.submit 'Save'
       = link_to 'Cancel', abstractor_abstraction, :remote => true
     .clear

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

@@ -156,11 +156,10 @@ module Abstractor
               at = nil
               at = abstractor_text.downcase unless abstractor_text.blank?
               target_abstractor_object_value_variants.each do |abstractor_object_value_variant|
-                re = Regexp.new(Regexp.escape(abstractor_object_value_variant.value.downcase))
+                re = Regexp.new('\b' + Regexp.escape(abstractor_object_value_variant.value.downcase) + '\b')
                 if re =~ at
                   abstractor_object_value_variants << abstractor_object_value_variant
                   abstractor_object_values << abstractor_object_value_variant.abstractor_object_value
-                  target_abstractor_object_value_variants.delete_if { |aovv| aovv.abstractor_object_value.id == abstractor_object_value_variant.abstractor_object_value.id  }
                 end
               end
 
@@ -168,7 +167,7 @@ module Abstractor
               target_abstractor_object_values = target_abstractor_object_values - abstractor_object_values
 
               target_abstractor_object_values.each do |abstractor_object_value|
-                re = Regexp.new(Regexp.escape(abstractor_object_value.value.downcase))
+                re = Regexp.new('\b' + Regexp.escape(abstractor_object_value.value.downcase) + '\b')
                 if re =~ at
                   abstractor_object_values << abstractor_object_value
                 end

data/lib/abstractor/version.rb

@@ -1,3 +1,3 @@
 module Abstractor
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -432,6 +432,7 @@ files:
 - app/assets/images/abstractor/nu_logo.jpg
 - app/assets/images/abstractor/nubic_logo.png
 - app/assets/images/abstractor/page.png
+- app/assets/images/abstractor/page_green.png
 - app/assets/images/abstractor/rails.png
 - app/assets/images/abstractor/robert_h_lurie.jpg
 - app/assets/images/abstractor/show.png
@@ -474,8 +475,11 @@ files:
 - app/models/abstractor/abstractor_suggestion_status.rb
 - app/views/abstractor/abstractor_abstraction_groups/_form.html.haml
 - app/views/abstractor/abstractor_abstraction_groups/edit.html.haml
+- app/views/abstractor/abstractor_abstractions/_abstraction_history.html.haml
 - app/views/abstractor/abstractor_abstractions/_fields.html.haml
+- app/views/abstractor/abstractor_abstractions/_grouped_abstractions_list.html.haml
 - app/views/abstractor/abstractor_abstractions/_list.html.haml
+- app/views/abstractor/abstractor_abstractions/_ungrouped_abstractions_list.html.haml
 - app/views/abstractor/abstractor_abstractions/edit.html.haml
 - app/views/abstractor/abstractor_abstractions/show.html.haml
 - app/views/abstractor/shared/_error_messages.html.haml
@@ -786,7 +790,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A Rails engine gem for deriving discrete data points from narrative text