humdrum-rails 0.0.7 → 0.0.8

data/lib/rails/generators/humdrum/layout/templates/stylesheets/gumby-pagination.css

@@ -0,0 +1,56 @@
+/* pagination (base.css) */
+
+.pagination { margin-top:10px;}
+
+.pagination a,span {
+  float: left;
+}
+
+.pagination span.current {
+  padding: 2px 5px;
+  margin-right: 5px; 
+  border-style: solid;
+  border-width: 1px; 
+  background: #37a7d9;
+  color: white;
+  border: 1px solid #37a7d9;
+  min-width: 15px;
+  text-align: center;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+}
+
+.pagination span.gap {
+  padding: 2px 5px;
+  margin-right: 5px; 
+  text-align: center;
+  font-size:12px;
+}
+
+.pagination a {
+  text-decoration: none;  
+  padding: 2px 5px;
+  margin-right: 5px; 
+  display: block;
+  border-style: solid;
+  border-width: 1px;
+  border: 1px solid #c3c4ba;
+  -moz-border-radius: 2px;
+  -webkit-border-radius: 2px;
+  border-radius: 2px;
+  margin-right: 5px;
+  min-width: 15px;
+  text-align: center;
+  font-size:12px;
+}
+
+.pagination a:hover {
+  border: 1px solid #818171;
+  -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+  -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+}
+
+.pagination a:active {
+  outline: none;
+}

data/lib/rails/generators/humdrum/layout/templates/stylesheets/overrides-bootstrap.css

@@ -2,7 +2,7 @@
   Ensure that you load this file in application.css after bootstrap (backword slash to escape)
 */
 
-body {padding-top:50px;font-size:14px;}
+body {font-size:14px;}
 
 /* Gliphicons Icon Path */
 

data/lib/rails/generators/humdrum/layout/templates/stylesheets/overrides-gumby.css

@@ -16,3 +16,11 @@ h4 { font-size: 20px; font-size: 1.50rem}
 h5 { font-size: 16px; font-size: 1.40rem}
 h6 { font-size: 14px; font-size: 1.30rem}
 
+/* jQuery Validation error highlighting */
+div.danger label.error {color: darkred; font-size:12px;}
+div.danger textarea {background-color: #f0c5c5; }
+
+/* textareas should stretch maximum with default border color to match with text boxes. Also the text style should match with text input fields*/
+form textarea {width: 100%; border-color:#d8d8d8; color: #222; padding: 5px 10px; font-family: 'Open Sans'; font-weight: 300;}
+
+

data/lib/rails/generators/humdrum/layout/templates/views/bootstrap/layouts/admin.html.erb

@@ -11,13 +11,13 @@
 
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
     <link rel="icon" href="/assets/favicon.ico" type="image/png">
-
+    
     <%%= stylesheet_link_tag "application", :media => "all" -%>
-
+    
     <%%= csrf_meta_tags -%>
     
-		<%%# Modernizr should be loaded first -%>
-		<script src="/assets/humdrum/modernizr.2.6.2.js"></script>
+		<%%# Modernizr should be loaded first %>
+		<script src="/assets/modernizr.2.6.2.js"></script>
 
   </head>
 

data/lib/rails/generators/humdrum/layout/templates/views/bootstrap/layouts/admin/_header.html.erb

@@ -1,4 +1,4 @@
-<div class="navbar navbar-inverse navbar-fixed-top">
+<div class="navbar navbar-inverse">
   <div class="navbar-inner">
     <div class="<%= container_class %>">
       <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

data/lib/rails/generators/humdrum/layout/templates/views/bootstrap/layouts/public.html.erb

@@ -16,8 +16,8 @@
 
     <%%= csrf_meta_tags -%>
     
-		<%# Modernizr should be loaded first -%>
-		<script src="/assets/humdrum/modernizr.2.6.2.js"></script>
+		<%# Modernizr should be loaded first %>
+		<script src="/assets/modernizr.2.6.2.js"></script>
 
   </head>
 

data/lib/rails/generators/humdrum/layout/templates/views/bootstrap/layouts/public/_header.html.erb

@@ -1,4 +1,4 @@
-<div class="navbar navbar-inverse navbar-fixed-top">
+<div class="navbar navbar-inverse">
   <div class="navbar-inner">
     <div class="<%= container_class %>">
       <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

data/lib/rails/generators/humdrum/layout/templates/views/bootstrap/layouts/user.html.erb

@@ -16,8 +16,8 @@
 
     <%%= csrf_meta_tags -%>
     
-		<%# Modernizr should be loaded first -%>
-		<script src="/assets/humdrum/modernizr.2.6.2.js"></script>
+		<%# Modernizr should be loaded first %>
+		<script src="/assets/modernizr.2.6.2.js"></script>
 
   </head>
 

data/lib/rails/generators/humdrum/layout/templates/views/bootstrap/layouts/user/_header.html.erb

@@ -1,4 +1,4 @@
-<div class="navbar navbar-inverse navbar-fixed-top">
+<div class="navbar navbar-inverse">
   <div class="navbar-inner">
     <div class="<%= container_class %>">
       <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">

data/lib/rails/generators/humdrum/resource/resource_generator.rb

@@ -18,10 +18,10 @@ module Humdrum
       argument :resource_name, :type=>:string
       argument :fields, :type=>:hash, :banner =>"Resource Fields."
       
-      class_option :fluid, :type => :boolean, :default => true, :desc => "Pass true to create fluid layouts"
+      class_option :fixed, :type => :boolean, :default => false, :desc => "Create fixed layouts. Default is fluid (Gumby doesn't support fluid framework. Hence applicable only for bootstrap for the timebeing.)"
       class_option :debug, :type => :boolean, :default => false, :desc => "This will print the arguments for debugging"
       
-      class_option :front_end_framework, :type => :string, :default => 'gumby', :desc => "Support Twitter Bootstrap (twitter.github.io/bootstrap/) and Gumpy (http://gumbyframework.com/). Default is bootstrap. Pass gumby for Gumby Framework"
+      class_option :front_end_framework, :type => :string, :default => 'bootstrap', :desc => "Support Twitter Bootstrap (twitter.github.io/bootstrap/) and Gumpy (http://gumbyframework.com/). Default is bootstrap. Pass gumby for Gumby Framework"
       
       def debug_args
         print_args if options.debug?
@@ -34,6 +34,7 @@ module Humdrum
       def generate_views
         template "views/#{options.front_end_framework}/resource/_edit.html.erb", "app/views/#{controller_path}/_edit.html.erb"
         template "views/#{options.front_end_framework}/resource/_filters.html.erb", "app/views/#{controller_path}/_filters.html.erb"
+        template "views/#{options.front_end_framework}/resource/_field.html.erb", "app/views/#{controller_path}/_field.html.erb"
         template "views/#{options.front_end_framework}/resource/_form.html.erb", "app/views/#{controller_path}/_form.html.erb"
         template "views/#{options.front_end_framework}/resource/_index.html.erb", "app/views/#{controller_path}/_index.html.erb"
         template "views/#{options.front_end_framework}/resource/_item.html.erb", "app/views/#{controller_path}/_item.html.erb"
@@ -60,7 +61,14 @@ module Humdrum
       end
       
       def generate_migrations
-        migration_template "migrations/create_resources.rb", "db/migrate/create_#{instances_name}"
+        migration_dir = "db/migrate"
+        migration_file_name = "create_#{instances_name}.rb"
+        destination = self.class.migration_exists?(migration_dir, migration_file_name)
+        if destination
+          say_status("skipped", "Migration #{migration_file_name}.rb already exists")
+        else
+          migration_template "migrations/create_resources.rb", "db/migrate/create_#{instances_name}.rb"
+        end
       end
       
       def generate_routes
@@ -71,10 +79,6 @@ module Humdrum
         }
       end
       
-      def generate_locales
-        template "config/locales/humdrum.en.yml", "config/locales/humdrum.en.yml"
-      end
-      
       private
       
       def print_args
@@ -152,6 +156,14 @@ module Humdrum
         instance_name.pluralize
       end
       
+      def instance_title
+        instance_name.titleize
+      end
+      
+      def instances_title
+        instances_name.titleize
+      end
+      
       def table_name
         instances_name
       end
@@ -187,33 +199,6 @@ module Humdrum
         end
       end
       
-      def input_type(name, type)
-        if name.include?("email") && type == "string"
-          return "email"
-        elsif name.include?("password") && type == "string"
-          return "password"
-        elsif (name.include?("phone") || name.include?("mobile")) && type == "string"
-          return "tel"
-        else
-          case type
-          when "string"
-            "text"
-          when "text"
-            "textarea"
-          when "integer"
-            "number"
-          when "references"
-            "type"
-          when "date"
-            "date"
-          when "datetime"
-            "datetime-local"
-          when "timestamp", "time"
-            "time"
-          end
-        end
-      end
-      
       ## List of all the string fields 
       def string_fields
         main_field = main_string_field
@@ -231,6 +216,43 @@ module Humdrum
         fields.map{|name, type| name if name.include?("name") && type == "string"}.uniq.compact || fields.keys.any? ? fields.keys.first : "id"
       end
       
+      def guess_input_type(name, type)
+        case type
+        when "string"
+          if name.include?("url")
+            return "url"
+          elsif name.include?("email")
+            return "email"
+          elsif name.include?("phone") || name.include?("mobile") || name.include?("landline") || name.include?("contact number") 
+            return "tel"
+          elsif name.include?("time")
+            return "time"
+          elsif name.include?("date")
+            return "date"
+          elsif name.include?("password")
+            return "password"
+          else
+            "text"
+          end
+        when "text"
+          "textarea"
+        when "integer"
+          "number"
+        when "references"
+          "type"
+        when "date"
+          "date"
+        when "datetime"
+          "datetime-local"
+        when "timestamp", "time"
+          "time"
+        when "boolean"
+          "checkbox"
+        else
+          "text"
+        end
+      end
+      
       ## Text Fields like description or summary
       def text_fields
         fields.map{|name, type| name if type == "text"}.uniq.compact
@@ -238,21 +260,21 @@ module Humdrum
     	
       def container_class
         if options.front_end_framework == "bootstrap"
-          options.fluid? ? "container-fluid" : "container"
+          options.fixed? ? "container" : "container-fluid"
         elsif options.front_end_framework == "gumby"
           "container"
         else
-          "container"
+          options.fixed? ? "container" : "container-fluid"
         end
       end
       
       def row_class
         if options.front_end_framework == "bootstrap"
-          options.fluid? ? "row-fluid" : "row"
+          options.fixed? ? "row" : "row-fluid"
         elsif options.front_end_framework == "gumby"
           "row"
         else
-          "row"
+          options.fixed? ? "row" : "row-fluid"
         end
       end
       

data/lib/rails/generators/humdrum/resource/templates/controllers/resource_controller.rb

@@ -4,6 +4,8 @@ class <%= controller_class %> < ApplicationController
   layout "public"
   #authorize_actions_for Item, :actions => {:index => :delete}
   
+  before_filter :parse_pagination_params, :only=>:index
+  
   # GET /<%= instances_name %>
   # GET /<%= instances_name %>.js
   # GET /<%= instances_name %>.json
@@ -26,7 +28,7 @@ class <%= controller_class %> < ApplicationController
     @<%= instance_name %> = <%= model_class %>.find(params[:id])
     
     respond_to do |format|
-      format.html { get_collections and render :action => :index }
+      format.html { get_collections and render :index }
       format.json { render json: @<%= instance_name %> }
       format.js {}
     end
@@ -39,7 +41,7 @@ class <%= controller_class %> < ApplicationController
     @<%= instance_name %> = <%= model_class %>.new
     
     respond_to do |format|
-      format.html # new.html.erb
+      format.html { get_collections and render :index }
       format.json { render json: @<%= instance_name %> }
       format.js {}
     end
@@ -49,6 +51,12 @@ class <%= controller_class %> < ApplicationController
   def edit
     ## Fetching the <%= instance_name %> object 
     @<%= instance_name %> = <%= model_class %>.find(params[:id])
+    
+    respond_to do |format|
+      format.html { get_collections and render :index }
+      format.json { render json: @<%= instance_name %> }
+      format.js {}
+    end
   end
 
   # POST /<%= instances_name %>

data/lib/rails/generators/humdrum/resource/templates/javascripts/validations/validator.js

@@ -1,32 +1,85 @@
 function validate<%= model_class %>Form() {
   
-    $('#form_<%= instance_name %>').validation({
-        required: [
-          {name: '<%= instance_name %>[first_name]'},
-          {name: '<%= instance_name %>[last_name]'},
-          {name: '<%= instance_name %>[designation]'},
-          {
-            name : '<%= instance_name %>[email]',
-              // email must contain an @
-            validate : function($el) {
-              return $el.val().match('@') !== null;
-            }
-          }
-        ],
-        fail: function(failed) {
-          errorText = "Please fill out all the required fields and ensure the data entered is valid.";
-          $("#div_<%= instance_name %>_form_error").remove();
-          txtDiv = "<div id='div_<%= instance_name %>_form_error' class=\"alert danger\" data-alert=\"alert\" style=\"margin-bottom:5px;\">"+ errorText +"</div>"
-          $("#div_<%= instance_name %>_details").prepend(txtDiv);
+    $('#form_<%= instance_name %>').validate({
+      debug: true,
+      rules: {
+      <%- fields.each do |name, type| -%>
+      <%- input_type = guess_input_type(name, type) -%>
+      <%- if input_type == "email" -%>
+        "<%= instance_name %>[email]": {
+            required: true,
+            email: true
         },
-        submit: function(data) {
-          $.ajax({
-            url: $("#form_<%= instance_name %> input[name=faction]").val(),
-            type: $("#form_<%= instance_name %> input[name=fmethod]").val(),
-            dataType: 'script',
-            data: data
-          });
+      <%- elsif input_type == "text" -%>
+        "<%= instance_name %>[<%= name %>]": {
+            required: true,
+            minlength: 2,
+            maxlength: 50
+        },
+      <%- else -%>
+        "<%= instance_name %>[<%= name %>]": "required",
+      <%- end -%>
+      <%- end -%>
+      },
+      messages: {
+      <%- fields.each do |name, type| -%>
+      <%- input_type = guess_input_type(name, type) -%>
+      <%- if input_type == "email" -%>
+        "<%= instance_name %>[<%= name %>]": {
+            required: "We need your email address to contact you",
+            email: "Your email address must be in the format of name@domain.com"
+        },
+      <%- elsif input_type == "text" -%>
+        "<%= instance_name %>[<%= name %>]": "Please specify <%= name.titleize %>",
+      <%- else -%>
+        "<%= instance_name %>[<%= name %>]": "Please specify <%= name.titleize %>",
+      <%- end -%>
+      <%- end -%>
+      },
+      highlight: function(element) {
+          $(element).parent().addClass("danger");
+      },
+      unhighlight: function(element) {
+          $(element).parent().removeClass("danger");
+      },
+      invalidHandler: function(event, validator) {
+        // 'this' refers to the form
+        var errors = validator.numberOfInvalids();
+        if (errors) {
+          
+          // Populating error message
+          var errorMessage = errors == 1
+            ? 'You missed 1 field. It has been highlighted'
+            : 'You missed ' + errors + ' fields. They have been highlighted';
+          
+          // Removing the form error if it already exists
+          $("#div_<%= instance_name %>_js_validation_error").remove();
+          
+          errorHtml = "<div id='div_<%= instance_name %>_js_validation_error' class=\"alert danger\" data-alert=\"alert\" style=\"margin-bottom:5px;\">"+ errorMessage +"</div>"
+          $("#div_<%= instance_name %>_details").prepend(errorHtml);  
+          
+          // Show error labels
+          $("div.error").show();
+          
+        } else {
+          // Hide error labels
+          $("div.error").hide();
+          // Removing the error message
+          $("#div_<%= instance_name %>_js_validation_error").remove();
         }
+      },
+      submitHandler: function(form) {
+        // Submit the form via HTTP request
+        // form.submit();
+        
+        // Submit the form via XMLHTTP request (Ajax)
+        $(form).ajaxSubmit({
+          url: $("#form_<%= instance_name %> input[name=faction]").val(),
+          type: $("#form_<%= instance_name %> input[name=fmethod]").val(),
+          dataType: 'script'
+        });
+      }
+      
     });
     
 }