abstractor 2.1.2 → 4.0.0

data/lib/abstractor/enum.rb

@@ -3,5 +3,9 @@ module Abstractor
     ABSTRACTION_OTHER_VALUE_TYPE_UNKNOWN = 'unknown'
     ABSTRACTION_OTHER_VALUE_TYPE_NOT_APPLICABLE = 'not applicable'
     ABSTRACTION_OTHER_VALUE_TYPES = [ABSTRACTION_OTHER_VALUE_TYPE_UNKNOWN, ABSTRACTION_OTHER_VALUE_TYPE_NOT_APPLICABLE]
+
+    ABSTRACTION_STATUS_NEEDS_REVIEW = 'needs review'
+    ABSTRACTION_STATUS_REVIEWED = 'reviewed'
+    ABSTRACTION_STATUSES = [ABSTRACTION_STATUS_NEEDS_REVIEW, ABSTRACTION_STATUS_REVIEWED]
   end
 end

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

@@ -23,7 +23,7 @@ module Abstractor
 
         def update
           respond_to do |format|
-            if @abstractor_abstraction.update_attributes(params[:abstractor_abstraction])
+            if @abstractor_abstraction.update_attributes(abstractor_abstraction_params)
               format.html { redirect_to(abstractor_abstraction_path(@abstractor_abstraction)) }
             else
               format.html { render :action => "edit" }
@@ -45,6 +45,12 @@ module Abstractor
             @abstractor_abstraction = Abstractor::AbstractorAbstraction.find(params[:id])
             @about = @abstractor_abstraction.about
           end
+
+          def abstractor_abstraction_params
+            params.require(:abstractor_abstraction).permit(:id, :abstractor_subject_id, :value, :about_type, :about_id, :unknown, :not_applicable, :deleted_at, :_destroy,
+            abstractor_indirect_sources_attributes: [:id, :abstractor_abstraction_id, :abstractor_abstraction_source_id, :source_type, :source_id, :source_method, :deleted_at, :_destroy]
+            )
+          end
       end
     end
   end

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

@@ -8,7 +8,7 @@ module Abstractor
 
         def update
           respond_to do |format|
-            if @abstractor_suggestion.update_attributes(params[:abstractor_suggestion])
+            if @abstractor_suggestion.update_attributes(abstractor_suggestion_params)
               format.html { redirect_to(abstractor_abstraction_path(@abstractor_abstraction)) }
             else
               format.html { render "abstractor_abstractions/show" }
@@ -22,7 +22,11 @@ module Abstractor
             @abstractor_suggestion = Abstractor::AbstractorSuggestion.find(params[:id])
             @about = @abstractor_abstraction.about
           end
+
+          def abstractor_suggestion_params
+            params.require(:abstractor_suggestion).permit(:id, :abstractor_abstraction_id, :abstractor_suggestion_status_id, :suggested_value, :unknown, :not_applicable, :deleted_at, :_destroy)
+          end
       end
     end
   end
-end
+end

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

@@ -22,7 +22,7 @@ module Abstractor
 
           base.send :belongs_to, :about, polymorphic: true
 
-          base.send :attr_accessible, :about, :abstractor_subject, :abstractor_subject_id, :value, :about_type, :about_id, :unknown, :not_applicable, :deleted_at, :abstractor_indirect_sources_attributes
+          # 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
           base.send :after_save, :review_matching_suggestions

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

@@ -12,7 +12,7 @@ module Abstractor
           base.send :has_many, :abstractor_abstraction_group_members
           base.send :has_many, :abstractor_abstractions, :through => :abstractor_abstraction_group_members
 
-          base.send :attr_accessible, :abstractor_subject_group, :abstractor_subject_group_id, :deleted_at, :about, :about_type, :about_id
+          # base.send :attr_accessible, :abstractor_subject_group, :abstractor_subject_group_id, :deleted_at, :about, :about_type, :about_id
 
           # Hooks
           base.send :after_commit, :update_abstractor_abstraction_group_members, :on => :update, :if => Proc.new { |record| record.previous_changes.include?('deleted_at') }

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

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

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

@@ -14,7 +14,7 @@ module Abstractor
           base.send :has_many, :object_relations,   :class_name => "Abstractor::AbstractorAbstractionSchemaRelation", :foreign_key => "object_id"
           base.send :has_many, :subject_relations,  :class_name => "Abstractor::AbstractorAbstractionSchemaRelation", :foreign_key => "subject_id"
 
-          base.send :attr_accessible, :abstractor_object_type, :abstractor_object_type_id, :display_name, :predicate, :preferred_name, :deleted_at
+          # base.send :attr_accessible, :abstractor_object_type, :abstractor_object_type_id, :display_name, :predicate, :preferred_name, :deleted_at
         end
 
         # Instance Methods

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

@@ -9,7 +9,7 @@ module Abstractor
           base.send :belongs_to, :abstractor_abstraction_schema
           base.send :belongs_to, :abstractor_object_value
 
-          base.send :attr_accessible, :abstractor_abstraction_schema, :abstractor_abstraction_schema_id, :abstractor_object_value, :abstractor_object_value_id
+          # base.send :attr_accessible, :abstractor_abstraction_schema, :abstractor_abstraction_schema_id, :abstractor_object_value, :abstractor_object_value_id
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Abstractor
           # Associations
           base.send :belongs_to, :abstractor_abstraction_schema
 
-          base.send :attr_accessible, :abstractor_abstraction_schema, :abstractor_abstraction_schema_id, :deleted_at, :value
+          # base.send :attr_accessible, :abstractor_abstraction_schema, :abstractor_abstraction_schema_id, :deleted_at, :value
         end
       end
     end

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

@@ -10,7 +10,7 @@ module Abstractor
           base.send :belongs_to, :object, :class_name => "Abstractor::AbstractorAbstractionSchema", :foreign_key => "object_id"
           base.send :belongs_to, :subject, :class_name => "Abstractor::AbstractorAbstractionSchema", :foreign_key => "subject_id"
 
-          base.send :attr_accessible, :abstractor_relation_type, :abstractor_relation_type_id, :object, :object_id, :subject, :subject_id, :deleted_at
+          # base.send :attr_accessible, :abstractor_relation_type, :abstractor_relation_type_id, :object, :object_id, :subject, :subject_id, :deleted_at
         end
       end
     end

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

@@ -13,7 +13,7 @@ module Abstractor
           base.send :has_many, :abstractor_abstractions, :through => :abstractor_suggestion_sources
           base.send :has_many, :abstractor_indirect_sources
 
-          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
+          # 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
         end
 
         def normalize_from_method_to_sources(about)

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

@@ -8,7 +8,7 @@ module Abstractor
           # Associations
           base.send :has_many, :abstractor_abstraction_sources
 
-          base.send :attr_accessible, :deleted_at, :name
+          # base.send :attr_accessible, :deleted_at, :name
         end
       end
     end

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

@@ -9,7 +9,7 @@ module Abstractor
           base.send :belongs_to, :abstractor_abstraction_source
           base.send :belongs_to, :abstractor_abstraction
 
-          base.send :attr_accessible, :abstractor_abstraction_id, :abstractor_abstraction, :abstractor_abstraction_source_id, :abstractor_abstraction_source, :source_type, :source_id, :source_method, :reviewed
+          # base.send :attr_accessible, :abstractor_abstraction_id, :abstractor_abstraction, :abstractor_abstraction_source_id, :abstractor_abstraction_source, :source_type, :source_id, :source_method, :reviewed
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Abstractor
           # Associations
           base.send :has_many, :abstractor_abstraction_schemas
 
-          base.send :attr_accessible, :deleted_at, :value
+          # base.send :attr_accessible, :deleted_at, :value
         end
       end
     end

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

@@ -10,8 +10,7 @@ module Abstractor
           base.send :has_many, :abstractor_abstraction_schema_object_values
           base.send :has_many, :abstractor_abstraction_schemas, :through => :abstractor_abstraction_schema_object_values
 
-          #Validations
-          base.send :attr_accessible, :value, :abstractor_object_value_variants, :abstractor_abstraction_schema_object_values, :abstractor_abstraction_schemas
+          # base.send :attr_accessible, :value, :abstractor_object_value_variants, :abstractor_abstraction_schema_object_values, :abstractor_abstraction_schemas
         end
 
         # Instance Methods

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

@@ -8,7 +8,7 @@ module Abstractor
           # Associations
           base.send :belongs_to, :abstractor_object_value
 
-          base.send :attr_accessible, :abstractor_object_value, :abstractor_object_value_id, :deleted_at, :value
+          # base.send :attr_accessible, :abstractor_object_value, :abstractor_object_value_id, :deleted_at, :value
         end
       end
     end

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

