common_core_js 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2219c80f29355076e17de37d99966e7b491aa09f255a911ec907b32a983bfa1c
-  data.tar.gz: 00dab2e16fc5145aff949648dcdddd60993aa99862b18319117d521c9ab78b16
+  metadata.gz: 0c741cb686a2b2cdbaf0c78412ef5733e82e048d6cd94507675a14288464b617
+  data.tar.gz: fb86d6cabe810f86faca72ecc1a7cf6045bb24df6fd6124de82289ec70d4386c
 SHA512:
-  metadata.gz: 731c8e6ef809fcade1810f67a389606f0abb62a58fe54dfcb8baa6a6b741986511cc0df2a180f390a4b55c3aee52682b91a2a64902629ac2b4fef57ef7d737a3
-  data.tar.gz: 5a34083277277efbf9b4ef9ed7a949156489d4fbc71a14b00105ff0a169ff9a0b469e6b2ceb90a8727d86fc6f8a3ff2ac3291aeac9aaf45f650fd098fb1e9b50
+  metadata.gz: aff7ba81411119d30bc13f18b0fcbdc5bf2d27353758d8795d1d8184a766636fa47faae4f3a9eee294e51ff6ed4a148817065ff51d8f0eef4407bee162e8a971
+  data.tar.gz: 0b863a346bc88ff5e12f3a942183f8a9f37c527721545a8a353cd16d957d24a176ce0f9751f333906c208b5a0484b367b1cc21096391c5db10e15ae825c76ec3

data/.gitignore

@@ -11,4 +11,6 @@ test/dummy/tmp/
 
 .idea/
 *.gem
-.DS_Store
+.DS_Store
+
+dump.rdb

data/LICENSE

@@ -1,8 +1,8 @@
 Permission is hereby granted to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-Any users of this software agree to work to dismantle systemic racism in American society, seek justice for black, brown, trans-people, women, and LTBQIAA+ representation and inclusion.
+Any users of this software agree to work to dismantle systemic racism, seek justice for black, brown, transgender people, women, and LTBQIAA+ representation and inclusion.
 
-Organizations using this software agree to center the narratives of black, brown, and trans people in the self vision and imagary.
+Organizations using this software agree to center the narratives of black, brown, and transgender people people.
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 

data/app/helpers/common_core_helper.rb

@@ -0,0 +1,79 @@
+module CommonCoreHelper
+
+    def timezonize(tz)
+      tz = tz.to_i
+      (tz >= 0 ? "+" : "-") + sprintf('%02d',tz.abs) + ":00"
+    end
+
+
+    def datetime_field_localized(form_object, field_name, value, label, timezone = nil )
+
+      res = form_object.label(label,
+                              field_name,
+                              class: 'small form-text text-muted')
+
+      res << form_object.text_field(field_name, class: 'form-control',
+                                    type: 'datetime-local',
+                                    value: date_to_current_timezone(value, timezone))
+
+      res << timezonize(timezone)
+      res
+    end
+
+
+    def date_field_localized(form_object, field_name, value, label, timezone = nil )
+      res = form_object.label(label,
+                              field_name,
+                              class: 'small form-text text-muted')
+
+      res << form_object.text_field(field_name, class: 'form-control',
+                                    type: 'date',
+                                    value: value )
+
+      res
+    end
+
+    def time_field_localized(form_object, field_name, value, label, timezone = nil )
+      res = form_object.label(label,
+                              field_name,
+                              class: 'small form-text text-muted')
+
+      res << form_object.text_field(field_name, class: 'form-control',
+                                    type: 'time',
+                                    value: date_to_current_timezone(value, timezone))
+
+      res << timezonize(tz)
+      res
+    end
+
+    def current_timezone
+      if controller.try(:current_timezone)
+        controller.current_timezone
+      elsif defined?(current_user)
+        if current_user.try(:timezone)
+          Time.now.in_time_zone(current_user.timezone).strftime("%z").to_i/100
+        else
+          Time.now.strftime("%z").to_i/100
+        end
+      else
+        raise "no method current_user is available or it does not implement timezone; please implement/override the method current_timezone IN YOUR CONTROLLER"
+      end
+    end
+
+
+    def date_to_current_timezone(date, timezone = nil)
+
+      # if the timezone is nil, use the server date'
+      if timezone.nil?
+        timezone = Time.now.strftime("%z").to_i/100
+      end
+
+      return nil if date.nil?
+
+      begin
+        return date.in_time_zone(timezone).strftime("%Y-%m-%dT%H:%M")
+      rescue
+        return nil
+      end
+    end
+end

