abstractor 1.0.19 → 1.0.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzAwZGVlNDgzOTg4ODBiNWVmZTNjYjA4ZDU0YjI4MzYyZWJlMzVjYg==
+    ZDg1YWM0MWMxN2ZlMTM1N2IxYTBjMTNhZTg3MGFlMDM5MjJhYWM0NQ==
   data.tar.gz: !binary |-
-    YTcwZDY2YjczZDA1Y2MxNDkyNmNiZjVhYjQ3Mjk5OTk3Y2YyM2MxOA==
+    NmZmM2ZmNjI2YTg5MmE4OGNkN2ZkMmU5MDkzNjIwMGExNDEwMDRlMA==
 SHA512:
   metadata.gz: !binary |-
-    YjU2ZTJhMDY0ZTdlMGY1ZjRjMTc3YTZiYTkwMjRlZTY1OGI5MDVmZDg0MzIx
-    N2MyN2YxNDJhMDE3NWU3NGM2NDZiNmU1YzNhMmY3YjlmNmU0M2JkNWNhOGNj
-    N2FmNzU4OTQyYjZiZmUwNjYxMmI0MDlkNTZiNzI4ZGM0ZjdkNmU=
+    NWQ1YWRjNzc5YWNlMGMxMGVjNmE4OTM5ZjhmMWE1ZDc4NWVjOGFlZmRlYzQ2
+    MTkxNzM2ZjUwZDQwMTJiN2EzZjFjMDc2NWFmMGZhODJlNWU0MmYyMDRlMjE3
+    ZTEwOTZlNjRmMDQ3ODM0ZjhjZWYyZjcyODMyZWFkMjNlZmYxNjk=
   data.tar.gz: !binary |-
-    Y2NiN2RkN2U4OTY1N2U0OGE3ODY3YWE3ZjEzZDJlNzAzOTQzMmVjNzY1ZGFi
-    ZWVkMDBlMjM1NTdhNTVkZTNiZDYyZjdjNDNmNzNhNGNiYjM4YTg3ZGM0N2Ri
-    NzUzZDNhYjMxMTMzNjI2MjkwNWYxZTVjZWFiNTVmZDA0OTE2NjM=
+    MDU2ZTJkNWVkN2Y2ODg0MjVhYjE4ZWVmNGI0ZjMwMzM3MWRmNTBjYWRmNmNm
+    NGZjYjBjOWIwMWVmMWEzNTkyY2EwNDdjNzdmMzI2ZDU0OGUzNzc1MzYzOTUz
+    ZjAyMzcwYThlZmM1ZDc3OWY0NGI4OTZjN2QzYTA1NjNmNGJmNTM=

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

@@ -53,7 +53,7 @@
                 = f.label :abstractor_suggestion_status_id, value.first, value: value.last
                 %br
               = f.radio_button :abstractor_suggestion_status_id, '', {:style => 'display:none;' }
-              %hr
+            %hr
     - else
       .column-9
         - abstractor_abstraction.abstractor_subject.abstractor_abstraction_sources.each do |abstractor_abstraction_source|

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

@@ -1,5 +1,8 @@
 - about ||= @about
 .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')), :confirm => 'Are you sure?', :method => :put, :class => "icon_link update_link"
+  %br
+  = 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')), :confirm => 'Are you sure?', :method => :put, :class => "icon_link update_link"
   - abstractor_subject_groups = Abstractor::AbstractorSubjectGroup.joins(:abstractor_subjects).where(:abstractor_subjects => {:subject_type => about.class}).order('abstractor_subject_groups.id').not_deleted.to_a.uniq
   - abstractor_subject_groups.each do |abstractor_subject_group|
     .abstractor_subject_groups_container

data/config/routes.rb

@@ -2,6 +2,9 @@ Abstractor::Engine.routes.draw do
   resources :abstractor_abstraction_groups, only: [:create, :update, :destroy]
 
   resources :abstractor_abstractions do
+    collection do
+      put :update_all
+    end
     resources :abstractor_suggestions
   end
 end

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

@@ -34,8 +34,7 @@ module Abstractor
 
         def update
           abstractor_abstraction_value = params[:abstractor_abstraction_value]
-          @abstractor_abstraction_group.update_abstractor_abstraction_other_value(abstractor_abstraction_value)
-
+          Abstractor::AbstractorAbstraction.update_abstractor_abstraction_other_value(@abstractor_abstraction_group.abstractor_abstractions, abstractor_abstraction_value)
           respond_to do |format|
             format.html { render action: "edit", layout: false }
           end

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

@@ -31,6 +31,15 @@ module Abstractor
           end
         end
 
+        def update_all
+          abstractor_abstraction_value = params[:abstractor_abstraction_value]
+          @about = params[:about_type].constantize.find(params[:about_id])
+          Abstractor::AbstractorAbstraction.update_abstractor_abstraction_other_value(@about.abstractor_abstractions, abstractor_abstraction_value)
+          respond_to do |format|
+            format.html { redirect_to :back }
+          end
+        end
+
         private
           def set_abstractor_abstraction
             @abstractor_abstraction = Abstractor::AbstractorAbstraction.find(params[:id])

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

@@ -24,45 +24,97 @@ module Abstractor
 
           # Hooks
           base.send :after_save, :review_matching_suggestions#, :if => lambda {|abstractor_abstraction| abstractor_abstraction.value_changed?}
+
+          base.send :extend, ClassMethods
+          base.send(:include, InstanceMethods)
         end
 
-        def review_matching_suggestions
-          accepted_status = Abstractor::AbstractorSuggestionStatus.where(:name => 'Accepted').first
-          matching_abstractor_suggestions.each do |abstractor_suggestion|
-            abstractor_suggestion.abstractor_suggestion_status = accepted_status
-            abstractor_suggestion.save!
+        module InstanceMethods
+          def review_matching_suggestions
+            accepted_status = Abstractor::AbstractorSuggestionStatus.where(:name => 'Accepted').first
+            matching_abstractor_suggestions.each do |abstractor_suggestion|
+              abstractor_suggestion.abstractor_suggestion_status = accepted_status
+              abstractor_suggestion.save!
+            end
           end
-        end
 
-        def matching_abstractor_suggestions
-          unknown_values        = unknown ? unknown : [unknown, nil]
-          not_applicable_values = not_applicable ? not_applicable : [not_applicable, nil]
-          suggested_values = value.blank? ? ['', nil] : value
-          abstractor_suggestions.where(unknown: unknown_values, not_applicable: not_applicable_values, suggested_value: suggested_values)
-        end
+          def matching_abstractor_suggestions
+            unknown_values        = unknown ? unknown : [unknown, nil]
+            not_applicable_values = not_applicable ? not_applicable : [not_applicable, nil]
+            suggested_values = value.blank? ? ['', nil] : value
+            abstractor_suggestions.where(unknown: unknown_values, not_applicable: not_applicable_values, suggested_value: suggested_values)
+          end
 
-        def display_value
-          if unknown
-            'unknown'
-          elsif not_applicable
-            'not applicable'
-          elsif value.blank?
-            '[Not set]'
-          else
-            value
+          def display_value
+            if unknown
+              'unknown'
+            elsif not_applicable
+              'not applicable'
+            elsif value.blank?
+              '[Not set]'
+            else
+              value
+            end
           end
-        end
 
-        def detect_abstractor_suggestion(suggested_value)
-          abstractor_suggestion = nil
-          abstractor_suggestion = abstractor_suggestions(true).detect do |abstractor_suggestion|
-            abstractor_suggestion.suggested_value == suggested_value
+          def detect_abstractor_suggestion(suggested_value)
+            abstractor_suggestion = nil
+            abstractor_suggestion = abstractor_suggestions(true).detect do |abstractor_suggestion|
+              abstractor_suggestion.suggested_value == suggested_value
+            end
+          end
+
+          def unreviewed?
+            abstractor_suggestion_status_needs_review = Abstractor::AbstractorSuggestionStatus.where(name: 'Needs review').first
+            abstractor_suggestions.any? { |abstractor_suggestion| abstractor_suggestion.abstractor_suggestion_status == abstractor_suggestion_status_needs_review }
           end
         end
 
-        def unreviewed?
-          abstractor_suggestion_status_needs_review = Abstractor::AbstractorSuggestionStatus.where(name: 'Needs review').first
-          abstractor_suggestions.any? { |abstractor_suggestion| abstractor_suggestion.abstractor_suggestion_status == abstractor_suggestion_status_needs_review }
+        module ClassMethods
+          ##
+          # Updates all abstractor abstractions passed in to 'not applicable' or 'unknown'.
+          #
+          # @param [Abstractor::Enum::ABSTRACTION_OTHER_VALUE_TYPE_UNKNOWN, Abstractor::Enum::ABSTRACTION_OTHER_VALUE_TYPE_NOT_APPLICABLE] abstraction_other_value_type contorls whether to update all abstractor abstractions in the group to 'unknown' or 'not applicable'
+          # @return [void]
+          def update_abstractor_abstraction_other_value(abstractor_abstractions, abstraction_other_value_type)
+            raise(ArgumentError, "abstraction_value_type argument invalid") unless Abstractor::Enum::ABSTRACTION_OTHER_VALUE_TYPES.include?(abstraction_other_value_type)
+
+            rejected_status = Abstractor::AbstractorSuggestionStatus.where(:name => 'Rejected').first
+            accepted_status = Abstractor::AbstractorSuggestionStatus.where(:name => 'Accepted').first
+            case abstraction_other_value_type
+            when Abstractor::Enum::ABSTRACTION_OTHER_VALUE_TYPE_UNKNOWN
+              unknown = true
+              not_applicable = false
+            when Abstractor::Enum::ABSTRACTION_OTHER_VALUE_TYPE_NOT_APPLICABLE
+              unknown = false
+              not_applicable = true
+            end
+
+            Abstractor::AbstractorAbstraction.transaction do
+              if abstraction_other_value_type
+                abstractor_abstractions.each do |abstractor_abstraction|
+                  abstractor_abstraction.abstractor_suggestions.each do |abstractor_suggestion|
+                    if unknown && abstractor_suggestion.unknown
+                      abstractor_suggestion.abstractor_suggestion_status = accepted_status
+                      abstractor_suggestion.save!
+                    else
+                      set_abstractor_abstraction(abstractor_abstraction, unknown, not_applicable)
+                      abstractor_suggestion.abstractor_suggestion_status = rejected_status
+                      abstractor_suggestion.save!
+                    end
+                  end
+                end
+              end
+            end
+          end
+
+          private
+            def set_abstractor_abstraction(abstractor_abstraction, unknown, not_applicable)
+              abstractor_abstraction.value = nil
+              abstractor_abstraction.unknown = unknown
+              abstractor_abstraction.not_applicable = not_applicable
+              abstractor_abstraction.save!
+            end
         end
       end
     end

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

@@ -26,51 +26,7 @@ module Abstractor
           abstractor_abstractions.map(&:abstractor_suggestions).flatten.empty?
         end
 
-        ##
-        # Updates all abstractor abstractions in a group to 'not applicable' or 'unknown'.
-        #
-        # @param [Abstractor::Enum::ABSTRACTION_OTHER_VALUE_TYPE_UNKNOWN, Abstractor::Enum::ABSTRACTION_OTHER_VALUE_TYPE_NOT_APPLICABLE] abstraction_other_value_type contorls whether to update all abstractor abstractions in the group to 'unknown' or 'not applicable'
-        # @return [void]
-        def update_abstractor_abstraction_other_value(abstraction_other_value_type)
-          raise(ArgumentError, "abstraction_value_type argument invalid") unless Abstractor::Enum::ABSTRACTION_OTHER_VALUE_TYPES.include?(abstraction_other_value_type)
-
-          rejected_status = Abstractor::AbstractorSuggestionStatus.where(:name => 'Rejected').first
-          accepted_status = Abstractor::AbstractorSuggestionStatus.where(:name => 'Accepted').first
-          case abstraction_other_value_type
-          when Abstractor::Enum::ABSTRACTION_OTHER_VALUE_TYPE_UNKNOWN
-            unknown = true
-            not_applicable = false
-          when Abstractor::Enum::ABSTRACTION_OTHER_VALUE_TYPE_NOT_APPLICABLE
-            unknown = false
-            not_applicable = true
-          end
-
-          Abstractor::AbstractorAbstraction.transaction do
-            if abstraction_other_value_type
-              abstractor_abstractions.each do |abstractor_abstraction|
-                abstractor_abstraction.abstractor_suggestions.each do |abstractor_suggestion|
-                  if unknown && abstractor_suggestion.unknown
-                    abstractor_suggestion.abstractor_suggestion_status = accepted_status
-                    abstractor_suggestion.save!
-                  else
-                    set_abstractor_abstraction(abstractor_abstraction, unknown, not_applicable)
-                    abstractor_suggestion.abstractor_suggestion_status = rejected_status
-                    abstractor_suggestion.save!
-                  end
-                end
-              end
-            end
-          end
-        end
-
         private
-          def set_abstractor_abstraction(abstractor_abstraction, unknown, not_applicable)
-            abstractor_abstraction.value = nil
-            abstractor_abstraction.unknown = unknown
-            abstractor_abstraction.not_applicable = not_applicable
-            abstractor_abstraction.save!
-          end
-
           def update_abstractor_abstraction_group_members
             return unless deleted?
             abstractor_abstraction_group_members.each do |gm|

data/lib/abstractor/version.rb

@@ -1,3 +1,3 @@
 module Abstractor
-  VERSION = '1.0.19'
+  VERSION = '1.0.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails