abstractor 2.0.0 → 2.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmI1ZTY3ZWJlZTU1MjhhNWU1MDYxZWNkNWQxMWE5YTUzOTlmYjM3NA==
+    MjEzMmZmNTcyYjc4MjZkMjQyZjA5MWE5NzQxYWExMDhhYWExNDcwZQ==
   data.tar.gz: !binary |-
-    M2YyMGQwOWFmMTRiYzdkZTRlY2IzOWFhNzAwYzIzYmU1MjUzMzdhMw==
+    OWNkMzRkZjZiNDU5ZjQ3NDQ5Y2YyMjk0NzhmMGQxNGJmMTA1MGYwNA==
 SHA512:
   metadata.gz: !binary |-
-    YTAxZDAyMzE0OTQ2YzYxYWE0OWY4ZmUyYzhmYzlkOWJjN2M1ZWE4YzcxZmE4
-    MDdiZTNjZDA1ZDljYTc3ZjJkZDZjNDY2ZDAwZTMxMGFiMzdjN2Y0NGRlYzk0
-    YTkwOTdmMjY5N2M3NjQ3ZDkxODYxZDRhOTI0ODE0ODRlYzQxMzY=
+    ZTJkYjRiZDg4ZjA2NzM2MjYzNjU5NWQzMjA5MmQ3MmFlNzI5YjFhZDhlN2I1
+    NGE4NzU4MTA2YTEyNDU0YTk2NDcxZjhlYjhiY2U3ZTFjYzliNDg0OWFlYjNj
+    NzQ3NWU1YTk1NTU4NTc1NTU2ZTZiMDZlZDliOGVmZjg5MDc0N2M=
   data.tar.gz: !binary |-
-    YWM2YmE0MDI2ZmEzZjljMmU0OWVlMmE1MmQ5YTgzNzg3ZDk0Mzc0OTFlMWNk
-    YTA1M2JlMWZiY2QyZDU1ZGEwYjYxZWJiMzQ1NTg4ZmRhMTY2YWY0Mjc2Yzk4
-    YTU3YzdhNWUzMTk5NzgyMTY4ZmMzMDJlNzI3ZmRlZjM4MTE4Mzg=
+    N2FiMTI4YmEwYTlkZTE2NGFmMzU1NDUyODE3NGNjODdiNjA2YjU1NTYyY2Yz
+    MmNkN2ZlODY5MzY1ZTA4ODQ3NzQ1MDM1M2QyNDlhYTE1MmQ0NDUyOGM0M2Ni
+    NjlkN2EyNDA1OWE2YTUzNTMxMTkwMDAxMzU1MGFjY2UyMGY0ZjY=

data/README.md

@@ -3,7 +3,7 @@ Abstractor
 Abstractor is a Rails engine gem for deriving discrete data points
 from narrative text via natural language processing.  The gem includes
 a user interface to present the abstracted data points for
-confirmation/revision by curator.
+confirmation/revision by a curator.
 
 Reader's note: this README uses [YARD][] markup to provide links to
 Abstractor's API documentation. If you aren't already, consider reading it

data/app/assets/javascripts/abstractor/abstractor.js

@@ -75,8 +75,8 @@ Abstractor.AbstractionUI = function(){
   $(document).on('change', 'select.indirect_source_list', function () {
     var source_type = $(this).attr('rel'),
         value = $(this).find('option:selected').prop('value');
-    $(this).siblings('.indirect_source_text').hide();
-    $(this).siblings('.' + source_type + '_' + value).show();
+    $(this).siblings('.indirect_source_text').addClass('hidden');
+    $(this).siblings('.' + source_type + '_' + value).removeClass('hidden');
   });
 };
 

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

@@ -321,7 +321,7 @@ span.tooltip_img {
 }
 
 .indirect_source_list {
-  width: 20em;
+  width: 35%;
 }
 
 .indirect_source_text {

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

@@ -35,12 +35,13 @@
                 = abstractor_suggestion.display_value
                 - if abstractor_suggestion.abstractor_suggestion_sources.any?
                   - abstractor_suggestion.abstractor_suggestion_sources.each do |abstractor_suggestion_source|
+                    - source_about = abstractor_suggestion_source.source_type.constantize.find(abstractor_suggestion_source.source_id)
                     - 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}"}
+                    - if from_method && source_about.respond_to?(from_method)
+                      %span{ :class => 'abstractor_abstraction_source_tooltip_img label', :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 = about.send(from_method)
+                        - 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)
@@ -58,12 +59,11 @@
     - else
       .column-9
         - abstractor_abstraction.abstractor_subject.abstractor_abstraction_sources.select { |s| s.abstractor_abstraction_source_type.name == 'nlp suggestion' }.each do |abstractor_abstraction_source|
-          - from_method = abstractor_abstraction_source.from_method
-          - if about.respond_to?(from_method)
-            %span{ :class => 'abstractor_abstraction_source_tooltip_img label', :rel => "#abstraction_text_#{abstractor_abstraction_source.id}", :title => "#{about.class.to_s} #{from_method}"}
-              = image_tag('abstractor/page.png', :id => "abstraction_text_link_#{abstractor_abstraction_source.id}")
-            %div{ :id => "abstraction_text_#{abstractor_abstraction_source.id}", :class => 'abstractor_abstraction_source_tooltip'}
-              - abstractable_from_column = about.send(from_method)
-              - unless abstractable_from_column.nil?
-                = abstractable_from_column.clone
+          - 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 label', :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(source[:source_type].find(source[:source_id]).send(source[:source_method]))
     .clear

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

@@ -45,12 +45,13 @@
       - abstractor_abstraction = f.object
       - abstraction_sources = abstractor_abstraction.abstractor_subject.abstractor_abstraction_sources.select { |s| s.abstractor_abstraction_source_type.name == 'nlp suggestion' }
       - abstraction_sources.each do |abstraction_source|
-        - from_method = abstraction_source.from_method
-        %span{ :class => 'abstractor_abstraction_source_tooltip_img label', :rel => "#abstraction_text_#{abstraction_source.id}", :title => "#{abstractor_abstraction.about.class.to_s} #{from_method}"}
-          = image_tag('abstractor/page.png', :id => "abstraction_text_link_#{abstraction_source.id}")
-          %br
-        %div{ :id => "abstraction_text_#{abstraction_source.id}", :class => 'tooltip'}
-          = simple_format(abstractor_abstraction.about.send(from_method))
+        - abstraction_source.normalize_from_method_to_sources(abstractor_abstraction.about).each do |source|
+          - dom_id = "#{abstraction_source.id}_#{source[:source_type]}_#{source[:source_id]}_#{source[:source_method]}"
+          %span{ :class => 'abstractor_abstraction_source_tooltip_img label', :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(source[:source_type].find(source[:source_id]).send(source[:source_method]))
     .column-4
       = f.submit 'Save', :class => 'button positive'
       = link_to 'Cancel', abstractor_abstraction, :class => 'button negative', :remote => true
@@ -70,4 +71,4 @@
           - sources.each do |source|
             - hidden = abstractor_indirect_source_form.object.source_id == source.id ? '' : 'hidden'
             %div{ class: "indirect_source_text #{hidden} #{source_setup[:source_type]}_#{source.id}"}
-              = source.send(source_setup[:source_method])
+              = simple_format(source.send(source_setup[:source_method]))

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

@@ -18,7 +18,8 @@ module Abstractor
 
         def normalize_from_method_to_sources(about)
           sources = []
-          fm = about.send(from_method)
+          fm = nil
+          fm = about.send(from_method) unless from_method.blank?
           if fm.is_a?(String) || fm.nil?
             sources = [{ source_type: about.class , source_id: about.id , source_method: from_method }]
           else

data/lib/abstractor/version.rb

@@ -1,3 +1,3 @@
 module Abstractor
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails