common_core_js 0.3.6 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c741cb686a2b2cdbaf0c78412ef5733e82e048d6cd94507675a14288464b617
-  data.tar.gz: fb86d6cabe810f86faca72ecc1a7cf6045bb24df6fd6124de82289ec70d4386c
+  metadata.gz: 5b509c4f6a9d3e9948e5a49a3ea649cb693e75ac47ff43f40cc7bf90e3c96590
+  data.tar.gz: d8336db5c37a0db6d82cd7c926d9d6bd9f1b5cdd97c46e18d35ce30a0126dc77
 SHA512:
-  metadata.gz: aff7ba81411119d30bc13f18b0fcbdc5bf2d27353758d8795d1d8184a766636fa47faae4f3a9eee294e51ff6ed4a148817065ff51d8f0eef4407bee162e8a971
-  data.tar.gz: 0b863a346bc88ff5e12f3a942183f8a9f37c527721545a8a353cd16d957d24a176ce0f9751f333906c208b5a0484b367b1cc21096391c5db10e15ae825c76ec3
+  metadata.gz: a49c509c20a0e82c30dbadd3ea700a8eb341e943f6d3347898d09ff3bd0ca29e656302265d9c02784ef0948e7a10bf9a1fd0e31b35dfec52704ea73325bfa30e
+  data.tar.gz: 2d882167e819535280cc20a4bb7ba47c3c35c2a179f4e2ac0170f36f8547a78b364d3cccb8a303a72b117ddc3ee4d06d4f0f08a17eb59b3009917035b4e0dbf8

data/FUNDING.yml

@@ -0,0 +1,4 @@
+# repo:     your_github_handle/foobar
+# filename: FUNDING.YML
+
+github: [jasonfb]

data/README.md

@@ -8,25 +8,32 @@ Yes, it's opinionated. Yes, it's metaprogramming. A lot of metaprogramming. Ruby
 No, I would not use this to build an intricate app. Yes, it's a great tool for prototyping. Yes, I think prototyping is a lost art. 
 
 
-= THE SALES PITCH:
+## THE SALES PITCH:
 * Build plug-and-play scaffolding mixing HAML with jQuery-based Javascript
 * Automatically Reads Your Models (make them before building your scaffolding!)
-* Excellent for CRUD, lists with pagination, searching, sorting.
+* Excellent for CRUD, lists with pagination, searching, ~~sorting.~~
 * Wonderful for prototyping.
 * Plays nicely with Devise, Kaminari, Haml-Rails, Rspec.
-* Create specs autoamatically along with the controllers.
+* Create specs automatically along with the controllers.
 * Nest your routes model-by-model for built-in poor man's authentication
 * Throw the scaffolding away when your app is ready to graduate to its next phase.
 
+## THE BLOG POST
 
-= HOW EASY?
+It's really easy to get started by following along with this blog post that creates three simple tables (User, Event, and Format).
+
+Feel free to build your own tables when you get to the sections for building the 'Event' scaffold:
+
+https://blog.jasonfleetwoodboldt.com/common-core-js
+
+## HOW EASY?
 
 
 ```
 rails generate common_core:scaffold Thing 
 ```
 
-= TO INSTALL
+## TO INSTALL
 
 - Add common_core_js to your Gemfile
 

data/app/helpers/common_core_helper.rb

@@ -7,7 +7,6 @@ module CommonCoreHelper
 
 
     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')
@@ -22,6 +21,7 @@ module CommonCoreHelper
 
 
     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')
@@ -51,7 +51,7 @@ module CommonCoreHelper
         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
+          Time.now.in_time_zone(current_user.timezone.to_i).strftime("%z").to_i/100
         else
           Time.now.strftime("%z").to_i/100
         end
@@ -62,7 +62,6 @@ module CommonCoreHelper
 
 
     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

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.4.1'
 end

data/lib/generators/common_core/scaffold_generator.rb

@@ -84,16 +84,9 @@ module CommonCore
       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
+      @no_delete = false
+      @no_create = false
 
       flags = meta_args[1]
       flags.each do |f|
@@ -106,6 +99,10 @@ module CommonCore
           @specs_only = true
         when "--no-specs"
           @no_specs = true
+        when "--no-delete"
+          @no_delete = true
+        when "--no-create"
+          @no_create = true
         end
       end
 
@@ -114,18 +111,56 @@ module CommonCore
         exit
       end
 
+
+      # only used for the before_action
       if @auth_identifier.nil? && !@auth.nil?
         @auth_identifier = @auth.gsub("current_", "")
       end
 
+      # when in self auth, the object is the same as the authenticated object
+      if @auth && auth_identifier == @singular
+        @self_auth = true
+      end
+
       if !@nest.nil?
         @nested_args = @nest.split("/")
-
         @nested_args_plural = {}
         @nested_args.each do |a|
           @nested_args_plural[a] = a + "s"
         end
       end
+
+      # the @object_owner will always be object that will 'own' the object
+      # for new and create
+
+      if @auth && ! @self_auth && @nested_args.none?
+         @object_owner_sym = @auth.gsub("current_", "").to_sym
+         @object_owner_eval = @auth
+      else
+        @object_owner_sym = @nested_args.last.to_sym
+        @object_owner_eval = "@#{@nested_args.last}"
+      end
+
+
+
+      # create the columns
+      auth_assoc_field = auth_assoc + "_id"
+
+      ownership_field = eval("#{singular_class}.reflect_on_association(:#{@object_owner_sym})").name.to_s + "_id"
+
+
+      exclude_fields = [auth_assoc_field.to_sym, ownership_field.to_sym, :id, :created_at, :updated_at, :encrypted_password, :reset_password_token,
+                        :reset_password_sent_at, :remember_created_at, :confirmation_token, :confirmed_at,
+                        :confirmation_sent_at, :unconfirmed_email]
+      begin
+        @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
+      end
+
+
+
     end
 
     def formats
@@ -141,6 +176,9 @@ module CommonCore
 
       unless @specs_only
         template "controller.rb", File.join("app/controllers#{namespace_with_dash}", "#{plural}_controller.rb")
+        if @namespace &&  defined?(controller_descends_from) == nil
+          template "base_controller.rb", File.join("app/controllers#{namespace_with_dash}", "base_controller.rb")
+        end
       end
 
       unless @no_specs
@@ -223,6 +261,14 @@ module CommonCore
     end
 
 
+    def path_helper_full
+      "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{singular}_path"
+    end
+
+    def path_helper_args
+      [(@nested_args if @nested_args.any?).collect{|a| "@#{a}"} , singular].join(",")
+    end
+
     def path_helper_singular
       "#{@namespace+"_" if @namespace}#{(@nested_args.join("_") + "_" if @nested_args.any?)}#{singular}_path"
     end
@@ -252,7 +298,7 @@ module CommonCore
     end
 
     def nested_arity_for_path
-      @nested_args.join(", ") #metaprgramming into arity for the Rails path helper
+      [@nested_args[0..-1].collect{|a| "@#{a}"}].join(", ") #metaprgramming into arity for the Rails path helper
     end
 
     def object_scope
@@ -270,7 +316,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}"
@@ -285,8 +333,12 @@ module CommonCore
     end
 
     def all_objects_variable
+
       # needs the authenticated root user
-      "#{@auth}.#{ @nested_args.map{|a| "#{@nested_args_plural[a]}.find(@#{a})"}.join('.') + "." if @nested_args.any?}#{plural}"
+      # "#{@auth}.#{ @nested_args.map{|a| "#{@nested_args_plural[a]}.find(@#{a})"}.join('.') + "." if @nested_args.any?}#{plural}"
+
+      all_objects_root + ".page(params[:page])"
+
     end
 
     def auth_object
@@ -344,15 +396,6 @@ module CommonCore
       :erb
     end
 
-
-    def create_merge_params
-      if @auth
-        "#{@auth_identifier}: #{@auth}"
-      else
-        ""
-      end
-    end
-
     def model_has_strings?
       false
     end
@@ -383,6 +426,7 @@ module CommonCore
               puts "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
               exit
             end
+            assoc_class_name = eval("#{singular_class}.reflect_on_association(:#{assoc_name})").class_name
 
             if assoc.active_record.column_names.include?("name")
               display_column = "name"
@@ -394,11 +438,14 @@ 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
   %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')
