abstractor 4.0.2 → 4.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmFjZjhkYzhlZWVkZGI1M2Q2YWZkNmUxNTk2OGZjMDljMzc5NWNjNA==
+    YzNiYjAyNWRiMDJhYzQwODJkMjJkNDFjMDIzMGRiYzM4NDA1MzZlMw==
   data.tar.gz: !binary |-
-    NzNmMzg2ZTI1Mjc3ZTU2MjI1YmEyNjE3NjVlMTRhMmU0YWIzZjI2Mw==
+    ZTVlMmQxZjFhM2M3Y2I2NGI5ODQ4ODE5MGVlY2M0MDAxNWZjNWYwOA==
 SHA512:
   metadata.gz: !binary |-
-    MDEwYzc1NWM5MDZjMDYwMGIxZjY1OGQ2NGU2ZGU4MzUxYmE4MTllYTkwYTg3
-    ZWYzNjE3YTBkNTVmMzY2MjczZGZiMGMxZTQ1MzVhNjljMjA1MjQwNWIyMTVm
-    ZTg3OGI4YWU0YjA3OGE5NzkxYjI2YjZlZTFkNGY2ZGNhYjM1YzA=
+    MDhkMGRhZjc3ZmNkODk3ZmFhMjYwNTY2OTQxZGVjYWUyMjAyZDczOTA4ZmY0
+    YzAwNDc1YWVjYmNiOGFjNDM5ODU0NmQ0YzBlMDY1YjNlMjg3ZTFmOTM3NTA1
+    YzE2NjEyMGYyYjdjYWJmODRmMjAyZjIxZmVjOTdhNzQ2ZjlkOTI=
   data.tar.gz: !binary |-
-    NDMyM2FkYTAwYjQ4ZDc2MGY5NmU4OTM1MzQxNDhhNWEyZmZiZTE3MTFmOTQx
-    NmRmOGZiNTQzOGI4YTVmMWQ2MDg5YWM4MWQyNmYzMWRjYTQxZDg1ODI0NWYx
-    YzQ4MTlmNmQyMzI4NTI3ZThkNjk0YTQ0ODI1MDQzOTk3NjgxMGM=
+    MDRkN2U5MDg1YTUxNzQzM2EwYmFmNzcxYjc1MTAzMjZkNmViNDdjZDdiNGQ0
+    YmVkYjhkZDE0NjlmNzNmMWJjODhmMzA0NTU5NTFmODA5MzVlMzY2NzhkYTM2
+    OTdkNmU4NjZkNDU3MWRlYTlmOTc4YzdkOWIxNzk1N2QyY2ZjNDc=

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

@@ -84,18 +84,28 @@ Abstractor.AbstractionSuggestionUI = ->
   $(document).on "ajax:success", "form.edit_abstractor_suggestion", (e, data, status, xhr) ->
     $(this).closest(".abstractor_abstraction").html xhr.responseText
     return
-
   return
 
 Abstractor.AbstractionGroupUI = ->
+  validateCardinality = (group_container) ->
+    group_cardinality = group_container.find('input[name="abstractor_subject_group_cardinality"]')
+    add_group_link    = group_container.find('.abstractor_group_add_link')
+    if (group_cardinality.length > 0) && (group_cardinality.val() == group_container.find('.abstractor_abstraction_group_member').length.toString())
+      $(add_group_link).hide()
+    else
+      $(add_group_link).show()
+
   $(document).on "ajax:success", ".abstractor_abstraction_group .abstractor_group_delete_link", (e, data, status, xhr) ->
-    parent_div = $(this).closest(".abstractor_abstraction_group")
-    parent_div.html xhr.responseText
+    subject_groups_container_div = $(this).closest(".abstractor_subject_groups_container")
+    abstraction_group_div = $(this).closest(".abstractor_abstraction_group")
+    abstraction_group_div.html xhr.responseText
+    validateCardinality(subject_groups_container_div)
     return
 
   $(document).on "ajax:success", ".abstractor_subject_groups_container .abstractor_group_add_link", (e, data, status, xhr) ->
     parent_div = $(this).closest(".abstractor_subject_groups_container")
     parent_div.find(".abstractor_subject_groups").append xhr.responseText
+    validateCardinality(parent_div)
     return
 
   $(document).on "ajax:success", ".abstractor_abstraction_group .abstractor_group_not_applicable_all_link", (e, data, status, xhr) ->
@@ -107,7 +117,6 @@ Abstractor.AbstractionGroupUI = ->
     parent_div = $(this).closest(".abstractor_abstraction_group")
     parent_div.html xhr.responseText
     return
-
   return
 
 new Abstractor.AbstractionUI()

data/app/models/abstractor/abstractor_section.rb

@@ -0,0 +1,5 @@
+module Abstractor
+  class AbstractorSection < ActiveRecord::Base
+    include Abstractor::Methods::Models::AbstractorSection
+  end
+end

data/app/models/abstractor/abstractor_section_name_variant.rb

@@ -0,0 +1,5 @@
+module Abstractor
+  class AbstractorSectionNameVariant < ActiveRecord::Base
+    include Abstractor::Methods::Models::AbstractorSectionNameVariant
+  end
+end

data/app/models/abstractor/abstractor_section_type.rb

@@ -0,0 +1,5 @@
+module Abstractor
+  class AbstractorSectionType < ActiveRecord::Base
+    include Abstractor::Methods::Models::AbstractorSectionType
+  end
+end

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

@@ -1,9 +1,14 @@
+- namespace_type ||= @namespace_type
+- namespace_id ||= @namespace_id
+
 - abstractor_abstraction_group ||= @abstractor_abstraction_group
 
 .abstractor_abstraction_group
   .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|
+    - abstractor_abstractions = abstractor_abstraction_group.abstractor_abstractions.not_deleted.joins(:abstractor_subject => :abstractor_subject_group_member)
+    - unless namespace_type.blank? || namespace_id.blank?
+      - abstractor_abstractions = abstractor_abstractions.where(abstractor_subjects: { namespace_type: namespace_type, namespace_id: namespace_id})
+    - abstractor_abstractions.order('abstractor_subject_group_members.display_order').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

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

@@ -1 +1,4 @@
-= render 'form'
+- if @abstractor_abstraction_group.errors.any?
+  = render 'abstractor/shared/error_messages', object: @abstractor_abstraction_group
+- else
+  = render 'form'

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

@@ -27,18 +27,17 @@
                 = 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 from_method && source_about.respond_to?(from_method)
-                      - 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}"}
+                    - source = { source_type: abstractor_suggestion_source.source_type.constantize, source_id: abstractor_suggestion_source.source_id , source_method: abstractor_suggestion_source.source_method, section_name: abstractor_suggestion_source.section_name }
+                    - abstractor_text = Abstractor::AbstractorAbstractionSource.abstractor_text(source)
+                    - if abstractor_text
+                      - has_text_match = abstractor_text && abstractor_suggestion_source.sentence_match_value
+                      %span{ class: 'abstractor_abstraction_source_tooltip_img', rel: "#abstraction_text_#{abstractor_suggestion_source.id}", title: "#{abstractor_suggestion_source.source_type} #{abstractor_suggestion_source.source_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)
+                          = Abstractor::UserInterface.highlight(simple_format(abstractor_text), abstractor_suggestion_source.sentence_match_value.strip)
                         - else
-                          = simple_format(abstractable_from_column.clone)
+                          = simple_format(abstractor_text)
                     - if abstractor_suggestion_source.custom_explanation
                       .custom_explanation
                         %label
@@ -62,5 +61,6 @@
               %i{ 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]))
+              - abstractor_text = Abstractor::AbstractorAbstractionSource.abstractor_text(source)
+              = simple_format(abstractor_text)
     .clear

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

@@ -1,8 +1,13 @@
+- namespace_type ||= @namespace_type
+- namespace_id ||= @namespace_id
+
 .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
+      - if abstractor_subject_group.cardinality
+        = hidden_field_tag :abstractor_subject_group_cardinality, abstractor_subject_group.cardinality, id: "abstractor_subject_group_cardinality_#{abstractor_subject_group.id}"
       %fieldset
         .abstractor_abstractions_header
           .abstractor_abstraction_schema_name
@@ -18,6 +23,7 @@
         .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
+            = render partial: 'abstractor/abstractor_abstraction_groups/form', locals: {abstractor_abstraction_group: abstractor_abstraction_group, namespace_type: namespace_type, namespace_id: namespace_id}
+        - unless abstractor_subject_group.cardinality == 1
+          = 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, namespace_type: namespace_type, namespace_id: namespace_id)),  data: { confirm: 'Are you sure?'}, method: :post, class: 'abstractor_group_add_link', remote: true, style: "#{'display: none;' if about.abstractor_subject_group_complete?(abstractor_subject_group.id, {namespace_type: namespace_type, namespace_id: namespace_id})}"
 .clear

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

@@ -45,13 +45,14 @@
       - abstraction_sources = abstractor_abstraction.abstractor_subject.abstractor_abstraction_sources.select { |s| s.abstractor_abstraction_source_type.name != 'indirect' }
       - abstraction_sources.each do |abstraction_source|
         - abstraction_source.normalize_from_method_to_sources(abstractor_abstraction.about).each do |source|
-          - if source[:source_type] && source[:source_id] && source[:source_method]
+          - 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(source[:source_type].find(source[:source_id]).send(source[:source_method]))
+              = simple_format(abstractor_text)
     .abstraction_edit_abstraction_actions
       = f.submit 'Save'
       = link_to 'Cancel', abstractor_abstraction, :remote => true

data/db/migrate/20141028020332_add_cardinality_to_abstractor_subject_group.rb

@@ -0,0 +1,5 @@
+class AddCardinalityToAbstractorSubjectGroup < ActiveRecord::Migration
+  def change
+    add_column :abstractor_subject_groups, :cardinality, :integer
+  end
+end

data/db/migrate/20141107171413_add_sectioning.rb

@@ -0,0 +1,41 @@
+class AddSectioning < ActiveRecord::Migration
+  def up
+    create_table :abstractor_sections do |t|
+      t.integer :abstractor_section_type_id
+      t.string :source_type
+      t.string :source_method
+      t.string :name
+      t.string :description
+      t.string :delimiter
+      t.string :custom_regular_expression
+      t.boolean :return_note_on_empty_section
+      t.datetime :deleted_at
+      t.timestamps
+    end
+
+    create_table :abstractor_section_types do |t|
+      t.string :name
+      t.string :regular_expression
+      t.datetime :deleted_at
+      t.timestamps
+    end
+
+    create_table :abstractor_section_name_variants do |t|
+      t.integer :abstractor_section_id
+      t.string :name
+      t.datetime :deleted_at
+      t.timestamps
+    end
+
+    add_column :abstractor_abstraction_sources, :section_name, :string
+    add_column :abstractor_suggestion_sources, :section_name, :string
+  end
+
+  def down
+    drop_table :abstractor_sections
+    drop_table :abstractor_section_types
+    drop_table :abstractor_section_name_variants
+    remove_column :abstractor_abstraction_sources, :section_name
+    remove_column :abstractor_suggestion_sources, :section_name
+  end
+end

data/lib/abstractor/abstractable.rb

@@ -76,7 +76,7 @@ module Abstractor
       end
 
       def detect_abstractor_abstraction(abstractor_subject)
-        abstractor_abstractions(true).not_deleted.detect { |abstractor_abstraction| abstractor_abstraction.abstractor_subject == abstractor_subject }
+        abstractor_abstractions(true).not_deleted.detect { |abstractor_abstraction| abstractor_abstraction.abstractor_subject_id == abstractor_subject.id }
       end
 
       def find_or_create_abstractor_abstraction(abstractor_abstraction_schema, abstractor_subject)
@@ -84,25 +84,44 @@ module Abstractor
         else
           abstractor_abstraction = Abstractor::AbstractorAbstraction.create!(abstractor_subject: abstractor_subject, about: self)
           if abstractor_subject.groupable?
-            abstractor_abstraction_group = find_or_create_abstractor_abstraction_group(abstractor_subject.abstractor_subject_group)
+            abstractor_abstraction_group = find_or_initialize_abstractor_abstraction_group(abstractor_subject.abstractor_subject_group)
             abstractor_abstraction_group.abstractor_abstractions << abstractor_abstraction
+            abstractor_abstraction_group.save!
           end
         end
         abstractor_abstraction
       end
 
       def detect_abstractor_abstraction_group(abstractor_subject_group)
-        abstractor_abstraction_groups(true).detect { |abstractor_abstraction_group| abstractor_abstraction_group.abstractor_subject_group ==  abstractor_subject_group }
+        abstractor_abstraction_groups(true).detect { |abstractor_abstraction_group| abstractor_abstraction_group.abstractor_subject_group_id ==  abstractor_subject_group.id }
       end
 
-      def find_or_create_abstractor_abstraction_group(abstractor_subject_group)
+      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.create(abstractor_subject_group: abstractor_subject_group, about: self)
+          abstractor_abstraction_group = Abstractor::AbstractorAbstractionGroup.new(abstractor_subject_group: abstractor_subject_group, about: self)
         end
         abstractor_abstraction_group
       end
 
+      ##
+      # Determines if provided abstractor_subject_group reached number of abstractor_abstraction_groups defined by abstractor_subject_group cardinality
+      #
+      # @param [Integer] abstractor_subject_group_id the id of abstractor_subject_group of interest.
+      # @option options [String]  :namespace_type the type parameter of the namespace.
+      # @option options [Integer] :namespace_id the instance parameter of the namespace.
+      # @return [boolean]
+      def abstractor_subject_group_complete?(abstractor_subject_group_id, options = {})
+        abstractor_subject_group = Abstractor::AbstractorSubjectGroup.find(abstractor_subject_group_id)
+        if abstractor_subject_group.cardinality.blank?
+          false
+        else
+          options = { namespace_type: nil, namespace_id: nil, abstractor_subject_group_id: abstractor_subject_group_id }.merge(options)
+          abstractor_abstraction_groups = abstractor_abstraction_groups_by_namespace(options)
+          abstractor_abstraction_groups.length == abstractor_subject_group.cardinality
+        end
+      end
+
       ##
       # Returns all abstraction for the abstractable entity by abstractor_abstraction_status:
       #

data/lib/abstractor/enum.rb

@@ -7,5 +7,8 @@ module Abstractor
     ABSTRACTION_STATUS_NEEDS_REVIEW = 'needs review'
     ABSTRACTION_STATUS_REVIEWED = 'reviewed'
     ABSTRACTION_STATUSES = [ABSTRACTION_STATUS_NEEDS_REVIEW, ABSTRACTION_STATUS_REVIEWED]
+
+    ABSTRACTOR_SECTION_TYPE_CUSTOM = 'custom'
+    ABSTRACTOR_SECTION_TYPE_NAME_VALUE = 'name/value'
   end
 end

data/lib/abstractor/methods/controllers/abstractor_abstraction_groups_controller.rb

@@ -8,16 +8,25 @@ module Abstractor
         end
 
         def create
-          @abstractor_abstraction_group = Abstractor::AbstractorAbstractionGroup.create(abstractor_subject_group_id: params[:abstractor_subject_group_id], about_type: params[:about_type], about_id: params[:about_id])
-          @abstractor_abstraction_group.abstractor_subject_group.abstractor_subjects.each do |abstractor_subject|
+          @abstractor_abstraction_group = Abstractor::AbstractorAbstractionGroup.new(abstractor_subject_group_id: params[:abstractor_subject_group_id], about_type: params[:about_type], about_id: params[:about_id])
+
+          abstractor_subjects = @abstractor_abstraction_group.abstractor_subject_group.abstractor_subjects
+          unless params[:namespace_type].blank? || params[:namespace_id].blank?
+            @namespace_id   = params[:namespace_id]
+            @namespace_type = params[:namespace_type]
+            abstractor_subjects = abstractor_subjects.where(namespace_type: @namespace_type, namespace_id: @namespace_id)
+          end
+
+          abstractor_subjects.each do |abstractor_subject|
             abstraction = abstractor_subject.abstractor_abstractions.build(about_id: params[:about_id], about_type: params[:about_type])
-            abstraction.build_abstractor_abstraction_group_member(abstractor_abstraction_group: @abstractor_abstraction_group)
             abstraction.abstractor_subject.abstractor_abstraction_sources.select { |s| s.abstractor_abstraction_source_type.name == 'indirect' }.each do |abstractor_abstraction_source|
               source = abstractor_subject.subject_type.constantize.find(params[:about_id]).send(abstractor_abstraction_source.from_method)
               abstraction.abstractor_indirect_sources.build(abstractor_abstraction_source: abstractor_abstraction_source, source_type: source[:source_type], source_method: source[:source_method])
+
             end
-            abstraction.save!
+            @abstractor_abstraction_group.abstractor_abstractions << abstraction
           end
+          @abstractor_abstraction_group.save!
 
           respond_to do |format|
             format.html { render action: "edit", layout: false }

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

@@ -22,6 +22,8 @@ module Abstractor
 
           base.send :belongs_to, :about, polymorphic: true
 
+          base.send :validates_associated, :abstractor_subject
+
           # base.send :attr_accessible, :about, :abstractor_subject, :abstractor_subject_id, :value, :about_type, :about_id, :unknown, :not_applicable, :deleted_at, :abstractor_indirect_sources_attributes
 
           # Hooks

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

@@ -15,25 +15,43 @@ module Abstractor
           # base.send :attr_accessible, :abstractor_subject_group, :abstractor_subject_group_id, :deleted_at, :about, :about_type, :about_id
 
           # Hooks
+          base.send :validate, :validate_subject_group_cardinality
+          base.send :validate, :must_have_members
+
           base.send :after_commit, :update_abstractor_abstraction_group_members, :on => :update, :if => Proc.new { |record| record.previous_changes.include?('deleted_at') }
-        end
 
-        ##
-        # Determines if the group can be removed.
-        #
-        # @return [Boolean]
-        def removable?
-          abstractor_abstractions.map(&:abstractor_suggestions).flatten.empty?
+          base.send(:include, InstanceMethods)
         end
 
-        private
-          def update_abstractor_abstraction_group_members
-            return unless deleted?
-            abstractor_abstraction_group_members.each do |gm|
-              gm.soft_delete!
-              gm.abstractor_abstraction.soft_delete!
-            end
+        module InstanceMethods
+          ##
+          # Determines if the group can be removed.
+          #
+          # @return [Boolean]
+          def removable?
+            abstractor_abstractions.map(&:abstractor_suggestions).flatten.empty?
           end
+
+          private
+            def update_abstractor_abstraction_group_members
+              return unless deleted?
+              abstractor_abstraction_group_members.each do |gm|
+                gm.soft_delete!
+                gm.abstractor_abstraction.soft_delete!
+              end
+            end
+
+            def must_have_members
+              if self.abstractor_abstraction_group_members.empty? || self.abstractor_abstraction_group_members.all? {|abstractor_abstraction_group_member| abstractor_abstraction_group_member.marked_for_destruction? }
+                errors.add(:base, 'Must have at least one abstractor_abstraction_group_member')
+              end
+            end
+
+            def validate_subject_group_cardinality
+              return if self.abstractor_subject_group.cardinality.blank? || self.persisted?
+              errors.add(:base,"Subject group reached maximum number of abstraction groups (#{abstractor_subject_group.cardinality})") if self.about.abstractor_subject_group_complete?(self.abstractor_subject_group_id)
+            end
+        end
       end
     end
   end

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

@@ -9,6 +9,8 @@ module Abstractor
           base.send :belongs_to, :abstractor_abstraction_group
           base.send :belongs_to, :abstractor_abstraction
 
+          base.send :validates_associated, :abstractor_abstraction
+
           # base.send :attr_accessible, :abstractor_abstraction_group, :abstractor_abstraction_group_id, :abstractor_abstraction, :abstractor_abstraction_id, :deleted_at
         end
       end

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

@@ -9,11 +9,41 @@ module Abstractor
           base.send :belongs_to, :abstractor_subject
           base.send :belongs_to, :abstractor_rule_type
           base.send :belongs_to, :abstractor_abstraction_source_type
+          base.send :belongs_to, :abstractor_abstraction_source_section_type
           base.send :has_many, :abstractor_suggestion_sources
           base.send :has_many, :abstractor_abstractions, :through => :abstractor_suggestion_sources
           base.send :has_many, :abstractor_indirect_sources
+          base.send :has_many, :abstractor_abstraction_source_section_name_variants
 
-          # base.send :attr_accessible, :abstractor_subject, :abstractor_subject_id, :deleted_at, :from_method, :custom_method, :abstractor_rule_type, :abstractor_rule_type_id, :abstractor_abstraction_source_type, :abstractor_abstraction_source_type_id
+          def base.abstractor_text(source)
+            text = source[:source_type].find(source[:source_id]).send(source[:source_method])
+            if !source[:section_name].blank?
+              abstractor_section = Abstractor::AbstractorSection.where(source_type: source[:source_type], source_method: source[:source_method], name: source[:section_name]).first
+              if text =~ prepare_section_regular_expression(abstractor_section)
+                text = $2
+              else
+                if abstractor_section.return_note_on_empty_section
+                  text = text
+                else
+                  text = ''
+                end
+              end
+            end
+
+            text
+          end
+
+          def base.prepare_section_regular_expression(abstractor_section)
+            regular_expression = nil
+            if abstractor_section.abstractor_section_type.name == Abstractor::Enum::ABSTRACTOR_SECTION_TYPE_CUSTOM
+              regular_expression = abstractor_section.custom_regular_expression
+            else
+              regular_expression = abstractor_section.abstractor_section_type.regular_expression
+            end
+            regular_expression.gsub!('section_name_variants', abstractor_section.prepare_section_name_variants)
+            regular_expression.gsub!('delimiter', abstractor_section.delimiter)
+            Regexp.new(regular_expression, Regexp::IGNORECASE)
+          end
         end
 
         def normalize_from_method_to_sources(about)
@@ -21,7 +51,7 @@ module Abstractor
           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 }]
+            sources = [{ source_type: about.class , source_id: about.id , source_method: from_method, section_name: section_name }]
           else
             sources = fm
           end

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

@@ -0,0 +1,23 @@
+module Abstractor
+  module Methods
+    module Models
+      module AbstractorSection
+        def self.included(base)
+          base.send :include, SoftDelete
+
+          # Associations
+          base.send :belongs_to, :abstractor_section_type
+          base.send :has_many, :abstractor_section_name_variants
+        end
+
+        def prepare_section_name_variants
+          section_name_variants.join('|')
+        end
+
+        def section_name_variants
+          [name].concat(abstractor_section_name_variants.map(&:name))
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Abstractor
+  module Methods
+    module Models
+      module AbstractorSectionNameVariant
+        def self.included(base)
+          base.send :include, SoftDelete
+
+          # Associations
+          base.send :belongs_to, :abstractor_section
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Abstractor
+  module Methods
+    module Models
+      module AbstractorSectionType
+        def self.included(base)
+          base.send :include, SoftDelete
+
+          # Associations
+          base.send :has_many, :abstractor_sections
+        end
+      end
+    end
+  end
+end

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

@@ -129,7 +129,7 @@ module Abstractor
           def abstract_custom_suggestion(about, abstractor_abstraction, abstractor_abstraction_source)
             suggestions = about.send(abstractor_abstraction_source.custom_method)
             suggestions.each do |suggestion|
-              suggest(abstractor_abstraction, abstractor_abstraction_source, nil, nil, about.id, about.class.to_s, abstractor_abstraction_source.from_method, suggestion[:suggestion], nil, nil, abstractor_abstraction_source.custom_method, suggestion[:explanation])
+              suggest(abstractor_abstraction, abstractor_abstraction_source, nil, nil, about.id, about.class.to_s, abstractor_abstraction_source.from_method, abstractor_abstraction_source.section_name, suggestion[:suggestion], nil, nil, abstractor_abstraction_source.custom_method, suggestion[:explanation])
             end
             create_unknown_abstractor_suggestion(about, abstractor_abstraction, abstractor_abstraction_source)
           end
@@ -145,7 +145,7 @@ module Abstractor
 
           def abstract_sentential_value(about, abstractor_abstraction, abstractor_abstraction_source)
             abstractor_abstraction_source.normalize_from_method_to_sources(about).each do |source|
-              abstractor_text = source[:source_type].find(source[:source_id]).send(source[:source_method])
+              abstractor_text = Abstractor::AbstractorAbstractionSource.abstractor_text(source)
               abstractor_object_value_ids = abstractor_abstraction_schema.abstractor_object_values.map(&:id)
 
               abstractor_object_values = []
@@ -187,7 +187,7 @@ module Abstractor
                                   Abstractor::NegationDetection.manual_negated_match_value?(sentence[:sentence], object_variant)
                                 )
                         if !reject
-                          suggest(abstractor_abstraction, abstractor_abstraction_source, object_variant.downcase, sentence[:sentence], source[:source_id], source[:source_type].to_s, source[:source_method], abstractor_object_value, nil, nil, nil, nil)
+                          suggest(abstractor_abstraction, abstractor_abstraction_source, object_variant.downcase, sentence[:sentence], source[:source_id], source[:source_type].to_s, source[:source_method], source[:section_name], abstractor_object_value, nil, nil, nil, nil)
                         end
                       end
                     end
@@ -206,7 +206,7 @@ module Abstractor
 
           def abstract_canonical_name_value(about, abstractor_abstraction, abstractor_abstraction_source)
             abstractor_abstraction_source.normalize_from_method_to_sources(about).each do |source|
-              abstractor_text = source[:source_type].find(source[:source_id]).send(source[:source_method])
+              abstractor_text = Abstractor::AbstractorAbstractionSource.abstractor_text(source)
               parser = Abstractor::Parser.new(abstractor_text)
               abstractor_abstraction_schema.predicate_variants.each do |predicate_variant|
                 abstractor_abstraction_schema.abstractor_object_values.each do |abstractor_object_value|
@@ -214,13 +214,13 @@ module Abstractor
                     match_value = "#{Regexp.escape(predicate_variant)}:\s*#{Regexp.escape(object_variant)}"
                     matches = parser.scan(match_value, word_boundary: true).uniq
                     matches.each do |match|
-                      suggest(abstractor_abstraction, abstractor_abstraction_source, match, match, source[:source_id], source[:source_type].to_s, source[:source_method], abstractor_object_value, nil, nil, nil, nil)
+                      suggest(abstractor_abstraction, abstractor_abstraction_source, match, match, source[:source_id], source[:source_type].to_s, source[:source_method], source[:section_name],  abstractor_object_value, nil, nil, nil, nil)
                     end
 
                     match_value = "#{Regexp.escape(predicate_variant)}#{Regexp.escape(object_variant)}"
                     matches = parser.scan(match_value, word_boundary: true).uniq
                     matches.each do |match|
-                      suggest(abstractor_abstraction, abstractor_abstraction_source, match, match, source[:source_id], source[:source_type].to_s, source[:source_method], abstractor_object_value, nil, nil, nil, nil)
+                      suggest(abstractor_abstraction, abstractor_abstraction_source, match, match, source[:source_id], source[:source_type].to_s, source[:source_method], source[:seciton_name], abstractor_object_value, nil, nil, nil, nil)
                     end
                   end
                 end
@@ -230,7 +230,7 @@ module Abstractor
 
           def abstract_sentential_name_value(about, abstractor_abstraction, abstractor_abstraction_source)
             abstractor_abstraction_source.normalize_from_method_to_sources(about).each do |source|
-              abstractor_text = source[:source_type].find(source[:source_id]).send(source[:source_method])
+              abstractor_text = Abstractor::AbstractorAbstractionSource.abstractor_text(source)
               parser = Abstractor::Parser.new(abstractor_text)
               abstractor_abstraction_schema.predicate_variants.each do |predicate_variant|
                 ranges = parser.range_all(Regexp.escape(predicate_variant))
@@ -250,7 +250,7 @@ module Abstractor
                                        Abstractor::NegationDetection.manual_negated_match_value?(sentence[:sentence], object_variant)
                                      )
                             if !reject
-                              suggest(abstractor_abstraction, abstractor_abstraction_source, sentence[:sentence], sentence[:sentence], source[:source_id], source[:source_type].to_s, source[:source_method], abstractor_object_value, nil, nil, nil, nil)
+                              suggest(abstractor_abstraction, abstractor_abstraction_source, sentence[:sentence], sentence[:sentence], source[:source_id], source[:source_type].to_s, source[:source_method], source[:section_name], abstractor_object_value, nil, nil, nil, nil)
                             end
                           end
                         end
@@ -262,7 +262,7 @@ module Abstractor
             end
           end
 
-          def suggest(abstractor_abstraction, abstractor_abstraction_source, match_value, sentence_match_value, source_id, source_type, source_method, suggested_value, unknown, not_applicable, custom_method, custom_explanation)
+          def suggest(abstractor_abstraction, abstractor_abstraction_source, match_value, sentence_match_value, source_id, source_type, source_method, section_name, suggested_value, unknown, not_applicable, custom_method, custom_explanation)
             match_value.strip! unless match_value.nil?
             sentence_match_value.strip! unless sentence_match_value.nil?
             if abstractor_object_value?(suggested_value)
@@ -283,7 +283,7 @@ module Abstractor
               abstractor_suggestion.abstractor_suggestion_object_value = Abstractor::AbstractorSuggestionObjectValue.new(abstractor_object_value: abstractor_object_value) if abstractor_object_value
             end
 
-            abstractor_suggestion_source = abstractor_suggestion.detect_abstractor_suggestion_source(abstractor_abstraction_source, sentence_match_value, source_id, source_type, source_method)
+            abstractor_suggestion_source = abstractor_suggestion.detect_abstractor_suggestion_source(abstractor_abstraction_source, sentence_match_value, source_id, source_type, source_method, section_name)
             if !abstractor_suggestion_source
               Abstractor::AbstractorSuggestionSource.create(
                                                 abstractor_abstraction_source: abstractor_abstraction_source,
@@ -293,6 +293,7 @@ module Abstractor
                                                 source_id: source_id,
                                                 source_type: source_type,
                                                 source_method: source_method,
+                                                section_name: section_name,
                                                 custom_method: custom_method,
                                                 custom_explanation: custom_explanation
                                                )
@@ -306,7 +307,7 @@ module Abstractor
 
           def create_unknown_abstractor_suggestion_name_only(about, abstractor_abstraction, abstractor_abstraction_source)
             abstractor_abstraction_source.normalize_from_method_to_sources(about).each do |source|
-              abstractor_text = source[:source_type].find(source[:source_id]).send(source[:source_method])
+              abstractor_text = Abstractor::AbstractorAbstractionSource.abstractor_text(source)
               parser = Abstractor::Parser.new(abstractor_text)
               #Create an 'unknown' suggestion based on match name only if we have not made a suggstion
               if abstractor_abstraction.abstractor_suggestions(true).empty?
@@ -322,7 +323,7 @@ module Abstractor
                                   Abstractor::NegationDetection.manual_negated_match_value?(sentence[:sentence], predicate_variant)
                                 )
                         if !reject
-                          suggest(abstractor_abstraction, abstractor_abstraction_source, predicate_variant.downcase, sentence[:sentence], source[:source_id], source[:source_type].to_s, source[:source_method], nil, true, nil, nil, nil)
+                          suggest(abstractor_abstraction, abstractor_abstraction_source, predicate_variant.downcase, sentence[:sentence], source[:source_id], source[:source_type].to_s, source[:source_method], source[:section_name],  nil, true, nil, nil, nil)
                         end
                       end
                     end
@@ -336,7 +337,7 @@ module Abstractor
             #Create an 'unknown' suggestion based on matching nothing only if we have not made a suggstion
             abstractor_abstraction_source.normalize_from_method_to_sources(about).each do |source|
               if abstractor_abstraction.abstractor_suggestions(true).select { |abstractor_suggestion| abstractor_suggestion.unknown != true }.empty?
-                suggest(abstractor_abstraction, abstractor_abstraction_source, nil, nil, source[:source_id], source[:source_type].to_s, source[:source_method], nil, true, nil, nil, nil)
+                suggest(abstractor_abstraction, abstractor_abstraction_source, nil, nil, source[:source_id], source[:source_type].to_s, source[:source_method],source[:section_name],  nil, true, nil, nil, nil)
               end
             end
           end

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

@@ -12,6 +12,8 @@ module Abstractor
           base.send :has_many, :abstractor_abstractions, :through => :abstractor_abstraction_groups
 
           # base.send :attr_accessible, :deleted_at, :name
+          # Validations
+          base.send :validates, :cardinality, numericality: { only_integer: true, greater_than: 0 }, unless: Proc.new { |a| a.cardinality.blank? }
         end
       end
     end

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

@@ -74,13 +74,14 @@ module Abstractor
           abstractor_abstraction.abstractor_suggestions.where('id != ?', id)
         end
 
-        def detect_abstractor_suggestion_source(abstractor_abstraction_source, sentence_match_value, source_id, source_type, source_method)
+        def detect_abstractor_suggestion_source(abstractor_abstraction_source, sentence_match_value, source_id, source_type, source_method, section_name)
           abstractor_suggestion_source = abstractor_suggestion_sources.detect do |abstractor_suggestion_source|
             abstractor_suggestion_source.abstractor_abstraction_source == abstractor_abstraction_source &&
             abstractor_suggestion_source.sentence_match_value == sentence_match_value &&
             abstractor_suggestion_source.source_id == source_id &&
             abstractor_suggestion_source.source_type == source_type &&
-            abstractor_suggestion_source.source_method == source_method
+            abstractor_suggestion_source.source_method == source_method &&
+            abstractor_suggestion_source.section_name == section_name
           end
         end
       end

data/lib/abstractor/setup.rb

@@ -28,6 +28,10 @@ module Abstractor
       Abstractor::AbstractorAbstractionSourceType.where(name: 'nlp suggestion').first_or_create
       Abstractor::AbstractorAbstractionSourceType.where(name: 'custom suggestion').first_or_create
       Abstractor::AbstractorAbstractionSourceType.where(name: 'indirect').first_or_create
+
+      puts 'Setting up Abstractor::AbstractorSectionType'
+      Abstractor::AbstractorSectionType.where(name: Abstractor::Enum::ABSTRACTOR_SECTION_TYPE_CUSTOM).first_or_create
+      Abstractor::AbstractorSectionType.where(name: Abstractor::Enum::ABSTRACTOR_SECTION_TYPE_NAME_VALUE, regular_expression: "(?<=^|[\r\n])(section_name_variants)[\s]*delimiter([^\r\n]*(?:[\r\n]+(?![A-Z].*delimiter).*)*)").first_or_create
     end
   end
 end

data/lib/abstractor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -465,6 +465,9 @@ files:
 - app/models/abstractor/abstractor_object_value_variant.rb
 - app/models/abstractor/abstractor_relation_type.rb
 - app/models/abstractor/abstractor_rule_type.rb
+- app/models/abstractor/abstractor_section.rb
+- app/models/abstractor/abstractor_section_name_variant.rb
+- app/models/abstractor/abstractor_section_type.rb
 - app/models/abstractor/abstractor_subject.rb
 - app/models/abstractor/abstractor_subject_group.rb
 - app/models/abstractor/abstractor_subject_group_member.rb
@@ -512,6 +515,8 @@ files:
 - db/migrate/20140718014952_refactor_abstractor_rule_types.rb
 - db/migrate/20140803205149_add_custom_explanation_to_abstractor_suggestion_sources.rb
 - 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/seeds.rb
 - lib/abstractor.rb
 - lib/abstractor/abstractable.rb
@@ -536,6 +541,9 @@ files:
 - lib/abstractor/methods/models/abstractor_object_value_variant.rb
 - lib/abstractor/methods/models/abstractor_relation_type.rb
 - lib/abstractor/methods/models/abstractor_rule_type.rb
+- lib/abstractor/methods/models/abstractor_section.rb
+- lib/abstractor/methods/models/abstractor_section_name_variant.rb
+- lib/abstractor/methods/models/abstractor_section_type.rb
 - lib/abstractor/methods/models/abstractor_subject.rb
 - lib/abstractor/methods/models/abstractor_subject_group.rb
 - lib/abstractor/methods/models/abstractor_subject_group_member.rb