data/app/views/common/_common_create.js.erb

@@ -8,7 +8,7 @@
 
 <% if object.errors.any? %>
 $(".flash-notices").html("<%= j render 'layouts/flash_notices' %>");
-$("<%= (scope + " ") if controller.common_scope %> .new-<%=singular%>-form").html("<%= j render(partial: '#{controller.namespace}errors', locals: {resource: object}) %>")
+$("<%= (scope + " ") if controller.common_scope %> .new-<%=singular%>-form").html('<%= j render(partial: "#{controller.namespace}errors", locals: {resource: object}) %>')
 $("<%= (scope + " ") if controller.common_scope %> .new-<%=singular%>-form").append("<%= j render(partial: "new", locals: { singular.to_sym => object}) %><i class='fa fa-times-circle fa-2x' data-name='<%=singular%>' data-role='close-button' />").slideDown();
 <% else %>
 $("<%= (scope + " ") if controller.common_scope %> .new-<%=singular%>-form").slideUp();

data/app/views/common/_common_edit_form.haml

@@ -1,4 +1,8 @@
 %td{style: "position: relative;", colspan: controller.default_colspan}
+  - if object.errors.any?
+    = render(partial: "#{controller.namespace}errors", locals: {resource: object})
+
+
   Editing
   - if object.try(:to_label)
     = object.to_label

data/app/views/common/_common_update.js.erb

@@ -1,6 +1,7 @@
 <% if object.errors.any? %>
 <% pass_through_locals ||= {} %>
-$(".<%= singular %>-table tr[data-id=<%= object.id %>][data-edit='true']").html("<%= j render(partial: '#{controller.namespace}errors', locals: {resource: object}) %><%= j render partial: 'edit', locals: {singular.to_sym => object, url: url, colspan: controller.default_colspan}.merge(pass_through_locals || {}) %>")
+$(".<%= singular %>-table tr[data-id=<%= object.id %>][data-edit='true']").html("<%= j render partial: 'edit', locals: {singular.to_sym => object, url: url, colspan: controller.default_colspan}.merge(pass_through_locals || {}) %>")
+
 $(".flash-notices").html("<%= j render 'layouts/flash_notices' %>");
 <% else %>
 $(".<%= singular %>-table tr[data-id=<%= object.id %>]:not([data-edit='true'])").replaceWith("<%= j render partial: 'line', locals: {singular.to_sym => object } %>").fadeIn()

data/lib/common_core_js.rb

@@ -6,4 +6,24 @@ require 'haml-rails'
 
 module CommonCoreJs
   # Your code goes here...
+  #
+  module ControllerHelpers
+    def modify_date_inputs_on_params(modified_params)
+      use_timezone = authenticated_user.timezone || Time.now.strftime("%z")
+
+      modified_params = modified_params.tap do |params|
+        params.keys.each{|k|
+          if k.ends_with?("_at") || k.ends_with?("_date")
+
+            begin
+              params[k] = DateTime.strptime("#{params[k]} #{use_timezone}", '%Y-%m-%dT%H:%M %z')
+            rescue StandardError
+
+            end
+          end
+        }
+      end
+      modified_params
+    end
+  end
 end

data/lib/common_core_js/engine.rb

@@ -1,5 +1,7 @@
 module CommonCoreJs
   class Engine < ::Rails::Engine
     # isolate_namespace CommonCoreJs
+
+
   end
 end

data/lib/common_core_js/version.rb

@@ -1,3 +1,3 @@
 module CommonCoreJs
-  VERSION = '0.3.1'
+  VERSION = '0.3.6'
 end

data/lib/generators/common_core/install_generator.rb

@@ -10,12 +10,11 @@ module CommonCore
 
     def initialize(*args) #:nodoc:
       super
-
-      copy_file "common_core.js", "vendor/assets/javascripts/common_core.js"
-      copy_file "common_core.scss", "vendor/assets/stylesheets/common_core.scss"
+      copy_file "common_core.js", "app/javascript/common_core.js"
+      copy_file "common_core.scss", "app/assets/stylesheets/common_core.scss"
+      copy_file "_flash_notices.haml", "app/views/layouts/_flash_notices.haml"
 
     end
-
   end
 end
 

data/lib/generators/common_core/scaffold_generator.rb

@@ -1,7 +1,36 @@
 require 'rails/generators/erb/scaffold/scaffold_generator'
 require 'ffaker'
 
+
+
 module CommonCore
+
+  module GeneratorHelper
+    def text_area_output(col, field_length)
+      lines = field_length % 40
+      if lines > 5
+        lines = 5
+      end
+
+      ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = f.text_area :#{col.to_s}, class: 'form-control', cols: 40, rows: '#{lines}'
+    %label.form-text
+      #{col.to_s.humanize}\n"
+    end
+
+
+
+    def field_output(col, type = nil, width)
+      ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = f.text_field :#{col.to_s}, value: @#{singular}.#{col.to_s}, size: #{width}, class: 'form-control', type: '#{type}'
+    %label.form-text
+      #{col.to_s.humanize}\n"
+    end
+  end
+
+
   class ScaffoldGenerator < Erb::Generators::ScaffoldGenerator
     hook_for :form_builder, :as => :scaffold
 
@@ -9,6 +38,9 @@ module CommonCore
     attr_accessor :path, :singular, :plural, :singular_class, :nest_with
 
 
+    include GeneratorHelper
+
+
     def initialize(*meta_args) #:nodoc:
       super
 
@@ -19,12 +51,7 @@ module CommonCore
         exit
       end
 
-      begin
-        @columns = object.columns.map(&:name).map(&:to_sym).reject{|x| x==:updated_at || x==:created_at || x==:id}
-      rescue StandardError => e
-        puts "Ooops... it looks like is an object for #{class_name}. Please create the database table with fields first. "
-        exit
-      end
+
 
       args = meta_args[0]
       @singular = args[0].tableize.singularize # should be in form hello_world
@@ -56,6 +83,18 @@ module CommonCore
         end
       end
 
+      auth_assoc = @auth.gsub("current_","")
+      auth_assoc_field = auth_assoc + "_id"
+
+
+      begin
+        @columns = object.columns.map(&:name).map(&:to_sym).reject{|field| field==:updated_at ||
+            field==:created_at || field==:id ||  field == auth_assoc_field.to_sym }
+      rescue StandardError => e
+        puts "Ooops... it looks like is an object for #{class_name}. Please create the database table with fields first. "
+        exit
+      end
+
       flags = meta_args[1]
       flags.each do |f|
         case (f)
@@ -107,6 +146,8 @@ module CommonCore
       unless @no_specs
         template "controller_spec.rb", File.join("spec/controllers#{namespace_with_dash}", "#{plural}_controller_spec.rb")
       end
+
+      template "_errors.haml", File.join("app/views#{namespace_with_dash}", "_errors.haml")
     end
 
     def list_column_headings
@@ -323,9 +364,7 @@ module CommonCore
 
     def all_form_fields
       res = @columns.map { |col|
-        # if eval("#{singular_class}.columns_hash['#{col}']").nil?
-        #   byebug
-        # end
+
 
         type = eval("#{singular_class}.columns_hash['#{col}']").type
         limit = eval("#{singular_class}.columns_hash['#{col}']").limit
@@ -335,47 +374,77 @@ module CommonCore
         when :integer
           # look for a belongs_to on this object
           if col.to_s.ends_with?("_id")
+            # guess the association name label
+
 
             assoc_name = col.to_s.gsub("_id","")
-            assoc = eval("#{singular_class}.reflect_on_association(':#{assoc_name}')")
+            assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
+            if assoc.nil?
+              puts "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
+              exit
+            end
+
+            if assoc.active_record.column_names.include?("name")
+              display_column = "name"
+            elsif assoc.active_record.column_names.include?("to_label")
+              display_column = "to_label"
+            elsif assoc.active_record.column_names.include?("full_name")
+              display_column = "full_name"
+            elsif assoc.active_record.column_names.include?("display_name")
+              display_column = "display_name"
+            elsif assoc.active_record.column_names.include?("email")
+              display_column = "email"
+            end
+
             ".row
-  .form-group.col-md-4
-    = f.collection_select(:#{col.to_s}, #{assoc_name.titleize}.all, :id, :to_label, {:prompt => true}, class: 'form-control')
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{assoc_name.to_s})}\"}
+    = f.collection_select(:#{col.to_s}, #{assoc_name.titleize}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control')
     %label.small.form-text.text-muted
       #{col.to_s.humanize}"
 
           else
             ".row
-  .form-group.col-md-4
-    = f.text_field :#{col.to_s}, class: 'form-control', size: 4, type: 'number'
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = f.text_field :#{col.to_s}, value: @#{singular}.#{col.to_s}, class: 'form-control', size: 4, type: 'number'
     %label.form-text
       #{col.to_s.humanize}\n"
           end
         when :string
-          width = (limit && limit < 40) ? limit : (40)
-          ".row
-  .form-group.col-md-4
-    = f.text_field :#{col.to_s}, size: #{width}, class: 'form-control'
-    %label.form-text
-      #{col.to_s.humanize}\n"
+          limit ||= 256
+          if limit < 256
+            field_output(col, nil, limit)
+          else
+            text_area_output(col, limit)
+          end
+
         when :text
-          # width = (limit && limit < 40) ? limit :  (40)
-          ".row
-  .form-group.col-md-4
-    = f.text_area :#{col.to_s}, rows: 4, cols: 40, class: 'form-control'
-    %label.form-text
-      #{col.humanize}\n"
-          when :datetime
-            ".row
-  .form-group.col-md-4
-    = f.text_field :#{col.to_s}, class: 'form-control', type: 'datetime-local'
-    %label.form-text
-      #{col.to_s.humanize}\n"
+          limit ||= 256
+          if limit < 256
+            field_output(col, nil, limit)
+          else
+            text_area_output(col, limit)
           end
-      }.join("\n")
+
+        when :datetime
+          ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = datetime_field_localized(f, :#{col.to_s}, @#{singular}.#{col.to_s}, '#{col.to_s.humanize}', #{@auth ? @auth+'.timezone' : 'nil'})"
+        when :date
+        ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = date_field_localized(f, :#{col.to_s}, @#{singular}.#{col.to_s}, '#{col.to_s.humanize}', #{@auth ? @auth+'.timezone' : 'nil'})"
+        when :time
+          ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    = time_field_localized(f, :#{col.to_s}, @#{singular}.#{col.to_s}, '#{col.to_s.humanize}', #{@auth ? @auth+'.timezone' : 'nil'})"
+
+      end
+
+    }.join("\n")
       return res
     end
 
+
     def all_line_fields
       res = "%tr{'data-id': #{singular}.id, 'data-edit': 'false'}\n"
 
@@ -395,11 +464,26 @@ module CommonCore
             assoc = eval("#{singular_class}.reflect_on_association(:#{assoc_name})")
 
             if assoc.nil?
-              raise "can't find assocation for #{assoc_name}"
+              puts "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
+              exit
+            end
+
+            if assoc.active_record.column_names.include?("name")
+              display_column = "name"
+            elsif assoc.active_record.column_names.include?("to_label")
+              display_column = "to_label"
+            elsif assoc.active_record.column_names.include?("full_name")
+              display_column = "full_name"
+            elsif assoc.active_record.column_names.include?("display_name")
+              display_column = "display_name"
+            elsif assoc.active_record.column_names.include?("email")
+              display_column = "email"
+            else
+              puts "cant find any column to use as label for #{assoc.name.to_s}; any of name, to_labe, full_name, display_name, or email"
             end
 
             "  %td
-    = #{singular}.#{assoc.name.to_s}.to_label"
+    = #{singular}.#{assoc.name.to_s}.#{display_column}"
 
           else
             "  %td
@@ -414,13 +498,43 @@ module CommonCore
     = #{singular}.#{col}"
         when :datetime
           "  %td
-    = #{singular}.#{col}"
+    - unless #{singular}.#{col}.nil?
+      = #{singular}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone)
+    - else
+      %span.alert-danger
+        MISSING
+"
+        when :date
+          "  %td
+    - unless #{singular}.#{col}.nil?
+      = #{singular}.#{col}
+    - else
+      %span.alert-danger
+        MISSING
+"
+        when :time
+          "  %td
+    - unless #{singular}.#{col}.nil?
+      = #{singular}.#{col}.in_time_zone(current_timezone).strftime('%l:%M %p ') + timezonize(current_timezone)
+    - else
+      %span.alert-danger
+        MISSING
+"
+
         end
       }.join("\n")
       return res
     end
 
 
+    def controller_descends_from
+      if defined?(@namespace.titlecase + "::BaseController")
+        @namespace.titlecase + "::BaseController"
+      else
+        "ApplicationController"
+      end
+    end
+
 
     private # thor does something fancy like sending the class all of its own methods during some strange run sequence
     # does not like public methods

data/lib/generators/common_core/templates/_errors.haml

@@ -0,0 +1,5 @@
+- if resource.errors.any?
+  #error_explanation
+    - resource.errors.full_messages.each do |message|
+      %div.alert.alert-danger
+        = message

data/lib/generators/common_core/templates/_flash_notices.haml

@@ -0,0 +1,7 @@
+- unless notice.nil?
+  %div.alert.alert-notice.alert-dismissible
+    = notice
+
+- unless alert.nil?
+  %div.alert.alert-danger.alert-dismissible
+    = alert

data/lib/generators/common_core/templates/_line.haml

@@ -1,3 +1,5 @@
 <%= all_line_fields %>
   %td
-    = link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_singular %>(<%= singular %>), remote: true , disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary pull-right "
+    = link_to "Delete <i class='fa fa-1x fa-remove'></i>".html_safe, <%= path_helper_singular %>(<%= singular %>), remote: true ,method: :delete,  disable_with: "Loading...", class: "delete-<%= singular %>-button btn btn-primary "
+    &nbsp;
+    = link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_singular %>(<%= singular %>), remote: true , disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary "

data/lib/generators/common_core/templates/all.haml

@@ -1,4 +1,5 @@
 .container-fluid
   .row
     .col-md-12
-      = render partial: "<%= namespace_with_trailing_dash %><%= plural %>/list", locals: {<%= plural %>: <%= all_objects_root %>.order("created_at DESC").page(1)}
+      .<%= singular %>-list
+        = render partial: "<%= namespace_with_trailing_dash %><%= plural %>/list", locals: {<%= plural %>: <%= all_objects_root %>.order("created_at DESC").page(1)}

data/lib/generators/common_core/templates/common_core.js

@@ -1,16 +1,31 @@
 
 require("jquery")
-console.log("loading common core...")
+// console.log("loading common core...")
+
+// require("jstimezonedetect/dist/jstz.min")
+// var JSTZ = require('jstimezonedetect');
+
+
 
-$(function(){
-  // always pass csrf tokens on ajax calls
-  $.ajaxSetup({
-    headers: { 'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content') }
-  });
-});
 
 $(document).on('turbolinks:load', function() {
+
   $(document).ready(() => {
+    var user_timezone = '';
+    try {user_timezone = JSTZ.determine().name();} catch(e){}
+    // always pass csrf tokens on ajax calls
+
+
+    // $.ajaxSetup({
+    //   beforeSend: (xhr) => {
+    //
+    //     xhr.setRequestHeader('X-CSRF-Token',  $('meta[name="csrf-token"]').attr('content'))
+    //     xhr.setRequestHeader( 'X-User-Timezone', user_timezone)
+    //
+    //
+    //   }
+    // })
+
     $("body").on("click", "[data-role='close-button']", (event) => {
       var form_name;
       form_name = $(event.currentTarget).data("name");
@@ -30,7 +45,7 @@ $(document).on('turbolinks:load', function() {
         $form.find("i").remove()
       }
     })
-  })
+  });
 });
 
 

data/lib/generators/common_core/templates/common_core.scss

@@ -0,0 +1,5 @@
+[data-role='close-button'] {
+  position: absolute;
+  top: 0;
+  right: 0;
+}

data/lib/generators/common_core/templates/controller.rb

@@ -1,4 +1,4 @@
-class <%= controller_class_name %> < ApplicationController
+class <%= controller_class_name %> < <%= controller_descends_from %>
 <% unless @auth_identifier.nil? %>
   before_action :authenticate_<%= auth_identifier %>!
 
@@ -6,7 +6,7 @@ class <%= controller_class_name %> < ApplicationController
 <% if any_nested? %> <% @nested_args.each do |arg| %>
   before_action :load_<%= arg %><% end %> <% end %>
   before_action :load_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
-
+  helper :common_core
 
   <% if any_nested? %><% nest_chain = [] %> <% @nested_args.each do |arg| %>
       <% if nest_chain.empty?
@@ -40,14 +40,14 @@ class <%= controller_class_name %> < ApplicationController
   end
 
   def create
-    @<%=singular_name %> = <%=class_name %>.create(<%=singular_name %>_params<% if !create_merge_params.empty? %>.merge!(<%= create_merge_params %>)<%end%>)
+    modified_params = modify_date_inputs_on_params(<%=singular_name %>_params.dup<% if !create_merge_params.empty? %>.merge!(<%= create_merge_params %>)<%end%> , <%= @auth ? @auth : "nil" %>)
+    @<%=singular_name %> = <%=class_name %>.create(modified_params)
     respond_to do |format|
       if @<%= singular_name %>.save
-        format.js
       else
         flash[:alert] = "Oops, your <%=singular_name %> could not be saved."
-        format.js
       end
+      format.js
     end
   end
 
@@ -65,7 +65,7 @@ class <%= controller_class_name %> < ApplicationController
 
   def update
     respond_to do |format|
-      if !@<%=singular_name %>.update(<%= singular %>_params)
+      if !@<%=singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params ))
         flash[:alert] = "<%=singular_name.titlecase %> could not be saved"
       end
       format.js {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_core_js
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
@@ -142,7 +142,7 @@ files:
 - app/assets/stylesheets/common_core_js/application.css
 - app/assets/stylesheets/common_core_js/common_core.scss
 - app/controllers/common_core_js/application_controller.rb
-- app/helpers/common_core_js/application_helper.rb
+- app/helpers/common_core_helper.rb
 - app/jobs/common_core_js/application_job.rb
 - app/mailers/common_core_js/application_mailer.rb
 - app/models/common_core_js/application_record.rb
@@ -169,6 +169,8 @@ files:
 - lib/generators/common_core/install_generator.rb
 - lib/generators/common_core/scaffold_generator.rb
 - lib/generators/common_core/templates/_edit.haml
+- lib/generators/common_core/templates/_errors.haml
+- lib/generators/common_core/templates/_flash_notices.haml
 - lib/generators/common_core/templates/_form.haml
 - lib/generators/common_core/templates/_line.haml
 - lib/generators/common_core/templates/_list.haml

data/app/helpers/common_core_js/application_helper.rb

@@ -1,4 +0,0 @@
-module CommonCoreJs
-  module ApplicationHelper
-  end
-end