hot-glue 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51ed0488e72bcd508f979de89c9f9d11ee1284c702c22066e72311d9cee03894
-  data.tar.gz: f30e2325ec4a08af8df44fa54e955b103aed04b650e2b165bcded589d2f8faa6
+  metadata.gz: 31420297af512f9e5153ff91ff0b15baec2650080938b9a1def230de42dae0a3
+  data.tar.gz: cf430cad34867b7113f48a56e06b7b195a476ae1090da28f06796b10a7eccf94
 SHA512:
-  metadata.gz: 8eb5cf4982698c4b51ac9caa4c223885ea9f8c2eac423c45e11ff2c7ccbb6c8aaad0e5f43d00cdf4ef3376a04bdc5ea3477813302a1fec8cc3d82e22463a5b51
-  data.tar.gz: 94af84f2f7e66846e593e8ab7ac5c441fbd4b8814c1fc390823a97350fe00854f6c91868094820ca3461e28b10a671cc892430b5d86621a88ef8700376b81a87
+  metadata.gz: 87ccaa42b5ab50ca222ff8c437bc348ab0f40d3c9d9c70f130ff47c2b8fea4ad51e267d6d21a377aa1f9d0bd47493a12b85296ce7b9e49081bd4ea841200ea54
+  data.tar.gz: b64d5bd42d2f571e4a1297b36fcdebe5d65907f63ab87c9f906fcf9576b223ab434e7348023bdd91a5f84ef517cd3576ba2e97ad0ae0f2dcfe108d93a6df2bf0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hot-glue (0.2.3)
+    hot-glue (0.2.4)
       ffaker (~> 2.16)
       haml-rails (~> 2.0)
       kaminari (~> 1.2)
@@ -91,7 +91,7 @@ GEM
     diff-lcs (1.4.4)
     erubi (1.10.0)
     erubis (2.7.0)
-    ffaker (2.19.0)
+    ffaker (2.20.0)
     ffi (1.15.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)

data/README.md

@@ -105,6 +105,11 @@ FOR HAML:
 ## Rspec setup
   - add `gem 'rspec-rails'` to your gemfile inside :development and :test
   - add `gem 'factory_bot_rails'` to your gemfile inside :development and :test
+  - more info:
+      https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#rspec
+
+  - add `gem 'ffaker'` to your Gemfile inside the  :development and :test groups
+  - 
   - run `rails generate rspec:install`
   - configure Rspec to work with Factory Bot inside of `rails_helper.rb`
     ```
@@ -113,8 +118,29 @@ FOR HAML:
         config.include FactoryBot::Syntax::Methods
     end
     ```  
