hot-glue 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59ec85e7253282cf8d83bc7d8137a787ff33cb617aad95f5752efbb6df68acf4
-  data.tar.gz: bdbab52ce54a5c1ed52f03753c01c203cce7109dc58fa73e6b9357deee8c83bc
+  metadata.gz: d747beed420f47b73a42783e6ae92edd8f4508b13c471a7ae7747a1a7eddfe58
+  data.tar.gz: 9feb6afe2493e46d7e4eef0db0c836f3d140e33c20555c5f07e7fbc896fef366
 SHA512:
-  metadata.gz: 995f7a97e1b6f1105b9190a19cc0bfa93ed9490c2080c97332ae745326f1cc86da3e9e0abf401510d926a574686728dc848e155aa7a0f12ac53417147c625185
-  data.tar.gz: b5bda3332c15706e124f577aa77bfaa068d7ad8d45ebe31aacea7cbcf9cb193a20719ff87d8c1b467bfd0162fcbe5ab0e536295849a3f86e30002babe0ad1212
+  metadata.gz: cf3dcb49cf4a37919269ff3812d00668e2739830c6f01b1f3cc86a01abc78c3278214bb27e3c3935cf60e640460482c8b79bc1127263790e349bf82f3ea4b443
+  data.tar.gz: 7b9576bb6ee658ffb2c05cc7a5f0c77383e70964c174e361d993c5f6f4162b94be69452fceed1fdd1988d8876b43c14c7f16b95d564136b9167604e75ee3a287

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.0.5)
+    hot-glue (0.0.7)
       ffaker (~> 2.16)
       haml-rails (~> 2.0)
       kaminari (~> 1.2)

data/README.md

@@ -233,9 +233,21 @@ You don't need this if the pluralized version is just + "s" of the singular vers
 
 By default, all fields are included unless they are on the exclude list. (The default for the exclude list is `id`, `created_at`, and `updated_at`  so you don't need to exclude those-- they are added.)
 
-If you specify an exclude list, those fields + id, created_at, and updated_at will be excluded.
+If you specify an exclude list, those and the default excluded list will be excluded.
 
 
+`rails generate hot_glue:scaffold Account --exclude=password`
+
+(The default excluded list is: :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. If you want to edit any fields with the same name, you must use the include flag instead.)
+
+
+### `--include=`
+(separate field names by COMMA)
+
+You may not specify both include and exclude. If you specify an include list, it will be treated as a whitelist: no fields will be included unless specified on the include list. 
+
+`rails generate hot_glue:scaffold Account --include=first_name,last_name,company_name,created_at,kyc_verified_at`
+
 
 ### `--god` or `--gd`
 
@@ -277,12 +289,17 @@ Omits create action.
 
 Omits delete action. 
 
+### `--big-edit`
+
+If you do not want inline editing of your list items but instead to fall back to old fashioned new page behavior for your edit views, use `--big-edit`.
 
 
 
 # VERSION HISTORY
 
-#### 2021-03-08 - v0.1   - testing, testing, testing
+#### 2021-03-20 - v0.0.7 - adds lots of spec coverage; cleans up generated cruft code on each run;  adds no-delete, no-create; a working --big-edit with basic data-turbo false to disable inline editing
+
+#### 2021-03-06 - v0.0.6 - internal specs test the error catches and cover basic code generation (dummy testing only)
 
 #### 2021-03-01 - v0.0.5 - Validation magic; refactors the options to the correct Rails::Generators syntax
 

data/db/migrate/20210306223300_create_defs.rb

@@ -2,7 +2,7 @@ class CreateDefs < ActiveRecord::Migration[6.1]
   def change
     create_table :defs do |t|
       t.integer :user_id
-
+      t.string :name
       t.timestamps
     end
   end

data/db/schema.rb

@@ -22,6 +22,7 @@ ActiveRecord::Schema.define(version: 2021_03_06_225506) do
 
   create_table "defs", force: :cascade do |t|
     t.integer "user_id"
+    t.string "name"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
   end

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -52,12 +52,15 @@ module HotGlue
     class_option :auth, type: :string, default: nil
     class_option :auth_identifier, type: :string, default: nil
     class_option :exclude, type: :string, default: ""
+    class_option :include, type: :string, default: ""
     class_option :god, type: :boolean, default: false
+    class_option :gd, type: :boolean, default: false # alias for god
     class_option :spacs_only, type: :boolean, default: false
     class_option :no_specs, type: :boolean, default: false
     class_option :no_delete, type: :boolean, default: false
     class_option :no_create, type: :boolean, default: false
     class_option :no_paginate, type: :boolean, default: false
+    class_option :big_edit, type: :boolean, default: false
 
     def initialize(*meta_args) #:nodoc:
       super
@@ -84,13 +87,21 @@ module HotGlue
       @singular_class = @singular.titleize.gsub(" ", "")
       @exclude_fields = []
       @exclude_fields += options['exclude'].split(",").collect(&:to_sym)
+
+      if options['include']
+        @include_fields = []
+        @include_fields += options['include'].split(",").collect(&:to_sym)
+      end
       auth_assoc = @auth.gsub("current_","")
+
       @god = options['god'] || options['gd'] || false
-      @specs_only = options['specs-only'] || false
-      @no_specs = options['no-specs'] || false
-      @no_delete = options['no-delete'] || false
-      @no_create = options['no-create'] || false
-      @no_paginate = options['no-paginate'] || false
+      @specs_only = options['specs_only'] || false
+      @no_specs = options['no_specs'] || false
+      @no_delete = options['no_delete'] || false
+
+      @no_create = options['no_create'] || false
+      @no_paginate = options['no_paginate'] || false
+      @big_edit = options['big_edit']
 
       if @god
         @auth = nil
@@ -144,15 +155,26 @@ module HotGlue
         end
       end
 
-      @exclude_fields.push :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
 
-      @exclude_fields.push(auth_assoc_field.to_sym) if !auth_assoc_field.nil?
-      @exclude_fields.push(ownership_field.to_sym) if !ownership_field.nil?
-      @columns = object.columns.map(&:name).map(&:to_sym).reject{|field| @exclude_fields.include?(field) }
+      if !@include_fields
+        @exclude_fields.push :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
+
+        @exclude_fields.push(auth_assoc_field.to_sym) if !auth_assoc_field.nil?
+        @exclude_fields.push(ownership_field.to_sym) if !ownership_field.nil?
+
+
+        @columns = object.columns.map(&:name).map(&:to_sym).reject{|field| @exclude_fields.include?(field) }
+
+      else
+        @columns = object.columns.map(&:name).map(&:to_sym).reject{|field| !@include_fields.include?(field) }
+
+      end
+
+
 
       @columns.each do |col|
         if object.columns_hash[col.to_s].type == :integer
@@ -175,6 +197,7 @@ module HotGlue
               exit_message= "*** Oops. on the #{singular_class} object, there doesn't seem to be an association called '#{assoc_name}'"
               raise(HotGlue::Error,exit_message)
             end
+
             assoc_class = eval(assoc.class_name)
             if assoc_class.column_names.include?("name")
               # display_column = "name"
@@ -210,14 +233,16 @@ module HotGlue
       @default_colspan = @columns.size
 
       unless @specs_only
-        template "controller.rb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "#{plural}_controller.rb")
+        template "controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "#{plural}_controller.rb")
         if @namespace &&  defined?(controller_descends_from) == nil
-          template "base_controller.rb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "base_controller.rb")
+          template "base_controller.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}app/controllers#{namespace_with_dash}", "base_controller.rb")
         end
       end
 
       unless @no_specs
-        template "controller_spec.rb", File.join("#{'spec/dummy/' if Rails.env.test?}spec/controllers#{namespace_with_dash}", "#{plural}_controller_spec.rb")
+        template "request_spec.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}spec/request#{namespace_with_dash}", "#{plural}_spec.rb")
+        template "system_spec.rb.erb", File.join("#{'spec/dummy/' if Rails.env.test?}spec/system#{namespace_with_dash}", "#{plural}_spec.rb")
+
       end
 
       template "_errors.haml", File.join("#{'spec/dummy/' if Rails.env.test?}app/views#{namespace_with_dash}", "_errors.haml")
@@ -444,13 +469,21 @@ module HotGlue
     end
 
     def haml_views
-      res =  %w(index edit new _form _new_form _line _list _new_button _show _errors)
+      res =  %w(index edit _form _line _list _show _errors)
+
+      unless @no_create
+        res += %w(new _new_form _new_button)
+      end
 
       res
     end
 
     def turbo_stream_views
-      res = %w(create destroy edit update)
+      res = %w(create  edit update)
+      unless @no_delete
+        res << 'destroy'
+      end
+      res
     end
 
     def handler
@@ -678,18 +711,19 @@ module HotGlue
 
     def display_class
       me = eval(singular_class)
+
       @display_class ||=
-        if me.column_names.include?("name")
+        if me.respond_to?("name")
           "name"
-        elsif me.column_names.include?("to_label")
+        elsif me.respond_to?("to_label")
           "to_label"
-        elsif me.column_names.include?("full_name")
+        elsif me.respond_to?("full_name")
           "full_name"
-        elsif me.column_names.include?("display_name")
+        elsif me.respond_to?("display_name")
           "display_name"
-        elsif me.column_names.include?("email")
+        elsif me.respond_to?("email")
           "email"
-        elsif me.column_names.include?("number")
+        elsif me.respond_to?("number")
           display_column = "number"
 
         else

data/lib/generators/hot_glue/templates/_show.haml

@@ -4,4 +4,4 @@
   = link_to "Delete <i class='fa fa-1x fa-remove'></i>".html_safe, <%= path_helper_full %>(<%= path_helper_args %>), 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_full %>(<%= path_helper_args %>),  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 %>), <% if @big_edit %>'data-turbo' => 'false', <% end %>disable_with: "Loading...", class: "edit-<%= singular %>-button btn btn-primary "

