common_core_js 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68b5a9a869b6a0f94746461670598d9cb5bedb33990863601ef3ecdf220fbdc9
-  data.tar.gz: 32503cb59ddee608eeae10c6ff8f75c044550c400d28bec85b0b0bb97170eea8
+  metadata.gz: 0c741cb686a2b2cdbaf0c78412ef5733e82e048d6cd94507675a14288464b617
+  data.tar.gz: fb86d6cabe810f86faca72ecc1a7cf6045bb24df6fd6124de82289ec70d4386c
 SHA512:
-  metadata.gz: 80e02dc262dc51c695434596729c6fb3521ceb6399446a1ddfb0c3e331c5a34c0f91e533c9e27ce2135e1ccb5da5101ed981873ef26beb97f9b56e88545de8e1
-  data.tar.gz: 21be6527906de8b37ce77b497a10e3c2edbdd1fb5f94aab9ba250820ef58735a4933ae119c2f46aab956ed49724573e84c51c51e9d83e4f3e4434e238796b4db
+  metadata.gz: aff7ba81411119d30bc13f18b0fcbdc5bf2d27353758d8795d1d8184a766636fa47faae4f3a9eee294e51ff6ed4a148817065ff51d8f0eef4407bee162e8a971
+  data.tar.gz: 0b863a346bc88ff5e12f3a942183f8a9f37c527721545a8a353cd16d957d24a176ce0f9751f333906c208b5a0484b367b1cc21096391c5db10e15ae825c76ec3

data/lib/common_core_js/version.rb

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

data/lib/generators/common_core/scaffold_generator.rb

@@ -410,16 +410,16 @@ module CommonCore
       #{col.to_s.humanize}\n"
           end
         when :string
-          limit ||= 40
-          if limit < 50
+          limit ||= 256
+          if limit < 256
             field_output(col, nil, limit)
           else
             text_area_output(col, limit)
           end
 
         when :text
-          limit ||= 40
-          if limit < 50
+          limit ||= 256
+          if limit < 256
             field_output(col, nil, limit)
           else
             text_area_output(col, limit)
@@ -428,15 +428,15 @@ module CommonCore
         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}.timezone)"
+    = 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}.timezone)"
+    = 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}.timezone)"
+    = time_field_localized(f, :#{col.to_s}, @#{singular}.#{col.to_s}, '#{col.to_s.humanize}', #{@auth ? @auth+'.timezone' : 'nil'})"
 
       end
 
@@ -499,7 +499,7 @@ module CommonCore
         when :datetime
           "  %td
     - unless #{singular}.#{col}.nil?
-      = #{singular}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + human_timezone(Time.now, current_timezone)
+      = #{singular}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ') + timezonize(current_timezone)
     - else
       %span.alert-danger
         MISSING
@@ -515,7 +515,7 @@ module CommonCore
         when :time
           "  %td
     - unless #{singular}.#{col}.nil?
-      = #{singular}.#{col}.in_time_zone(current_timezone).strftime('%l:%M %p ') + human_timezone(Time.now, current_timezone)
+      = #{singular}.#{col}.in_time_zone(current_timezone).strftime('%l:%M %p ') + timezonize(current_timezone)
     - else
       %span.alert-danger
         MISSING
@@ -527,6 +527,14 @@ module CommonCore
     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/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?
@@ -22,7 +22,6 @@ class <%= controller_class_name %> < ApplicationController
   def load_<%= singular_name %>
     @<%= singular_name %> = <%= object_scope %>.find(params[:id])
   end
-  include CommonCoreJs::ControllerHelpers
 
   def index
     @<%= plural_name %> = <%= object_scope %><% if model_has_strings? %>.where(<%=class_name %>.arel_table[:email].matches("%#{@__general_string}%"))<% end %>.page(params[:page])
@@ -41,7 +40,7 @@ class <%= controller_class_name %> < ApplicationController
   end
 
   def create
-    modified_params = modify_date_inputs_on_params(<%=singular_name %>_params.dup<% if !create_merge_params.empty? %>.merge!(<%= create_merge_params %><%end%> ), <%=@auth%>)
+    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
@@ -66,7 +65,7 @@ class <%= controller_class_name %> < ApplicationController
 
   def update
     respond_to do |format|
-      if !@<%=singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params, <%=@auth%> ))
+      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.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt