caboose-cms 0.6.30 → 0.6.31

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODMwZTNmNjZmMWZhNzdmZjBhOTNhZTQwMDk0OTEzOTI0MGVhOTMzYg==
+    YmE5Nzc5MGY3NWFjYTViZGZkMDc5NTkzMGU0MDQ3NjRmNjdmOGM0NQ==
   data.tar.gz: !binary |-
-    N2Y2MGU4ODljYzNhMmFjMjNiZDk2ODcwOTg4ODI0NmRiOGYxNGI3Yg==
+    NzY2NTE4NmQ5MzE2ZWY4OGU2MzI0ZWVkNGUzZjNlYjA5YWVmNjA5Yg==
 SHA512:
   metadata.gz: !binary |-
-    NmI5NDc3NDIxZTdhODkzMzNjMTIzMDMxZTYwMzY3M2Q2NTVmYWQ5Nzc3N2M2
-    YTk4M2QzZDNjOWEwZmNiYTFlYTcyNGM4MDk5ZmFjMjUxZjRhOTA1NjkwNDRl
-    YmE2NjI4ZTZhZWVkYTQwMjM2OWM3NDY2Y2ExOTBiNThjNWY5OTA=
+    YjY0MWY1MDQwMzE4MmRhMDAzMmViZDFhYmNjYjJhNThjODk1ZjYwOTc3NDZm
+    ODM3MWFlNjQzOGUzMTg5YmQ4YTgyN2I4ZDY0ZmUwNzgxMzg1ZjBiMWMzYWM1
+    MjlhYTdkY2ZiOWViYjE5NTJjYmRiY2UwM2ZkZDc3ZDMyMTRkOGQ=
   data.tar.gz: !binary |-
-    MzAzZjIzMDgzZDBmM2I3OWU3MGY5YzIyMTQ0NTMzODFhMWJiNDZiYmNiM2Ex
-    YjY5YTBjMWZiYjU3OGQ5M2UxMzEwYmRiY2RiZDUyZjgxMGNmM2YzNmVmNDZm
-    MjA5OTM4MjZmOGJiODVjMmJlNjZhY2U0NGNkMTYxMzc5Y2I0NjU=
+    YWQ0OWYxNjAwZmY3ZWI2NTIyNmUyYWI5OWExZjVlN2EzOTEzZDhkYWE3NTlh
+    ODFlZWFiZDI5MWZiZTlmZTY3MmRhMGZhN2Y3NGUwZTU5YzAzNjFkMjVmMDNi
+    MGEzYzU2ZDEwMjIwNWU4NGY3Njk3ZTFlMWJlNzcwYzQ5MzAzNjY=

data/app/assets/javascripts/caboose/model/index_table.js

@@ -804,24 +804,29 @@ IndexTable.prototype = {
   },
   
   current_message: false,
-  show_message: function(el, name) {
+  show_message: function(el, name, after) {
     var that = this;
     if (that.current_message == name)
     {
       $('#' + that.container + '_message').slideUp(function() { $('#' + that.container + '_message').empty().css('margin-bottom', 0); });
       that.current_message = false;
+      if (after) after();
       return;
     }
     if (!$('#' + that.container + '_message').is(':empty'))
     {
-      $('#' + that.container + '_message').slideUp(function() { $('#' + that.container + '_message').empty().append(el).css('margin-bottom', '10px').slideDown(); });
-      that.current_message = name;
+      $('#' + that.container + '_message').slideUp(function() { 
+        $('#' + that.container + '_message').empty().append(el).css('margin-bottom', '10px').slideDown();
+        if (after) after();
+      });
+      that.current_message = name;      
       return;
     }
     else     
     {
       $('#' + that.container + '_message').hide().empty().append(el).css('margin-bottom', '10px').slideDown();
       that.current_message = name;
+      if (after) after();
     }
   },
   
@@ -830,11 +835,16 @@ IndexTable.prototype = {
     var that = this;          
     var form = $('<form/>').attr('id', 'new_form')
       .append($('<input/>').attr('type', 'hidden').attr('name', 'authenticity_token').val(that.form_authenticity_token));
+    var focus_field = false;
     $.each(this.new_model_fields, function(i, f) {
       if (f.type == 'hidden')
         form.append($('<input/>').attr('type', 'hidden').attr('name', f.name).val(f.value));
       else
+      {
         form.append($('<p/>').append($('<input/>').attr('type', 'text').attr('name', f.name).attr('placeholder', f.nice_name).css('width', '' + f.width + 'px')));
+        if (!focus_field)
+          focus_field = f.name;
+      }
     });
     form.append($('<div/>').attr('id', that.container + '_new_message'));
     form.append($('<p>')        
@@ -843,8 +853,8 @@ IndexTable.prototype = {
     );        
     var div = $('<div/>').addClass('note')
       .append($('<h2/>').css('margin-top', 0).css('padding-top', 0).html(that.new_model_text))
-      .append(form);
-    that.show_message(div);
+      .append(form);        
+    that.show_message(div, null, function() { $('#new_form input[name="' + focus_field + '"]').focus(); });
   },
     
   add_model: function() 

data/app/models/caboose/comment_routes.rb

@@ -19,30 +19,23 @@ module Caboose
           if line =~ /^(.*?)class (.*?)Controller(.*?)$/
             class_name = line.gsub(/^(.*?)class (.*?)Controller(.*?)$/, '\2').gsub(/([A-Z])/, '_\1').downcase
             class_name[0] = '' if class_name[0] == '_'
-            next
-          end
-          if line =~ /# CLASS PRIORITY: \d/
-            class_priority = line.gsub(/# ROUTES PRIORITY: (\d*?)$/, '\1').to_i            
-            next
-          end
-          if line =~ /# ROUTE PRIORITY: \d/
-            route_priority = line.gsub(/# ROUTE PRIORITY: (\d*?)$/, '\1').to_i            
-            next
-          end          
-          if line.starts_with?('def ')
+          elsif line =~ /# @class_route_priority \d/
+            class_priority = line.gsub(/# @class_route_priority (\d*?)$/, '\1').to_i
+          elsif line =~ /# @route_priority \d/
+            route_priority = line.gsub(/# @route_priority (\d*?)$/, '\1').to_i
+          elsif line.starts_with?('def ')
             actions << [line.gsub('def ', ''), uris, route_priority]              
             uris = []
             route_priority = 20
-          end          
-          if    line =~ /# GET (.*?)/       then uris << "get    \"#{line.gsub(/# GET (.*?)/       , '\1')}\""          
-          elsif line =~ /# POST (.*?)/      then uris << "post   \"#{line.gsub(/# POST (.*?)/      , '\1')}\""          
-          elsif line =~ /# PUT (.*?)/       then uris << "put    \"#{line.gsub(/# PUT (.*?)/       , '\1')}\""          
-          elsif line =~ /# DELETE (.*?)/    then uris << "delete \"#{line.gsub(/# DELETE (.*?)/    , '\1')}\""
+          elsif line =~ /# @route GET (.*?)/       then uris << "get    \"#{line.gsub(/# @route GET (.*?)/       , '\1')}\""          
+          elsif line =~ /# @route POST (.*?)/      then uris << "post   \"#{line.gsub(/# @route POST (.*?)/      , '\1')}\""          
+          elsif line =~ /# @route PUT (.*?)/       then uris << "put    \"#{line.gsub(/# @route PUT (.*?)/       , '\1')}\""          
+          elsif line =~ /# @route DELETE (.*?)/    then uris << "delete \"#{line.gsub(/# @route DELETE (.*?)/    , '\1')}\""
           end
         end      
         classes << [class_name, actions, class_priority]
       end
-      puts "--------------------------------------------------------------------"
+
       routes = []
       classes.sort_by{ |arr| arr[2] }.each do |carr|
         
@@ -51,11 +44,7 @@ module Caboose
         
         # Get the longest URI so we can make routes that line up vertically
         longest = ''
-        actions.each do |action, uris|          
-          uris.each do |uri|
-            longest = uri if uri.length > longest.length
-          end
-        end
+        actions.each{ |action, uris| uris.each{ |uri| longest = uri if uri.length > longest.length }}
         length = longest.length + 1
         
         # Make the route line

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.30'
+  VERSION = '0.6.31'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.30
+  version: 0.6.31
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg