sequenceserver 0.7.2 → 0.7.3

data/public/js/sequenceserver.blast.js

@@ -0,0 +1,112 @@
+/*
+    SequenceServer's BLAST module/method
+
+    Adds `blast` method to `SS`.
+
+    blast():
+        not implemented
+
+    `blast` defines the following methods:
+        init():
+           initialize `blast` object
+
+    This module defines the following events:
+
+        sequence_type_changed:
+            When the type (nucleotide or protein) of the input sequence changes.
+
+        blast_valid:
+            If the current user input is sufficient to launch a BLAST
+
+        blast_invalid:
+            If the current user input is not sufficient to launch a BLAST
+
+    TODO: should (probably) access UI objects through some sort of interface
+*/
+SS.blast = (function () {
+    /* private methods */
+
+    /*
+        check if blast is valid (sufficient input to blast or not)
+    */
+    var is_valid = function () {
+        // must enter a query
+        if (!$('#sequence').val()) {
+            return false;
+        }
+
+        // must select a blast method
+        if (!$('.blastmethods input:checked').val()) {
+            return false;
+        }
+
+        // must select atleast one database
+        if (!$('.databases input:checked').val()) {
+            return false;
+        }
+
+        // everything good
+        return true;
+    }
+
+    /*
+        signal blast's validity (sufficient input to blast or not)
+    */
+    var signal_blast_validity = function () {
+        $('#sequence, .blastmethods, .databases').change(function () {
+          if (is_valid()) {
+              $('form').trigger('blast_valid');
+          }
+          else {
+              $('form').trigger('blast_invalid');
+          }
+        });
+    }
+
+    /*
+        determine input sequence type, store it, and trigger
+        'sequence_type_changed' event if the input sequence has changed
+        (TODO: the method is doing too much; split it)
+    */
+    var signal_sequence_type_changed = function () {
+        var prev_seq = prev_seq_type = '';
+
+        (function poll () {
+            setTimeout(function (){
+                var seq, seq_type;
+                seq = $('#sequence').val();
+
+                //act only if user input has changed
+                if (seq != prev_seq){
+                    prev_seq = seq;
+                    $('#sequence').change();
+
+                    //get input sequence type from the server
+                    $.post('', {sequence: seq}, function(seq_type){
+                        if (seq_type != prev_seq_type){
+                            prev_seq_type = seq_type;
+
+                            //store sequence type and notify listeners
+                            $('#sequence').data('sequence_type', seq_type).trigger('sequence_type_changed');
+                        }
+                    });
+                }
+                poll();
+              }, 100)
+        }());
+    };
+
+
+    /* public interface */
+
+    var blast = function () {
+        return undefined;
+    }
+
+    blast.init = function () {
+        signal_sequence_type_changed();
+        signal_blast_validity();
+    }
+
+    return blast;
+}());

data/public/js/{search.js → sequenceserver.js}

@@ -59,14 +59,7 @@
     following methods:
 
         main():
-            SequenceServer's main event loop. It watches for changes in user
-            input and triggers appropriate SequenceServer specific events.
-
-
-    SequenceServer defines the following events:
-
-        sequence_type_changed:
-            When the type (nucleotide or protein) of the input sequence changes.
+            Initializes SequenceServer's various modules.
 */
 
 //define global SS object
@@ -78,53 +71,26 @@ if (!SS) {
 //SS module
 (function () {
 
-    /* private methods */
-
-    /* determine input sequence type, store it, and trigger
-       sequence_type_changed' event if the input sequence has changed
-       (TODO: the method is doing too much; split it)
-    */
-    var check_sequence_type = function () {
-        var prev_seq = prev_seq_type = '';
-
-        (function poll () {
-            setTimeout(function (){
-                var seq, seq_type;
-                seq = $('#sequence').val();
-
-                //act only if user input has changed
-                if (seq != prev_seq){
-                    prev_seq = seq;
-
-                    //get input sequence type from the server
-                    $.post('', {sequence: seq}, function(seq_type){
-                        if (seq_type != prev_seq_type){
-                            prev_seq_type = seq_type;
-
-                            //store sequence type and notify listeners
-                            $('#sequence').data('sequence_type', seq_type).trigger('sequence_type_changed');
-                        }
-                    });
-                }
-                poll();
-              }, 100)
-        }());
-    };
-
-
-    /* public methods */
-
-    /* setup listeners for user input changes that trigger appropriate
-       SequenceServer events
+    /*
+        ask each module to initialize itself
     */
     SS.main = function () {
-        check_sequence_type();
+        SS.blast.init();
     }
 }()); //end SS module
 
 $(document).ready(function(){
     // start SequenceServer's event loop
     SS.main();
+    $('input:submit').disable();
+
+    $('form').on('blast_valid', function () {
+        $('input:submit').enable();
+    });
+
+    $('form').on('blast_invalid', function () {
+        $('input:submit').disable();
+    });
 
     $('#sequence').bind('sequence_type_changed', function(){
         var seq_type = $(this).data('sequence_type');

data/sequenceserver.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   # meta
   s.name        = 'sequenceserver'
-  s.version     = '0.7.2'
+  s.version     = '0.7.3'
   s.authors     = ['Anurag Priyam', 'Ben J Woodcroft', 'Yannick Wurm']
   s.email       = 'anurag08priyam@gmail.com'
   s.homepage    = 'http://sequenceserver.com'

data/views/search.erb

@@ -11,7 +11,8 @@
   <script type="text/javascript" src="<%= uri('/js/jquery.js') %>"></script>
   <script type="text/javascript" src="<%= uri('/js/jquery.enablePlaceholder.min.js') %>"></script>
   <script type="text/javascript" src="<%= uri('/js/jquery.activity.js') %>"></script>
-  <script type="text/javascript" src="<%= uri('/js/search.js') %>"></script>
+  <script type="text/javascript" src="<%= uri('/js/sequenceserver.js') %>"></script>
+  <script type="text/javascript" src="<%= uri('/js/sequenceserver.blast.js') %>"></script>
 
   <%# without a space after erb's closing tag, a / gets appended to css' path %>
   <link rel="stylesheet" media="screen" type="text/css" href="<%= uri('/css/bootstrap.min.css') %>" />

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequenceserver
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Anurag Priyam
@@ -89,8 +89,9 @@ files:
 - public/css/custom.css
 - public/js/jquery.js
 - public/js/jquery.enablePlaceholder.min.js
-- public/js/search.js
+- public/js/sequenceserver.js
 - public/js/jquery.activity.js
+- public/js/sequenceserver.blast.js
 - public/js/bootstrap-modal.js
 - public/js/bootstrap-alerts.js
 - tests/test_sequencehelpers.rb