-  more info:
-  https://github.com/thoughtbot/factory_bot/blob/master/GETTING_STARTED.md#rspec
+    
+  - add to rails_helper.rb (inside the existing Rspec.configure block)
+  -  ````
+config.include FactoryBot::Syntax::Methods
+````
+  - also add to rails_helper.rb (outside of the Rspec.configure block)
+    ```
+    Capybara.register_driver :headless_chrome_desktop do |app|
+      options = Selenium::WebDriver::Chrome::Options.new
+      options.add_argument('--headless')
+      options.add_argument('--disable-gpu')
+      options.add_argument('--window-size=1280,1200')
+    
+      driver = Capybara::Selenium::Driver.new(app,
+                                              browser: :chrome,
+                                              options: options)
+    
+      driver
+    end
+    Capybara.default_driver = :headless_chrome_desktop
+    
+    ```
+    
 
   - for a quick Capybara login, create a support helper in `spec/support/` and log-in as your user
     ```
@@ -466,6 +492,12 @@ Obviously, the created controller will always have this base controller as its s
 
 # VERSION HISTORY
 
+#### 2021-10-09 - v-0.2.5 - this version is all about developer happyness:
+                            - significant fixes for the behavioral (system) specs. they now create new & update interactions
+                            for (almost) all field types
+                            - the install generator now checks your layouts/application.html.erb for `render partial: 'layouts/flash_messages' ` and adds it if it isn't there already
+                            - the install generator also checks your spec/rails_helper for `config.include FactoryBot::Syntax::Methods` and adds it at the top of the Rspec configure block if it isn't there
+
 #### 2021-10-07 - v0.2.4 - removes erroneous icons display in delete buttos (these don't work inside of button_to); 
                             - adds support for ENUM types direclty on your field types
                             - you  must use activerecord-pgenum

data/app/helpers/hot_glue/controller_helper.rb

@@ -54,10 +54,12 @@ module HotGlue
         else
           server_timezone
         end
-      elsif defined?(controller) == "method"
-        # controller.try(:current_timezone)
-      elsif self.class.ancestors.include?(ApplicationController)
-        self.try(:current_timezone)
+      elsif true
+        server_timezone
+      # elsif defined?(controller) == "method"
+      #   # controller.try(:current_timezone)
+      # elsif self.class.ancestors.include?(ApplicationController)
+      #   self.try(:current_timezone)
       else
         raise "no method current_user is available; please implement/override the method current_timezone IN YOUR CONTROLLER"
       end

data/lib/generators/hot_glue/install_generator.rb

@@ -21,8 +21,35 @@ module HotGlue
 
       if Rails.version.split(".")[0].to_i >= 7
         copy_file "confirmable.js", "#{'spec/dummy/' if Rails.env.test?}app/javascript/controllers/confirmable.js"
+      end
+
+      rails_helper_contents = File.read("spec/rails_helper.rb")
+      if !rails_helper_contents.include?("include FactoryBot::Syntax::Methods")
+        rails_helper_contents.gsub!("RSpec.configure do |config|", "RSpec.configure do |config| \n
+  config.include FactoryBot::Syntax::Methods
+")
+        File.write("spec/rails_helper.rb", rails_helper_contents)
+        puts "  HOTGLUE --> add to spec/rails_helper.rb: `config.include FactoryBot::Syntax::Methods`  "
+      end
+
+      application_layout_contents = File.read("app/views/layouts/application.html.erb")
 
+      if !application_layout_contents.include?("render partial: 'layouts/flash_notices'")
+        application_layout_contents.gsub!("<body>", "<body>\n
+<%= render partial: 'flash_notices' %>
+")
+        File.write("app/views/layouts/application.html.erb", application_layout_contents)
+        puts "  HOTGLUE --> add to app/views/layouts/application.html.erb: `<%= render partial: 'layouts/flash_notices' %>`  "
       end
+
+      #
+
+      # TODO>: look for   config.include FactoryBot::Syntax::Methods
+      # inside of spec/rails_Helper.rb and inject it if it is not there
+      # rspec_file = File.read("spec/rails_helper.rb")
+      #
+      # "RSpec.configure do |config|"
+
     end
   end
 end

data/lib/generators/hot_glue/markup_templates/erb.rb

@@ -11,6 +11,20 @@ module  HotGlue
       "</div>"
     end
 
+
+    def text_area_output(col, field_length, col_identifier )
+      lines = field_length % 40
+      if lines > 5
+        lines = 5
+      end
+
+      "<div class=\"#{col_identifier} form-group \#{'alert-danger' if #{singular}.errors.details.keys.include?(:#{col.to_s})}\">" +
+      "<%= f.text_area :#{col.to_s}, class: 'form-control', cols: 40, rows: '#{lines}' %>" +
+        "<label class='form-text'>#{col.to_s.humanize}</label>"+
+        "</div>"
+
+    end
+
     def list_column_headings(*args)
       columns = args[0][:columns]
 
@@ -70,19 +84,17 @@ module  HotGlue
 
             end
           when :string
-            limit ||= 256
-            if limit <= 256
-              field_output(col, nil, limit, col_identifier)
+            if sql_type == "varchar" || sql_type == "character varying"
+              field_output(col, nil, limit || 40, col_identifier)
             else
-              text_area_output(col, limit, col_identifier)
+              text_area_output(col, 65536, col_identifier)
             end
 
           when :text
-            limit ||= 256
-            if limit <= 256
+            if sql_type == "varchar"
               field_output(col, nil, limit, col_identifier)
             else
-              text_area_output(col, limit, col_identifier)
+              text_area_output(col, 65536, col_identifier)
             end
           when :float
             limit ||= 256

data/lib/generators/hot_glue/scaffold_generator.rb

@@ -106,7 +106,7 @@ module HotGlue
       @singular = args.first.tableize.singularize # should be in form hello_world
       @plural = options['plural'] || @singular + "s" # supply to override; leave blank to use default
       @auth = options['auth'] || "current_user"
-      @auth_identifier = options['auth_identifier'] || (!@auth.nil? && @auth.gsub("current_", "")) || nil
+      @auth_identifier = options['auth_identifier'] || (! @god && @auth.gsub("current_", "")) || nil
 
 
       @nest = (!options['nest'].empty? && options['nest']) || nil

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

@@ -1,5 +1,5 @@
 class <%= controller_class_name %> < <%= controller_descends_from %>
-<% unless @auth_identifier == '' || @auth.nil? %>before_action :authenticate_<%= @auth_identifier %>!<% end %>
+<% unless @auth_identifier == '' || @god %>before_action :authenticate_<%= @auth_identifier %>!<% end %>
 
   <% if any_nested? %><% nest_chain = [] %> <% @nested_args.each { |arg|
     this_scope =   nest_chain.empty? ?  "#{@auth ? auth_object : class_name}.#{arg}s" : "#{nest_chain.last}.#{arg}s"
@@ -49,7 +49,7 @@ class <%= controller_class_name %> < <%= controller_descends_from %>
     end
   end
 
-<% if create_action %>  def new <% if !@auth.nil? %>
+<% if create_action %>  def new <% if ! @god %>
     @<%= singular_name %> = <%= class_name  %>.new(<%= @object_owner_sym %>: <%= @object_owner_eval %>)
    <% else %>
     @<%= singular_name %> = <%= class_name  %>.new

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

@@ -8,14 +8,7 @@
       <\%= render(partial: "#{controller.namespace}errors", locals: {resource: @<%= singular%> }) %>
     <\% end %>
 
-    <h2>Editing</h2>
-    <% if eval("@" + singular).try(:to_label) %>
-    <%="@" + singular%>.to_label
-    <%  elsif eval("@" + singular).try(:name)  %>
-   <%="@" + singular%>.name %>
-    <% else %>
-    (no name)
-      <% end %>
+    <h2>Editing <\%= @<%= @singular %>.<%= display_class %> %></h2>
     <\%= form_with model: <%= "@" + singular%>, url: <%= path_helper_singular %>(<%= path_arity %>) do |f| %>
     <\%=  render partial: "form",  locals: {:<%=  singular  %> => <%= "@" + singular%>, f: f} %>
     <\% end %>

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

@@ -2,42 +2,73 @@ require 'rails_helper'
 
 describe "interaction for <%= controller_class_name %>", type: :feature do
   include HotGlue::ControllerHelper
-  <% unless @auth.nil? %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
-
-  let!(:<%= singular %>1) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
-  let!(:<%= singular %>2) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
-  let!(:<%= singular %>3) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> )}
-
-  <%= objest_nest_factory_setup %>
-
+  <% unless @god %>let(:<%= @auth %>) {create(:<%= @auth.gsub('current_', '') %>)}<%end%>
+    <%= @columns.map { |col|
+      type = eval("#{singular_class}.columns_hash['#{col}']").type
+      case type
+      when :integer
+        if col.to_s.ends_with?("_id")
+          assoc = "#{col.to_s.gsub('_id','')}"
+          "let!(:#{assoc}1) {create(:#{assoc}, name: FFaker::Name.name)}"
+        end
+      else
+      end
+    }.compact.join("\n")
+          %>
+  <% item1_addOns = ""
+   if (eval(@singular_class).instance_methods.include?(display_class.to_s))
+    item1_addOns << "#{display_class}: FFaker::Name.name"
+   end
+
+  item1_addOns << ", " + @columns.map { |col|
+  type = eval("#{singular_class}.columns_hash['#{col}']").type
+  case type
+  when :string
+    "#{col}: FFaker::Movie.title"
+  when :text
+    "#{col}:  FFaker::Lorem.paragraphs(10).join("  ")"
+
+  when :float
+    "#{col}: rand(1)*10000"
+  when :boolean
+    "#{col}: !!rand(2).floor"
+  when :time
+    "#{col}: Time.current + rand(5000).seconds"
+  when :date
+    "#{col}: Date.current + rand(50).days"
+  when :datetime
+    "#{col}: DateTime.current + rand(1000).seconds"
+  when :integer
+    if col.to_s.ends_with?("_id")
+      # shoould the assoication be on here
+    else
+     "#{col}: rand(100)"
+    end
+  end
+}.compact.join(", \n      ")
+  %>let!(:<%= singular %>1) {create(:<%= singular %><%= object_parent_mapping_as_argument_for_specs %> <%= item1_addOns %> )}
+  <%= objest_nest_factory_setup %> <% unless @god %>
   before(:each) do
     login_as(<%= @auth %>)
-  end
+  end <% end %>
 
   describe "index" do
     it "should show me the list" do
       visit <%= path_helper_plural %>
-
 <%=
 @columns.map { |col|
   type = eval("#{singular_class}.columns_hash['#{col}']").type
-  # limit = eval("#{singular_class}.columns_hash['#{col}']").limit
-  # sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
-  #
-
   case type
   when :datetime
-    "      " + ["expect(page).to have_content(#{singular}#{rand(3)+1}.#{col}.in_time_zone(#{ @auth }.timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub('  ', ' ') + timezonize(#{ @auth }.timezone)  )"].join("\n      ")
-
-  else
-    "      " + ["expect(page).to have_content(#{singular}#{rand(3)+1}.#{col})"].join("\n      ")
-
+    "      " + ["expect(page).to have_content(#{singular}#{1}.#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y @ %l:%M %p ').gsub('  ', ' ') + timezonize(current_timezone)  )"].join("\n      ")
+  when :integer
+    if !col.ends_with?("_id")
+      "      " + ["expect(page).to have_content(#{singular}#{1}.#{col})"].join("\n      ")
+    end
   end
 
 }.join("\n")
-     
       %>
-
     end
   end
 
@@ -50,17 +81,28 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 <%=
   @columns.map { |col|
     type = eval("#{singular_class}.columns_hash['#{col}']").type
-    # limit = eval("#{singular_class}.columns_hash['#{col}']").limit
-    # sql_type = eval("#{singular_class}.columns_hash['#{col}']").sql_type
-    #
-
     case type
     when :datetime
+      "      " + "new_#{col} = DateTime.current + (rand(100).days) \n" +
+      '      ' + "find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
     when :integer
-      "      " + 'find("input#' + singular + '_' + col.to_s + '").fill_in(with: rand(10))'
+
+      if col.to_s.ends_with?("_id")
+        assoc = col.to_s.gsub('_id','')
+        "      #{col}_selector = find(\"[name='#{singular}[#{col}]']\").click \n" +
+        "      #{col}_selector.first('option', text: #{assoc}1.name).select_option"
+      else
+        "      new_#{col} = rand(10) \n" +
+        "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
+
+      end
+    when :boolean
+      "     new_#{col} = rand(2).floor \n" +
+      "     find(\"[name='#{singular}[#{col}]'][value='\#{new_" + col.to_s + "}']\").choose"
     else
       "      " + "new_#{col} = 'new_test-email@nowhere.com' \n" +
-      '      ' + 'find("input#' + singular + '_' + col.to_s + '").fill_in(with: new_' + col.to_s + ')'
+      "      find(\"[name='#{singular}[#{ col.to_s }]']\").fill_in(with: new_#{col.to_s})"
     end
 
   }.join("\n")
@@ -75,41 +117,77 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
 
     case type
     when :datetime
+         "      expect(page).to have_content(new_#{col}.in_time_zone(current_timezone).strftime('%m/%d/%Y')  + \" @ \" +
+      new_#{col}.in_time_zone(current_timezone).strftime('%l').strip + \":\" +
+      new_#{col}.in_time_zone(current_timezone).strftime('%M %p').strip + \" \" +
+      timezonize(current_timezone))"
     when :integer
+      if col.to_s.ends_with?("_id")
+        # shoould the assoication be on here
+      else
+         "expect(page).to have_content(new_#{col})"
+      end
     else
       "expect(page).to have_content(new_#{col})"
     end
 
-  }.join("\n")
+  }.compact.join("\n      ")
   %>
 
     end
   end
 
-  describe "show" do
-    it "should return a view form" do
-      visit <%= path_helper_plural %>
-
-    end
-  end
 
   describe "edit & update" do
     it "should return an editable form" do
       visit <%= path_helper_plural %>
       find("a.edit-<%= singular %>-button[href='/<%= namespace_with_slash %><%= plural %>/#{<%= singular %>1.id}/edit']").click
 
-      expect(page).to have_content("Editing #{<%= singular %>.<%= "abc" %>}")
+      expect(page).to have_content("Editing #{<%= singular %>1.<%= @display_class  %> || "(no name)"}")
 <%=
     @columns.map { |col|
       type = eval("#{singular_class}.columns_hash['#{col}']").type
-
+      limit = eval("#{singular_class}.columns_hash['#{col}']").limit
+      sql_type =  eval("#{singular_class}.columns_hash['#{col}']").sql_type
       case type
       when :datetime
       when :integer
+        if !col.to_s.ends_with?("_id")
+            "     new_#{col} = rand(10000).floor \n" +
+            "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s})"
+        end
+      when :text
+        if sql_type == "text"
+            "      " + "new_#{col.to_s} = FFaker::Lorem.paragraphs(3).join \n" +
+            '      find("textarea[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+
+        else # unreachable?
+            "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
+            '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+        end
+      when :string
+        if sql_type == "varchar"
+            "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
+            '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+        else
+            "      " + "new_#{col.to_s} = FFaker::Lorem.paragraphs(1).join \n" +
+            '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
+        end
+      when :boolean
+          "     new_#{col} = rand(2).floor \n" +
+          "     find(\"[name='#{singular}[#{col}]'][value='\#{new_#{col}}']\").choose"
+      when :float
+        "     new_#{col} = rand(1)*5000 \n" +
+        "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s })"
+      when :date
+        "     new_#{col} = Date.current + rand(100).days \n" +
+        "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s })"
+      when :time
+        "     new_#{col} = Time.current + rand(144).hours \n" +
+        "     find(\"[name='#{singular}[#{col}]']\").fill_in(with: new_#{col.to_s })"
       else
-        "      " + "new_#{col.to_s} = Faker::Name.new \n" +
-
-        '      find("input[name=\'' + singular + '[' + col.to_s + ']\'").fill_in(with: new_' + col.to_s + ')'
+        "      " + "new_#{col.to_s} = FFaker::Name.name \n" +
+        '      find("input[name=\'' + singular + '[' + col.to_s + ']\']").fill_in(with: new_' + col.to_s + ')'
 
       end
     }.join("\n")
@@ -123,11 +201,19 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
       type = eval("#{singular_class}.columns_hash['#{col}']").type
       case type
       when :datetime
-      when :integer
+        # TODO: implement me
+      when :time
+        # TODO: implement me
+      when :date
+        # TODO: implement me
+      when :boolean
+        # TODO: implement me
       else
+        unless type==:integer && col.to_s.ends_with?("_id")
         '        expect(page).to have_content(new_' + col.to_s + ')'
+        end
       end
-    }.join("\n")
+    }.compact.join("\n")
     %>
 
       end
@@ -137,10 +223,12 @@ describe "interaction for <%= controller_class_name %>", type: :feature do
   describe "destroy" do
     it "should destroy" do
       visit <%= path_helper_plural %>
-      accept_alert do
-        find("a.delete-<%= singular %>-button[href='<%= namespace_with_dash %>/<%= plural %>/#{<%= singular %>1.id}']").click
-      end
-      expect(page).to_not have_content(<%= singular %>1.email)
+      #accept_alert do
+      # find("form[action='<%= namespace_with_dash %>/<%= plural %>/#{<%= singular %>1.id}'] > button.delete-<%= singular %>-button").click
+      #end
+      find("form[action='<%= namespace_with_dash %>/<%= plural %>/#{<%= singular %>1.id}'] > button.delete-<%= singular %>-button").click
+
+      expect(page).to_not have_content(<%= singular %>1.<%= @display_class %>)
       expect(<%= singular_class %>.where(id: <%= singular %>1.id).count).to eq(0)
     end
   end

data/lib/hotglue/version.rb

@@ -1,3 +1,3 @@
 module HotGlue
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hot-glue
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jason Fleetwood-Boldt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails