bootstrap_views_generator 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 003b0f07a0458189484b4c34627607a2b8f650bd376c2a0a895ff60de0962ed6
-  data.tar.gz: 7493353ce548589eacbd36e2c10ad29bb5b821305c81765788399f50313db19d
+  metadata.gz: 1e8a0bd048ee64107d721f90158e12aeecdeeac0b4f35f99187a42fa7027dc19
+  data.tar.gz: 5a82a5c01c0f544b214ec007a6f76a5cab6816bc03ce09c58391bb3c9c868fbf
 SHA512:
-  metadata.gz: afd409ca4c1d52a9b64524c60dd17b790e335031cf0798ac26c33a93bbcae9e09fd1c0908caf2d76b84f36b083af786a393cabead1b0c5e8b4309080b4922484
-  data.tar.gz: 730a77186a21ccc7abf80d08807d513a90ae93f0a81cce7d0baf35d3be0881a89ca329fde7d2eaaf2ee5ab1216a8aeca37fb0d30112b492f7c60f8212dae0a00
+  metadata.gz: a07e32cbfa623f93ef8857eedd0d30fade0d2b209dada912b1faea2b07418a42d4a622778115bb9325645145beb773adb361b3038ee38384901627cdbebf67c8
+  data.tar.gz: 6364cc3e4fa0640f2360b600e063b2b19e8defb420deeeb4427397d54c96796d60d59e00c7d2c1f4a72d0e98f2b66fba4ea3a59224b251409600eb6ba723645e

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 2021-04-17
+
+- Correct issue with HAML page title being misaligned
+- Avoid deprecation errors when pulling the application name when using Rails > 6.0 vs earlier versions
+- Added logic for pulling the `app_name` into a helper to prevent duplicate logic within all the layout templates
+- Minor version bump
+
+## 2020-01-23
+
+- Minor cleanup on ruby files (rubocop errors)
+- Cleanup gemspec and added metadata so rubygems will display links for them on the gempage

data/bootstrap_views_generator.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bootstrap_views_generator/version'
@@ -14,18 +16,19 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   # Going off of minimum version required for Rails_v5.2.3
-  spec.required_ruby_version     = '>= 2.2.2'
+  spec.required_ruby_version = ">= #{BootstrapViewsGenerator::MIN_RUBY_VERSION}"
   if spec.respond_to?(:metadata)
     spec.metadata['homepage_uri'] = spec.homepage
     spec.metadata['source_code_uri'] = spec.homepage
+    spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues"
+    spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/main/CHANGELOG.md"
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   # spec.files         = Dir.glob("{bin,lib}/**/*") # Used when building the gem locally (before commiting and pushing the gem publically)

data/lib/bootstrap_views_generator.rb

@@ -2,6 +2,7 @@
 
 require 'bootstrap_views_generator/version'
 require 'rails'
+require 'bootstrap_views_generator/helpers'
 
 module BootstrapViewsGenerator
   class Error < StandardError; end

data/lib/bootstrap_views_generator/helpers.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module BootstrapViewsGenerator
+  module Helpers
+    # Return a cleaned up version of the name of the application being generated
+    # @return [String]
+    def app_name
+      # Avoid deprecation errors when pulling the application name when using Rails > 6.0
+      @app_name ||= if Rails.version.to_f >= 6.0
+                      Rails.app_class.module_parent_name.demodulize.titleize
+                    else
+                      Rails.application.class.parent.to_s.titleize
+                    end
+    end
+  end
+end

data/lib/bootstrap_views_generator/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module BootstrapViewsGenerator
-  VERSION = '0.1.14'.freeze
+  MIN_RUBY_VERSION = '2.2.2'
+  VERSION = '0.1.15'
 end

data/lib/generators/bootstrap/devise_generator.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 require 'rails/generators'
+require_relative '../../bootstrap_views_generator/helpers'
 
 module Bootstrap
   module Generators
     class DeviseGenerator < ::Rails::Generators::Base
+      include BootstrapViewsGenerator::Helpers
+
       hide!
       desc 'Overwrite default devise views'
       source_root ::File.expand_path('../templates/devise', __FILE__)
@@ -49,7 +52,8 @@ module Bootstrap
       private
       def file_template_location(file_location = '')
         return '' if file_location.blank?
-        # Dpending if simpleform is to be used, it will return a path similar to one of the following:
+
+        # Depending if simpleform is to be used, it will return a path similar to one of the following:
         # => slim/unlocks/new.html.slim || simple_form/slim/unlocks/new.html.slim
         "#{simple_path}#{options[:template_engine]}/#{file_location}.html.#{options[:template_engine]}"
       end

data/lib/generators/bootstrap/install_generator.rb

@@ -2,10 +2,12 @@
 
 require 'rails/generators'
 require_relative 'devise_generator'
+require_relative '../../bootstrap_views_generator/helpers'
 
 module Bootstrap
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
+      include BootstrapViewsGenerator::Helpers
       desc 'Overwrite default view scaffolding'
       source_root ::File.expand_path('../templates', __FILE__)
       class_option :template_engine,    type: :string, default: 'erb', aliases: '-t', enum: %w[erb slim haml],
@@ -52,8 +54,8 @@ module Bootstrap
         copy_file("simple_form/_form.html.#{options[:template_engine]}", "lib/templates/#{options[:template_engine]}/scaffold/_form.html.#{options[:template_engine]}", force: true) if options[:simpleform]
       end
 
-      # Inject Bootstrap helpers into teh application_helper file
-      def inject_helpers
+      # Inject Bootstrap helpers into the application_helper file
+      def inject_application_helpers
         pagy_helper = (options[:pagination] ? 'include Pagy::Frontend' : '')
         helper_str = <<~HELPER
         #{pagy_helper}
@@ -93,7 +95,7 @@ module Bootstrap
           end
         end
       HELPER
-        inject_into_file 'app/helpers/application_helper.rb', optimize_indentation(helper_str,2), after: "module ApplicationHelper\n"
+        inject_into_file 'app/helpers/application_helper.rb', optimize_indentation(helper_str, 2), after: "module ApplicationHelper\n"
       end
 
       def invoke_devise_generator

data/lib/generators/bootstrap/templates/layouts/application.html.erb.tt

@@ -5,10 +5,10 @@
     <meta content="IE=Edge" http-equiv="X-UA-Compatible" />
     <meta content="width=device-width, initial-scale=1.0" name="viewport" />
 <%- if options[:metatags] -%>
-    <%%= display_meta_tags site: '<%= Rails.application.class.parent.to_s.titleize %>' %>
+    <%%= display_meta_tags site: '<%= app_name %>' %>
 <%- else -%>
-    <title>Bootstrap template</title>
-<% end -%>
+    <title><%= app_name %></title>
+<%- end -%>
     <%%= csrf_meta_tags %>
     <%%= csp_meta_tag %>
     <%%= stylesheet_link_tag 'application', media: 'all'<%= (options[:skip_turbolinks] || options[:skip_javascript]) ? '' : ", 'data-turbolinks-track': 'reload'" %> %>

data/lib/generators/bootstrap/templates/layouts/application.html.haml.tt

@@ -6,9 +6,9 @@
     %meta{content: "IE=Edge", "http-equiv" => "X-UA-Compatible"}/
     %meta{content: "width=device-width, initial-scale=1.0", name: "viewport"}/
 <%- if options[:metatags] -%>
-    = display_meta_tags site: '<%= Rails.application.class.parent.to_s.titleize %>'
+    = display_meta_tags site: '<%= app_name %>'
 <%- else -%>
-    %title Bootstrap template
+    %title= '<%= app_name %>'
 <%- end -%>
     = csrf_meta_tags
     = csp_meta_tag

data/lib/generators/bootstrap/templates/layouts/application.html.slim.tt

@@ -5,9 +5,9 @@ html
     meta content="IE=Edge" http-equiv="X-UA-Compatible"
     meta content="width=device-width, initial-scale=1.0" name="viewport"
 <%- if options[:metatags] -%>
-    = display_meta_tags site: '<%= Rails.application.class.parent.to_s.titleize %>'
+    = display_meta_tags site: '<%= app_name %>'
 <%- else -%>
-    title Bootstrap template
+    title <%= app_name %>
 <%- end -%>
     = csrf_meta_tags
     = csp_meta_tag

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_views_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Brandon Hicks
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2021-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -80,6 +80,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -89,6 +90,7 @@ files:
 - bin/setup
 - bootstrap_views_generator.gemspec
 - lib/bootstrap_views_generator.rb
+- lib/bootstrap_views_generator/helpers.rb
 - lib/bootstrap_views_generator/version.rb
 - lib/generators/bootstrap/config/simple_form.rb
 - lib/generators/bootstrap/devise_generator.rb
@@ -186,7 +188,9 @@ licenses:
 metadata:
   homepage_uri: https://github.com/tarellel/bootstrap_views_generator
   source_code_uri: https://github.com/tarellel/bootstrap_views_generator
-post_install_message: 
+  bug_tracker_uri: https://github.com/tarellel/bootstrap_views_generator/issues
+  changelog_uri: https://github.com/tarellel/bootstrap_views_generator/blob/main/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,8 +205,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.11
+signing_key:
 specification_version: 4
 summary: Bootstrap generators for overwriting the default Rails view generators
 test_files: []