qwester 0.1.3 → 0.1.4

data/lib/active_admin/admin/rule_sets.rb

@@ -165,52 +165,58 @@ EOF
         para qwester_rule_set.rule
       end
       
-      if qwester_rule_set.matching_answer_sets.present?
-        div do
-          h3 'Sample matching answer sets'
-          if qwester_rule_set.matching_answer_sets.length
-            para "There are at least #{qwester_rule_set.matching_answer_sets.length} combinations of answers that would pass this test."
-          end
-          para 'The following combinations of answers would pass'
-          qwester_rule_set.matching_answer_sets.each do |answer_set|
-            ul :style => 'border:#CCCCCC 1px solid;padding:5px;list-style:none;' do
-              answer_set.each do |answer_id|
-                next unless Answer.exists?(answer_id)
-                answer = Answer.find(answer_id)
-                question_summary = [answer.value, answer.question.title].join(' : ')
-                li "(a#{answer_id}) #{question_summary}"
+      begin
+        if qwester_rule_set.matching_answer_sets.present?
+          div do
+            h3 'Sample matching answer sets'
+            if qwester_rule_set.matching_answer_sets.length
+              para "There are at least #{qwester_rule_set.matching_answer_sets.length} combinations of answers that would pass this test."
+            end
+            para 'The following combinations of answers would pass'
+            qwester_rule_set.matching_answer_sets.each do |answer_set|
+              ul :style => 'border:#CCCCCC 1px solid;padding:5px;list-style:none;' do
+                answer_set.each do |answer_id|
+                  next unless Answer.exists?(answer_id)
+                  answer = Answer.find(answer_id)
+                  question_summary = [answer.value, answer.question.title].join(' : ')
+                  li "(a#{answer_id}) #{question_summary}"
+                end
               end
             end
           end
+        else
+          div do
+            h3 'Matching answer sets'
+            para 'Answers will pass unless they contain a blocking answer set'
+          end
         end
-      else
-        div do
-          h3 'Matching answer sets'
-          para 'Answers will pass unless they contain a blocking answer set'
-        end
-      end
-      
-      if qwester_rule_set.blocking_answer_sets.present?
-        div do
-          h3 'Sample blocking answer sets'
-          para 'The following combinations of answers would not pass'
-          qwester_rule_set.blocking_answer_sets.each do |answer_set|
-             ul :style => 'border:#CCCCCC 1px solid;padding:5px;list-style:none;' do
-              answer_set.each do |answer_id|
-                next unless Answer.exists?(answer_id)
-                answer = Answer.find(answer_id)
-                question_summary = [answer.value, answer.question.title].join(' : ')
-                li "(a#{answer_id}) #{question_summary}"
+
+        if qwester_rule_set.blocking_answer_sets.present?
+          div do
+            h3 'Sample blocking answer sets'
+            para 'The following combinations of answers would not pass'
+            qwester_rule_set.blocking_answer_sets.each do |answer_set|
+              ul :style => 'border:#CCCCCC 1px solid;padding:5px;list-style:none;' do
+                answer_set.each do |answer_id|
+                  next unless Answer.exists?(answer_id)
+                  answer = Answer.find(answer_id)
+                  question_summary = [answer.value, answer.question.title].join(' : ')
+                  li "(a#{answer_id}) #{question_summary}"
+                end
               end
             end
           end
+        else
+          div do
+            h3 'Blocking answer sets'
+            para 'Answers will only pass if they contain a matching answer set'
+          end
         end
-      else
-        div do
-          h3 'Blocking answer sets'
-          para 'Answers will only pass if they contain a matching answer set'
-        end
+      rescue ArrayLogic::UnableToDetermineCombinationsError => e
+        h3 'Sample combinations'
+        para e.message
       end
+        
       
     end  
 

data/lib/qwester/version.rb

@@ -1,10 +1,13 @@
 module Qwester
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end
 
 # History
 # =======
 # 
+# 0.1.4 - Bug fix update
+#   Rescues exception in admin_rules_sets#show due to rule including a function
+# 
 # 0.1.3 - Update to use version of Array Logic that supports functions.
 #   Allows RuleSet#rule to be defined using sum, average or count functions
 # 
@@ -20,21 +23,21 @@ end
 #   the list of questionnaires being displayed can change as questionnaires are
 #   submitted.
 # 
-# 0.0.9 - maintenance update
+# 0.0.9 - Maintenance update
 #   Removes cope_index from migrations.
 #   Ensures answer_store#session_id is unique
 # 
-# 0.0.8 - add facility to preserve answer stores
+# 0.0.8 - Add facility to preserve answer stores
 #   This allows snaps shots to be taken, and redundant answer stores to be 
 #   removed during routine maintenance.
 # 
-# 0.0.7 - improves deployment process
+# 0.0.7 - Improves deployment process
 #   Fixes a bug in one of the migrations and updates the README
 # 
-# 0.0.6 - bug fix update
+# 0.0.6 - Bug fix update
 #   Fixes issue where error raised if user submits a questionnaire without
 #   selecting and answer.
 #
-# 0.0.5 - bug fix update
+# 0.0.5 - Bug fix update
 #   Fixes issue where active admin rule set form did not include link text field.
 #