@@ -8,7 +8,8 @@ module Abstractor
           # Associations
           base.send :has_many, :abstractor_abstraction_schema_relations
           base.send :has_many, :subject_relations
-          base.send :attr_accessible, :deleted_at, :name
+
+          # base.send :attr_accessible, :deleted_at, :name
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Abstractor
           # Associations
           base.send :has_many, :abstractor_abstraction_sources
 
-          base.send :attr_accessible, :deleted_at, :description, :name, :abstractor_subjects
+          # base.send :attr_accessible, :deleted_at, :description, :name, :abstractor_subjects
         end
       end
     end

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

@@ -18,7 +18,7 @@ module Abstractor
           base.send :has_many, :subject_relations,  :class_name => "Abstractor::AbstractorSubjectRelation", :foreign_key => "subject_id"
 
 
-          base.send :attr_accessible, :abstractor_abstraction_schema, :abstractor_abstraction_schema_id, :subject_type, :dynamic_list_method
+          # base.send :attr_accessible, :abstractor_abstraction_schema, :abstractor_abstraction_schema_id, :subject_type, :dynamic_list_method
           base.send(:include, InstanceMethods)
         end
 
@@ -148,26 +148,30 @@ module Abstractor
               abstractor_text = source[:source_type].find(source[:source_id]).send(source[:source_method])
               abstractor_object_value_ids = abstractor_abstraction_schema.abstractor_object_values.map(&:id)
 
-              adapter = ActiveRecord::Base.connection.instance_values["config"][:adapter]
-              case adapter
-              when 'sqlserver'
-                abstractor_object_value_variants = Abstractor::AbstractorObjectValueVariant.where("abstractor_object_value_id in (?) AND EXISTS (SELECT 1 FROM #{source[:source_type].table_name} WHERE #{source[:source_type].table_name}.id = ? AND #{source[:source_type].table_name}.#{source[:source_method]} LIKE ('%' + abstractor_object_value_variants.value + '%'))", abstractor_object_value_ids, source[:source_id]).all
-              when 'sqlite3'
-                abstractor_object_value_variants = Abstractor::AbstractorObjectValueVariant.where("abstractor_object_value_id in (?) AND EXISTS (SELECT 1 FROM #{source[:source_type].table_name} WHERE #{source[:source_type].table_name}.id = ? AND #{source[:source_type].table_name}.#{source[:source_method]} LIKE ('%' || abstractor_object_value_variants.value || '%'))", abstractor_object_value_ids, source[:source_id]).all
-              when 'postgresql'
-                abstractor_object_value_variants = Abstractor::AbstractorObjectValueVariant.where("abstractor_object_value_id in (?) AND EXISTS (SELECT 1 FROM #{source[:source_type].table_name} WHERE #{source[:source_type].table_name}.id = ? AND #{source[:source_type].table_name}.#{source[:source_method]} ILIKE ('%' || abstractor_object_value_variants.value || '%'))", abstractor_object_value_ids, source[:source_id]).all
+              abstractor_object_values = []
+              abstractor_object_value_variants = []
+              target_abstractor_object_values =[]
+              target_abstractor_object_value_variants = Abstractor::AbstractorObjectValueVariant.where("abstractor_object_value_id in (?)", abstractor_object_value_ids).to_a
+
+              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))
+                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
 
-              abstractor_object_values = abstractor_object_value_variants.map(&:abstractor_object_value).uniq
+              target_abstractor_object_values = abstractor_abstraction_schema.abstractor_object_values
+              target_abstractor_object_values = target_abstractor_object_values - abstractor_object_values
 
-              adapter = ActiveRecord::Base.connection.instance_values["config"][:adapter]
-              case adapter
-              when 'sqlserver'
-                abstractor_object_values.concat(Abstractor::AbstractorObjectValue.where("abstractor_object_values.id in (?) AND EXISTS (SELECT 1 FROM #{source[:source_type].table_name} WHERE #{source[:source_type].table_name}.id = ? AND #{source[:source_type].table_name}.#{source[:source_method]} LIKE ('%' + abstractor_object_values.value + '%'))", abstractor_object_value_ids, source[:source_id]).all).uniq
-              when 'sqlite3'
-                abstractor_object_values.concat(Abstractor::AbstractorObjectValue.where("abstractor_object_values.id in (?) AND EXISTS (SELECT 1 FROM #{source[:source_type].table_name} WHERE #{source[:source_type].table_name}.id = ? AND #{source[:source_type].table_name}.#{source[:source_method]} LIKE ('%' || abstractor_object_values.value || '%'))", abstractor_object_value_ids, source[:source_id]).all).uniq
-              when 'postgresql'
-                abstractor_object_values.concat(Abstractor::AbstractorObjectValue.where("abstractor_object_values.id in (?) AND EXISTS (SELECT 1 FROM #{source[:source_type].table_name} WHERE #{source[:source_type].table_name}.id = ? AND #{source[:source_type].table_name}.#{source[:source_method]} ILIKE ('%' || abstractor_object_values.value || '%'))", abstractor_object_value_ids, source[:source_id]).all).uniq
+              target_abstractor_object_values.each do |abstractor_object_value|
+                re = Regexp.new(Regexp.escape(abstractor_object_value.value.downcase))
+                if re =~ at
+                  abstractor_object_values << abstractor_object_value
+                end
               end
 
               parser = Abstractor::Parser.new(abstractor_text)

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

@@ -11,7 +11,7 @@ module Abstractor
           base.send :has_many, :abstractor_abstraction_groups
           base.send :has_many, :abstractor_abstractions, :through => :abstractor_abstraction_groups
 
-          base.send :attr_accessible, :deleted_at, :name
+          # base.send :attr_accessible, :deleted_at, :name
         end
       end
     end

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

@@ -9,7 +9,7 @@ module Abstractor
           base.send :belongs_to, :abstractor_subject_group
           base.send :belongs_to, :abstractor_subject
 
-          base.send :attr_accessible, :abstractor_subject_group, :abstractor_subject_group_id, :abstractor_subject_id, :display_order, :deleted_at, :abstractor_subject
+          # base.send :attr_accessible, :abstractor_subject_group, :abstractor_subject_group_id, :abstractor_subject_id, :display_order, :deleted_at, :abstractor_subject
         end
       end
     end

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

@@ -10,7 +10,7 @@ module Abstractor
           base.send :belongs_to, :object,   :class_name => "Abstractor::AbstractorSubject", :foreign_key => "object_id"
           base.send :belongs_to, :subject,  :class_name => "Abstractor::AbstractorSubject", :foreign_key => "subject_id"
 
-          base.send :attr_accessible, :abstractor_relation_type, :abstractor_relation_type_id, :object, :object_id, :subject, :subject_id, :deleted_at
+          # base.send :attr_accessible, :abstractor_relation_type, :abstractor_relation_type_id, :object, :object_id, :subject, :subject_id, :deleted_at
         end
       end
     end

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

@@ -14,7 +14,7 @@ module Abstractor
 
           base.send :has_many, :abstractor_suggestion_sources
 
-          base.send :attr_accessible, :abstractor_abstraction, :abstractor_abstraction_id, :abstractor_suggestion_sources, :abstractor_suggestion_source_id, :abstractor_suggestion_status, :abstractor_suggestion_status_id, :suggested_value, :deleted_at, :unknown, :not_applicable
+          # base.send :attr_accessible, :abstractor_abstraction, :abstractor_abstraction_id, :abstractor_suggestion_sources, :abstractor_suggestion_source_id, :abstractor_suggestion_status, :abstractor_suggestion_status_id, :suggested_value, :deleted_at, :unknown, :not_applicable
 
           # Hooks
           base.send :after_save, :update_abstraction_value, :if => lambda {|abstractor_suggestion| abstractor_suggestion.abstractor_suggestion_status_id_changed?}

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

@@ -9,7 +9,7 @@ module Abstractor
           base.send :belongs_to, :abstractor_suggestion
           base.send :belongs_to, :abstractor_object_value
 
-          base.send :attr_accessible, :abstractor_suggestion, :abstractor_suggestion_id, :abstractor_object_value, :abstractor_object_value_id, :deleted_at
+          # base.send :attr_accessible, :abstractor_suggestion, :abstractor_suggestion_id, :abstractor_object_value, :abstractor_object_value_id, :deleted_at
         end
       end
     end

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

@@ -9,7 +9,7 @@ module Abstractor
           base.send :belongs_to, :abstractor_abstraction_source
           base.send :belongs_to, :abstractor_suggestion
 
-          base.send :attr_accessible, :abstractor_abstraction_source, :abstractor_abstraction_source_id, :abstractor_suggestion, :abstractor_suggestion_id, :source_id, :source_type, :source_method, :match_value, :deleted_at, :sentence_match_value, :custom_method, :custom_explanation
+          # base.send :attr_accessible, :abstractor_abstraction_source, :abstractor_abstraction_source_id, :abstractor_suggestion, :abstractor_suggestion_id, :source_id, :source_type, :source_method, :match_value, :deleted_at, :sentence_match_value, :custom_method, :custom_explanation
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Abstractor
           # Associations
           base.send :has_many, :abstractor_suggestions
 
-          base.send :attr_accessible, :deleted_at, :name
+          # base.send :attr_accessible, :deleted_at, :name
         end
 
         # Instance Methods

data/lib/abstractor/negation_detection.rb

@@ -21,7 +21,7 @@ module Abstractor
 
     def self.manual_negated_match_value?(sentence, match_value)
       negated = false
-      ['non-','\bthere is no evidence of a ', '\bthere is no evidence of a metastatic ',  '\binsufficient to make the diagnosis of ', '\binsufficient to make the diagnosis of metastatic ',  '\binsufficient for the diagnosis of ',  '\binsufficient for the diagnosis of metastatic ',  '\brule out ', '\brule out metastatic ', '\bnegative for ', '\bnegative for metastatic ',  '\bno ', '\bno metastatic ', '\bnot ', '\bnot metastatic ',  '\bno evidence of ', '\bno evidence of metastatic ',  '\bno evidence of a ', '\bno evidence of a metastatic ',  '\brules out the possibility of a ', '\brules out the possibility of a metastatic ',  '\bto exclude the possibility of ', '\bto exclude the possibility of metastic '].each do |negation_cue|
+      ['no\b', 'non-','\bthere is no evidence of a ', '\bthere is no evidence of a metastatic ',  '\binsufficient to make the diagnosis of ', '\binsufficient to make the diagnosis of metastatic ',  '\binsufficient for the diagnosis of ',  '\binsufficient for the diagnosis of metastatic ',  '\brule out ', '\brule out metastatic ', '\bnegative for ', '\bnegative for metastatic ',  '\bno ', '\bno metastatic ', '\bnot ', '\bnot metastatic ',  '\bno evidence of ', '\bno evidence of metastatic ',  '\bno evidence of a ', '\bno evidence of a metastatic ',  '\brules out the possibility of a ', '\brules out the possibility of a metastatic ',  '\bto exclude the possibility of ', '\bto exclude the possibility of metastic '].each do |negation_cue|
         if !(sentence.downcase.scan(Regexp.new(negation_cue + match_value.downcase)).empty?)
           negated = true
         end

data/lib/abstractor/setup.rb

@@ -2,32 +2,32 @@ module Abstractor
   module Setup
     def self.system
       puts 'Setting up Abstractor::AbstractorObjectType'
-      Abstractor::AbstractorObjectType.find_or_create_by_value('list')
-      Abstractor::AbstractorObjectType.find_or_create_by_value('number')
-      Abstractor::AbstractorObjectType.find_or_create_by_value('boolean')
-      Abstractor::AbstractorObjectType.find_or_create_by_value('string')
-      Abstractor::AbstractorObjectType.find_or_create_by_value('radio button list')
-      Abstractor::AbstractorObjectType.find_or_create_by_value('date')
-      Abstractor::AbstractorObjectType.find_or_create_by_value('dynamic list')
+      Abstractor::AbstractorObjectType.where(value: 'list').first_or_create
+      Abstractor::AbstractorObjectType.where(value: 'number').first_or_create
+      Abstractor::AbstractorObjectType.where(value: 'boolean').first_or_create
+      Abstractor::AbstractorObjectType.where(value: 'string').first_or_create
+      Abstractor::AbstractorObjectType.where(value: 'radio button list').first_or_create
+      Abstractor::AbstractorObjectType.where(value: 'date').first_or_create
+      Abstractor::AbstractorObjectType.where(value: 'dynamic list').first_or_create
 
       puts 'Setting up Abstractor::AbstractorRuleType'
-      Abstractor::AbstractorRuleType.find_or_create_by_name_and_description(name: 'name/value', description:'search for value associated with name')
-      Abstractor::AbstractorRuleType.find_or_create_by_name_and_description(name:'value', description: 'search for value match')
-      Abstractor::AbstractorRuleType.find_or_create_by_name_and_description(name: 'unknown', description: 'do not try to abstract, always assign "unknown"')
+      Abstractor::AbstractorRuleType.where(name: 'name/value', description:'search for value associated with name').first_or_create
+      Abstractor::AbstractorRuleType.where(name:'value', description: 'search for value match').first_or_create
+      Abstractor::AbstractorRuleType.where(name: 'unknown', description: 'do not try to abstract, always assign "unknown"').first_or_create
 
       puts 'Setting up Abstractor::AbstractorSuggestionStatus'
-      Abstractor::AbstractorSuggestionStatus.find_or_create_by_name('Needs review')
-      Abstractor::AbstractorSuggestionStatus.find_or_create_by_name('Accepted')
-      Abstractor::AbstractorSuggestionStatus.find_or_create_by_name('Rejected')
+      Abstractor::AbstractorSuggestionStatus.where(name: 'Needs review').first_or_create
+      Abstractor::AbstractorSuggestionStatus.where(name: 'Accepted').first_or_create
+      Abstractor::AbstractorSuggestionStatus.where(name: 'Rejected').first_or_create
 
       puts 'Setting up Abstractor::AbstractorRelationType'
-      Abstractor::AbstractorRelationType.find_or_create_by_name('member_of')
-      Abstractor::AbstractorRelationType.find_or_create_by_name('preceded_by')
+      Abstractor::AbstractorRelationType.where(name: 'member_of').first_or_create
+      Abstractor::AbstractorRelationType.where(name: 'preceded_by').first_or_create
 
       puts 'Setting up Abstractor::AbstractorAbstractionSourceType'
-      Abstractor::AbstractorAbstractionSourceType.find_or_create_by_name('nlp suggestion')
-      Abstractor::AbstractorAbstractionSourceType.find_or_create_by_name('custom suggestion')
-      Abstractor::AbstractorAbstractionSourceType.find_or_create_by_name('indirect')
+      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
     end
   end
 end

data/lib/abstractor/version.rb

@@ -1,3 +1,3 @@
 module Abstractor
-  VERSION = '2.1.2'
+  VERSION = '4.0.0'
 end

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

@@ -60,7 +60,7 @@ module Abstractor
         puts 'Please be patient...this could take a while.'
         `rake abstractor:setup:stanford_core_nlp`
 
-        insert_into_file("#{Rails.root}/config/environments/development.rb", :after => /::Application.configure do\n/) do
+        insert_into_file("#{Rails.root}/config/environments/development.rb", :after => /(::Application.configure do\n|application.configure do\n)/) do
 '  StanfordCoreNLP.use :english
   StanfordCoreNLP.model_files = {}
   StanfordCoreNLP.jar_path = "#{Rails.root}/lib/stanford-corenlp-full-2014-06-16/"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -90,20 +90,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 4.0.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 4.0.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
@@ -164,46 +164,66 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 1.3.9
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 1.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 1.3.9
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: 1.3.9
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -250,60 +270,60 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.4.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.4.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.40.0
+        version: 2.42.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.40.0
+        version: 2.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.40.0
+        version: 2.42.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.40.0
+        version: 2.42.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: ansi
   requirement: !ruby/object:Gem::Requirement
@@ -330,20 +350,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.12.1
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.12.1
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -417,11 +437,10 @@ files:
 - app/assets/images/abstractor/show.png
 - app/assets/images/abstractor/switch_minus.gif
 - app/assets/images/abstractor/switch_plus.gif
-- app/assets/javascripts/abstractor/abstractor.js
+- app/assets/javascripts/abstractor/abstractor.js.coffee
 - app/assets/javascripts/abstractor/application.js
 - app/assets/javascripts/abstractor/combobox.js
 - app/assets/javascripts/abstractor/jquery/jquery.form.js
-- app/assets/javascripts/abstractor/nested_attributes.js
 - app/assets/stylesheets/abstractor/abstractor_abstractions.css
 - app/assets/stylesheets/abstractor/application.css
 - app/assets/stylesheets/abstractor/jquery.ui.override.css.scss
@@ -488,6 +507,7 @@ files:
 - db/migrate/20140716184049_add_dynamic_list_method_to_abstractor_subjects.rb
 - 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/seeds.rb
 - lib/abstractor.rb
 - lib/abstractor/abstractable.rb