data/lib/generators/hot_glue/templates/controller.rb.erb

@@ -46,6 +46,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
       format.html
     end
   end
+
   def create
     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 ? ', ' + @auth : '' %>)
     @<%=singular_name %> = <%=class_name %>.create(modified_params)

data/lib/generators/hot_glue/templates/edit.haml

@@ -1,3 +1,5 @@
+= link_to "<i class='fa fa-arrow-circle-left  2x'></i> Back to list".html_safe, <%= path_helper_plural %>
+
 = turbo_frame_tag "<%= singular %>__#{<%= "@" + singular %>.id}" do
   .cell.editable{style: "position: relative;"}
     - if <%="@" + singular%>.errors.any?

data/lib/generators/hot_glue/templates/system_spec.rb.erb

@@ -0,0 +1,109 @@
+require 'rails_helper'
+
+describe "interaction for <%= controller_class_name %>", type: :feature do
+  <% unless @auth.nil? %>  let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
+  let(:<%= singular %>) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
+
+<%= objest_nest_factory_setup %>
+
+  before(:each) do
+    @request.env["devise.mapping"] = Devise.mappings[:account]
+
+    sign_in <%= @auth %>, scope: :<%= @auth %>
+  end
+
+  describe "index" do
+    it "should respond" do
+      get :index, xhr: true, format: 'js', params: {
+          <%= objest_nest_params_by_id_for_specs %>
+      }
+    end
+  end
+
+  describe "new" do
+    it "should show form" do
+      get :new, xhr: true, format: 'js', params: {
+          <%= objest_nest_params_by_id_for_specs %>
+      }
+    end
+  end
+
+  describe "create" do
+    it "should create a new <%= singular %>" do
+      expect {
+        post :create, xhr: true, format: 'js', params: {
+          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
+            <%= singular %>: {
+                <%= columns_spec_with_sample_data %>
+        }}
+      }.to change { <%= @singular_class %>.all.count }.by(1)
+      assert_response :ok
+    end
+
+    # it "should not create if there are errors" do
+    #   post :create, xhr: true, format: 'js',  params: {id: <%= singular %>.id,
+    #                                                    <%= singular %>: {skin_id: nil}}
+    #
+    #   expect(controller).to set_flash.now[:alert].to(/Oops, your <%= singular %> could not be saved/)
+    # end
+  end
+
+  describe "edit" do
+    it "should return an editable form" do
+      get :edit, xhr: true, format: 'js',  params: {
+          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
+          id: <%= singular %>.id
+      }
+      assert_response :ok
+    end
+  end
+
+  describe "show" do
+    it "should return a view form" do
+      get :show, xhr: true, format: 'js',  params: {
+          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
+          id: <%= singular %>.id
+        }
+      assert_response :ok
+    end
+  end
+
+  describe "update" do
+    it "should update" do
+      put :update, xhr: true, format: 'js',
+          params: {
+            <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
+            id: <%= singular %>.id,
+            <%= singular %>: {
+                <%= columns_spec_with_sample_data %>
+            }}
+
+      assert_response :ok
+    end
+
+    # it "should not update if invalid" do
+    #   put :update, xhr: true, format: 'js',
+    #       params: {
+    #         id: <%= singular %>.id,
+    #         <%= singular %>: {
+    #           <%= columns_spec_with_sample_data %>
+    #       }}
+    #
+    #   assert_response :ok
+    #
+    #   expect(controller).to set_flash.now[:alert].to(/Oops, your <%= singular %> could not be saved/)
+    # end
+  end
+
+  describe "#destroy" do
+    it "should destroy" do
+      post :destroy, format: 'js', params: {
+          <%= (@nested_args.empty? ? "" : objest_nest_params_by_id_for_specs + ",") %>
+          id: <%= singular %>.id
+      }
+      assert_response :ok
+      expect(<%= @singular_class %>.count).to be(0)
+    end
+  end
+end
+

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-06 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -132,13 +132,14 @@ files:
 - lib/generators/hot_glue/templates/_show.haml
 - lib/generators/hot_glue/templates/base_controller.rb.erb
 - lib/generators/hot_glue/templates/controller.rb.erb
-- lib/generators/hot_glue/templates/controller_spec.rb.erb
 - lib/generators/hot_glue/templates/create.turbo_stream.haml
 - lib/generators/hot_glue/templates/destroy.turbo_stream.haml
 - lib/generators/hot_glue/templates/edit.haml
 - lib/generators/hot_glue/templates/edit.turbo_stream.haml
 - lib/generators/hot_glue/templates/index.haml
 - lib/generators/hot_glue/templates/new.haml
+- lib/generators/hot_glue/templates/request_spec.rb.erb
+- lib/generators/hot_glue/templates/system_spec.rb.erb
 - lib/generators/hot_glue/templates/update.turbo_stream.haml
 - lib/hot-glue.rb
 - lib/hotglue/engine.rb
@@ -181,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.11
 signing_key:
 specification_version: 4
 summary: A gem build scaffolding.