+    = f.collection_select(:#{col.to_s}, #{assoc_class_name}.all, :id, :#{display_column}, {prompt: true, selected: @#{singular}.#{col.to_s} }, class: 'form-control')
     %label.small.form-text.text-muted
       #{col.to_s.humanize}"
 
@@ -411,7 +458,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 +466,7 @@ module CommonCore
 
         when :text
           limit ||= 256
-          if limit < 256
+          if limit <= 256
             field_output(col, nil, limit)
           else
             text_area_output(col, limit)
@@ -428,16 +475,27 @@ 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 ? @auth+'.timezone' : 'nil'})"
+    = 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'})"
+    = 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'})"
+    = time_field_localized(f, :#{col.to_s}, #{singular}.#{col.to_s}, '#{col.to_s.humanize}', #{@auth ? @auth+'.timezone' : 'nil'})"
+        when :boolean
+          ".row
+  %div{class: \"form-group col-md-4 \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\"}
+    %span
+      #{col.to_s.humanize}
+    = f.radio_button(:#{col.to_s},  '0', checked: #{singular}.#{col.to_s}  ? '' : 'checked')
+    = f.label(:#{col.to_s}, value: 'No', for: '#{singular}_#{col.to_s}_0')
+
+    = f.radio_button(:#{col.to_s}, '1',  checked: #{singular}.#{col.to_s}  ? 'checked' : '')
+    = f.label(:#{col.to_s}, value: 'Yes', for: '#{singular}_#{col.to_s}_1')
 
+      "
       end
 
     }.join("\n")
@@ -483,7 +541,7 @@ module CommonCore
             end
 
             "  %td
-    = #{singular}.#{assoc.name.to_s}.#{display_column}"
+    = #{singular}.#{assoc.name.to_s}.try(:#{display_column}) || '<span class=\"content alert-danger\">MISSING</span>'.html_safe"
 
           else
             "  %td
@@ -520,7 +578,16 @@ module CommonCore
       %span.alert-danger
         MISSING
 "
-
+        when :boolean
+          "  %td
+    - if #{singular}.#{col}.nil?
+      %span.alert-danger
+        MISSING
+    - elsif #{singular}.#{col}
+      YES
+    - else
+      NO
+"
         end
       }.join("\n")
       return res
@@ -536,6 +603,17 @@ module CommonCore
     end
 
 
+    def destroy_action
+      return false if @self_auth
+      return !@no_delete
+    end
+
+    def create_action
+      return false if @self_auth
+      return !@no_create
+    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
-    = 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 "
+    <% if destroy_action %>
+    = link_to "Delete <i class='fa fa-1x fa-remove'></i>".html_safe, <%= path_helper_full %>(<%= path_helper_args %>), remote: true, method: :delete, data: {confirm: 'Are you sure?'},  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 "
+    = link_to "Edit <i class='fa fa-1x fa-list-alt'></i>".html_safe, edit_<%= path_helper_full %>(<%= path_helper_args %>), 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

@@ -1,5 +1,5 @@
 class <%= controller_class_name %> < <%= controller_descends_from %>
-<% unless @auth_identifier.nil? %>
+<% unless @auth_identifier == '' %>
   before_action :authenticate_<%= auth_identifier %>!
 
 <% end %>
@@ -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,28 +20,37 @@ 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
-    @<%= singular_name %> = <%= class_name  %>.new(<%= create_merge_params %>)
+<% if create_action %>  def new
+    @<%= singular_name %> = <%= class_name  %>.new(<%= @object_owner_sym %>: <%= @object_owner_eval %>)
     respond_to do |format|
       format.js
     end
   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 ? @auth : "nil" %>)
+    modified_params = modify_date_inputs_on_params(<%=singular_name %>_params.dup<% if !@object_owner_sym.empty? %>.merge!(<%= @object_owner_sym %>: <%= @object_owner_eval %> )<% end %>, <%= @auth %>)
     @<%=singular_name %> = <%=class_name %>.create(modified_params)
     respond_to do |format|
       if @<%= singular_name %>.save
@@ -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 %>  ))
         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 %> )

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

@@ -1 +1 @@
-<%%= render partial: 'common/common_create', locals: {object: @<%= singular %>, singular: "<%= singular %>", plural: "<%= plural %>"} %>
+<%%= render partial: 'common/common_create', locals: {object: @<%= singular %>, singular: "<%= singular %>", plural: "<%= plural %>"<%= ", " + nested_assignments if nested_assignments %>} %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: common_core_js
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.1
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
@@ -131,6 +131,7 @@ files:
 - ".generators"
 - ".gitignore"
 - ".rakeTasks"
+- FUNDING.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -143,6 +144,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 +178,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