common_core_js 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2219c80f29355076e17de37d99966e7b491aa09f255a911ec907b32a983bfa1c
-  data.tar.gz: 00dab2e16fc5145aff949648dcdddd60993aa99862b18319117d521c9ab78b16
+  metadata.gz: b3c68ef2ddc0f4e98ca5b54d0c646a918b2f70d091fe89db9951a61879af34d2
+  data.tar.gz: 5ea645a245a197d42dabf6f697a7f94e5227d6c8416da47d8dfe875fdc28cbea
 SHA512:
-  metadata.gz: 731c8e6ef809fcade1810f67a389606f0abb62a58fe54dfcb8baa6a6b741986511cc0df2a180f390a4b55c3aee52682b91a2a64902629ac2b4fef57ef7d737a3
-  data.tar.gz: 5a34083277277efbf9b4ef9ed7a949156489d4fbc71a14b00105ff0a169ff9a0b469e6b2ceb90a8727d86fc6f8a3ff2ac3291aeac9aaf45f650fd098fb1e9b50
+  metadata.gz: 7490de5c8f29a6a80960c50ecbb37a02122cafcc96b345c200f1cdc4cb3cf5f50f15e2fb4609f6f4a920b814c9fb123b9024a8d226a1e0f225bebe5246fe9cbb
+  data.tar.gz: fccfc40f5851a9a0bffdc5410085073afa8798320b4abf7a770c1dd7e3070ff871e341ba613f67b7afed11ea2a69c9c685dd130b41bc301ca89386490c5dd77a

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/lib/common_core_js/version.rb

@@ -1,3 +1,3 @@
 module CommonCoreJs
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 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
+  .form-group.col-md-4
+    = 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
+  .form-group.col-md-4
+    = 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)
@@ -323,9 +362,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,40 +372,61 @@ 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')
+    = 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'
+    = 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 ||= 40
+          if limit < 50
+            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
+          limit ||= 40
+          if limit < 50
+            field_output(col, nil, limit)
+          else
+            text_area_output(col, limit)
+          end
+
+        when :datetime
             ".row
   .form-group.col-md-4
-    = f.text_field :#{col.to_s}, class: 'form-control', type: 'datetime-local'
+    = f.text_field :#{col.to_s}, value: @#{singular}.#{col.to_s}, class: 'form-control', type: 'datetime-local'
     %label.form-text
       #{col.to_s.humanize}\n"
           end
@@ -376,6 +434,7 @@ module CommonCore
       return res
     end
 
+
     def all_line_fields
       res = "%tr{'data-id': #{singular}.id, 'data-edit': 'false'}\n"
 
@@ -395,7 +454,8 @@ 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
 
             "  %td

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.2
 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_js/application_helper.rb
+- app/helpers/common_core_js/generator_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