common_core_js 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c741cb686a2b2cdbaf0c78412ef5733e82e048d6cd94507675a14288464b617
-  data.tar.gz: fb86d6cabe810f86faca72ecc1a7cf6045bb24df6fd6124de82289ec70d4386c
+  metadata.gz: 5bd570ce32ada5b0551a77526d1b25e82f9b10a4ce9199e9abc60c3256a0c824
+  data.tar.gz: 39d7097d4e3daa434959ec9c72d93f83bee971d715f7ccde0fcb791332b8f490
 SHA512:
-  metadata.gz: aff7ba81411119d30bc13f18b0fcbdc5bf2d27353758d8795d1d8184a766636fa47faae4f3a9eee294e51ff6ed4a148817065ff51d8f0eef4407bee162e8a971
-  data.tar.gz: 0b863a346bc88ff5e12f3a942183f8a9f37c527721545a8a353cd16d957d24a176ce0f9751f333906c208b5a0484b367b1cc21096391c5db10e15ae825c76ec3
+  metadata.gz: 344db104a6bcca04942313947217d71f786698f6656590b5f49f03974046a557e8de438c3ba9146c1f2041996926341942f84ef3ff2b947883386e6c7ab2e9c0
+  data.tar.gz: 5c51d14d8d1055b3652ce5e2351582951a60b0d5cb78b1b91153cbf60aab5e141579f177c4de169dd5de3d9cc059c4795c6b45d3024c9d720dcd361ae37814b9

data/app/helpers/common_core_js/controller_helper.rb

@@ -0,0 +1,21 @@
+module CommonCoreJs
+  module ControllerHelper
+    def modify_date_inputs_on_params(modified_params)
+      use_timezone = current_account.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.rb

@@ -8,7 +8,7 @@ module CommonCoreJs
   # Your code goes here...
   #
   module ControllerHelpers
-    def modify_date_inputs_on_params(modified_params)
+    def modify_date_inputs_on_params(modified_params, authenticated_user = nil)
       use_timezone = authenticated_user.timezone || Time.now.strftime("%z")
 
       modified_params = modified_params.tap do |params|

data/lib/common_core_js/version.rb

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

data/lib/generators/common_core/scaffold_generator.rb

@@ -83,13 +83,17 @@ module CommonCore
         end
       end
 
+
+
       auth_assoc = @auth.gsub("current_","")
       auth_assoc_field = auth_assoc + "_id"
 
 
+
+      exclude_fields = [auth_assoc_field.to_sym, :id, :created_at, :updated_at, :encrypted_password, :reset_password_token,
+                        :reset_password_sent_at, :remember_created_at]
       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 }
+        @columns = object.columns.map(&:name).map(&:to_sym).reject{|field| exclude_fields.include?(field) }
       rescue StandardError => e
         puts "Ooops... it looks like is an object for #{class_name}. Please create the database table with fields first. "
         exit
@@ -118,6 +122,11 @@ module CommonCore
         @auth_identifier = @auth.gsub("current_", "")
       end
 
+
+      if auth_identifier == @singular
+        @self_auth = true
+      end
+
       if !@nest.nil?
         @nested_args = @nest.split("/")
 
@@ -141,6 +150,9 @@ module CommonCore
 
       unless @specs_only
         template "controller.rb", File.join("app/controllers#{namespace_with_dash}", "#{plural}_controller.rb")
+        if @namespace
+          template "base_controller.rb", File.join("app/controllers#{namespace_with_dash}", "base_controller.rb")
+        end
       end
 
       unless @no_specs
@@ -270,7 +282,9 @@ module CommonCore
 
     def all_objects_root
       if @auth
-        if @nested_args.none?
+        if @self_auth
+          @singular_class + ".where(id: #{@auth}.id)"
+        elsif @nested_args.none?
           @auth + ".#{plural}"
         else
           "@" + @nested_args.last + ".#{plural}"
@@ -346,7 +360,7 @@ module CommonCore
 
 
     def create_merge_params
-      if @auth
+      if @auth && ! @self_auth
         "#{@auth_identifier}: #{@auth}"
       else
         ""
@@ -394,6 +408,8 @@ module CommonCore
               display_column = "display_name"
             elsif assoc.active_record.column_names.include?("email")
               display_column = "email"
+            else
+              puts "Can't find a display_column on {singular_class} object"
             end
 
             ".row
@@ -411,7 +427,7 @@ module CommonCore
           end
         when :string
           limit ||= 256
-          if limit < 256
+          if limit <= 256
             field_output(col, nil, limit)
           else
             text_area_output(col, limit)
@@ -419,7 +435,7 @@ module CommonCore
 
         when :text
           limit ||= 256
-          if limit < 256
+          if limit <= 256
             field_output(col, nil, limit)
           else
             text_area_output(col, limit)
@@ -536,6 +552,17 @@ module CommonCore
     end
 
 
+    def destroy_action
+      return false if @self_auth
+      return true
+    end
+
+    def create_action
+      return false if @self_auth
+      return true
+    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/_line.haml

@@ -1,5 +1,7 @@
 <%= all_line_fields %>
   %td
+    <% if destroy_action %>
     = 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 "
+    <% end %>
     &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/_list.haml

@@ -1,9 +1,9 @@
 
+<% if create_action %>
 = link_to "New <%= singular.gsub('_',' ') %>", new_<%= path_helper_singular %>(<%= nested_arity_for_path %>), disable_with: "Loading...", remote: true, class: "new-<%= singular %>-button btn btn-primary pull-right"
-
 .clearfix
 .new-<%= singular %>-form{style: "display: none; position: relative;"}
-
+<% end %>
 
 
 %table.table.table-striped.<%= singular %>-table

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

@@ -0,0 +1,3 @@
+class <%= controller_descends_from %> < ApplicationController
+end
+

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

@@ -7,6 +7,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
   before_action :load_<%= arg %><% end %> <% end %>
   before_action :load_<%= singular_name %>, only: [:show, :edit, :update, :destroy]
   helper :common_core
+  include CommonCoreJs::ControllerHelpers
 
   <% if any_nested? %><% nest_chain = [] %> <% @nested_args.each do |arg| %>
       <% if nest_chain.empty?
@@ -19,20 +20,29 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     @<%= arg %> = <%= this_scope %>.find(params[:<%= arg %>_id])
   end<% end %> <% end %>
 
+
+<% if !@self_auth %>
   def load_<%= singular_name %>
     @<%= singular_name %> = <%= object_scope %>.find(params[:id])
   end
+  <% else %>
+  def load_<%= singular_name %>
+    @<%= singular_name %> = <%= auth_object %>
+  end<% end %>
 
   def index
+<% if !@self_auth %>
     @<%= plural_name %> = <%= object_scope %><% if model_has_strings? %>.where(<%=class_name %>.arel_table[:email].matches("%#{@__general_string}%"))<% end %>.page(params[:page])
-
+    <% else %>
+    @<%= plural_name %> = [<%= auth_object %>]
+    <% end %>
     respond_to do |format|
       format.js<% if @with_index %>
       format.html {render 'all.haml'}<% end %>
     end
   end
 
-  def new
+<% if create_action %>  def new
     @<%= singular_name %> = <%= class_name  %>.new(<%= create_merge_params %>)
     respond_to do |format|
       format.js
@@ -49,7 +59,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       end
       format.js
     end
-  end
+  end<% end %>
 
   def show
     respond_to do |format|
@@ -65,14 +75,14 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
 
   def update
     respond_to do |format|
-      if !@<%=singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params ))
+      if !@<%=singular_name %>.update(modify_date_inputs_on_params(<%= singular %>_params, <%= @auth ? @auth : "nil" %>  ))
         flash[:alert] = "<%=singular_name.titlecase %> could not be saved"
       end
       format.js {}
     end
   end
 
-  def destroy
+<% if destroy_action %>def destroy
     respond_to do |format|
       begin
         @<%=singular_name%>.destroy
@@ -81,7 +91,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       end
       format.js {}
     end
-  end
+  end<% end %>
 
   def <%=singular_name%>_params
     params.require(:<%=singular_name%>).permit( <%= @columns %> )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_core_js
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
@@ -143,6 +143,7 @@ files:
 - app/assets/stylesheets/common_core_js/common_core.scss
 - app/controllers/common_core_js/application_controller.rb
 - app/helpers/common_core_helper.rb
+- app/helpers/common_core_js/controller_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
@@ -176,6 +177,7 @@ files:
 - lib/generators/common_core/templates/_list.haml
 - lib/generators/common_core/templates/_new.haml
 - lib/generators/common_core/templates/all.haml
+- lib/generators/common_core/templates/base_controller.rb
 - lib/generators/common_core/templates/common_core.js
 - lib/generators/common_core/templates/common_core.scss
 - lib/generators/common_core/templates/controller.rb