devise-bootstrap-form 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 631361b779275161c55e77746b850396713ff05146e504883ea127b15d45fcb7
-  data.tar.gz: 324b22c3e9d0467d915b1161484afd48855d8dbf25bd94102e5dfb97ca3aeed6
+  metadata.gz: 9e648e6a37294388fe0ac3b168a71bb25b612a7a5c2044c9e14ad2fa52ac4f9d
+  data.tar.gz: e35e50df2246d2a026e7314bc39324fb890e1b59eccf262cf895d770507246cd
 SHA512:
-  metadata.gz: 1b74d4926bad575e5a966515700d3c63326e7c7010087fa4d16df695593464def4b309382fb3529ebb31d16255eeed8f48d89bd764d42dac3bd4384752ad46f4
-  data.tar.gz: 8719cf714ef87b452572ef8e33193f0c33e2a62170c98d3ce0c030a4c15e8cbecbf4c9e1bc3f1f01720a88ef0d5d7256ab1d2986425a080831a5b6d334ee47b4
+  metadata.gz: c25fe5579ee38bd3ecda497023f5f3a2b7775ca0816ef1f17206c057331576673dc15ff3f3bbadf68c6d0670f185853c37826661f6ef09022ee327f97a418594
+  data.tar.gz: f68845e7b03738f5115e1ec79ab21ae87ee2e3a17a57068572f88ac212c1b56b9e782e8f99bbe19de18c22e3a67c719a37c83702a0c8fdf8506df97acf32ce17

data/.github/workflows/ruby.yml

@@ -0,0 +1,46 @@
+name: Ruby
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  Lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+          bundler-cache: true
+      - name: Danger
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          gem install danger
+          export DANGER_GITHUB_API_TOKEN=${{ github.token }}
+          danger
+      - name: Rubocop
+        run: bundle exec rubocop --auto-correct
+  Test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: [ '3.1', '3.0', '2.7', '2.6' ]
+        gemfile: [ '7.0', '6.1', '6.0', '5.2', 'edge' ]
+        exclude:
+          - { ruby-version: '3.1', gemfile: "6.1" } # Triggers some deprecations that might never get fixed
+          - { ruby-version: '3.1', gemfile: "6.0" }
+          - { ruby-version: '3.1', gemfile: "5.2" }
+          - { ruby-version: '3.0', gemfile: "5.2" }
+          - { ruby-version: '2.6', gemfile: "edge" }
+          - { ruby-version: '2.6', gemfile: "7.0" }
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Run tests
+        run: bundle exec rake test

data/.gitignore

@@ -7,9 +7,21 @@
 /pkg/
 /tmp/
 *.gem
+.cache/
 
 .vagrant/
 # For some reason, the test cases generate the mailer views in this directory,
 # as well as the `test/rails_app/app/views/devise/mailer` directory.
 # TODO: Figure out why and stop it from happening.
 # app/views/devise/mailer/
+
+# or .local/share/pry/pry_history if you need to be more exact
+.local/
+.irb_history
+.byebug_history
+# For Debian images with Bash
+.bash_history
+# For Alpine images
+.ash_history
+
+vendor/bundle

data/.rubocop.yml

@@ -10,7 +10,7 @@ Style/StringLiterals:
     - "test/rails_app/app/mailers/*"
     - "test/es_rails_app/app/mailers/*"
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   # Alignment of parameters in multi-line method calls.
   #
   # The `with_first_parameter` style aligns the following lines along the same
@@ -32,7 +32,7 @@ Layout/AlignParameters:
   # But it can be overridden by setting this parameter
   # IndentationWidth: ~
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 132
   # To make it possible to copy or click on URIs in the code, we allow lines
   # containing a URI to be longer than Max.
@@ -51,12 +51,11 @@ Metrics/LineLength:
 
 # Rails 5 only requires 2.2.2.
 AllCops:
+  NewCops: enable
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 2.2
-  # TargetRubyVersion: <%= RUBY_VERSION[/\d+\.\d+/] %>
+  TargetRubyVersion: 2.6
   Exclude:
-    # - "test/rails_app/**/*"
     - Capfile
     - Gemfile
     - "test/rails_app/bin/**/*"
@@ -66,12 +65,6 @@ AllCops:
     - "test/rails_app/log/**/*"
     - "test/rails_app/tmp/**/*"
     - "test/rails_app/vendor/**/*"
-    # - test/rails_app/config/boot.rb
-    # - test/rails_app/config/application.rb
-    # - test/rails_app/config/environment.rb
-    # - "test/rails_app/config/environments/*"
-    # - "test/rails_app/config/initializers/*"
-    # - test/rails_app/db/schema.rb
     - "test/rails_app/node_modules/**/*"
     - "test/rails_app/bower_components/**/*"
     - test/rails_app/Gemfile
@@ -84,17 +77,12 @@ AllCops:
     - "test/es_rails_app/log/**/*"
     - "test/es_rails_app/tmp/**/*"
     - "test/es_rails_app/vendor/**/*"
-    # - test/es_rails_app/config/boot.rb
-    # - test/es_rails_app/config/application.rb
-    # - test/es_rails_app/config/environment.rb
-    # - "test/es_rails_app/config/environments/*"
-    # - "test/es_rails_app/config/initializers/*"
-    # - test/es_rails_app/db/schema.rb
     - "test/es_rails_app/node_modules/**/*"
     - "test/es_rails_app/bower_components/**/*"
     - test/es_rails_app/Gemfile
     - test/es_rails_app/Guardfile
     - test/es_rails_app/Rakefile
+    - vendor/bundle/**/*
 
 Metrics/BlockLength:
   Exclude:
@@ -113,7 +101,7 @@ Metrics/MethodLength:
     - test/**/*.rb
 
 # TODO: Remove this when minimum Ruby is 2.3.
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Exclude:
     - Dangerfile
     - devise-bootstrap-form.gemspec

data/CHANGELOG.md

@@ -12,6 +12,17 @@
 
 * None.
 
+## [0.4.0][] (2022-01-02)
+
+### New features
+
+* Use GitHub actions instead of Travis.
+* New RuboCop rules.
+
+### Bugfixes
+
+* Fix dependencies so we only use Bootstrap 4.
+
 ## [0.3.0]
 
 ### New features
@@ -47,7 +58,8 @@
 * N/A.
 
 ```
-    [Pending Release]: https://github.com/lcreid/devise-bootstrap-form/compare/.v0.3.0...HEAD
+    [Pending Release]: https://github.com/lcreid/devise-bootstrap-form/compare/.v0.4.0...HEAD
+    [0.4.0]: https://github.com/lcreid/devise-bootstrap-form/compare/v0.3.0..v0.4.0
     [0.3.0]: https://github.com/lcreid/devise-bootstrap-form/compare/v0.2.0..v0.3.0
     [0.2.0]: https://github.com/lcreid/devise-bootstrap-form/compare/v0.1.0..v0.2.0
     [0.1.0]: https://github.com/lcreid/devise-bootstrap-form/compare/...v0.2.0

data/CONTRIBUTING.md

@@ -1,4 +1,5 @@
-## Contributing
+# Contributing
+
 If you find a bug or have an idea for a feature:
 
 1. Search the issues to see if the bug has been found, or the feature has already been requested. If so, feel free to add your constructive input to the existing issue. Otherwise...
@@ -7,12 +8,14 @@ If you find a bug or have an idea for a feature:
 4. If you don't want to submit your own pull request, your issue is still welcome and we'll review it and respond appropriately.
 
 ## Testing
+
 ### Manual and Exploratory Testing
+
 There are test apps in `test/rails_app`, for the default locale, and `es_rails_app` for a Spanish locale.
 
-To use the `devise-bootstrap-form` gem:
+To use the `devise-bootstrap-form` gem in a test app:
 
-```
+```bash
 cd test/rails_app # or cd test/es_rails_app
 # Generate the view in the test app
 rails g devise:views:bootstrap_form
@@ -22,23 +25,32 @@ rails s -b 0.0.0.0 &
 
 ### Automated Testing
 
+To run the tests and the RuboCop checks:
+
+```bash
+rake
 ```
+
+To run just the tests:
+
+```bash
 rake test
 ```
 
 ## Gotchas
+
 To test that the views work for a model other than the default `User`, the test apps use `Person` as the Devise model. It's a bit frustrating to remember that you can't just cut and paste examples that assume the model is `User`.
 
-## Coding guidelines
+## Coding Guidelines
 
 This project uses [RuboCop](https://github.com/bbatsov/rubocop) to enforce standard Ruby coding
 guidelines. The coding standards are close to the out-of-the-box RuboCop standards. The main differences are:
 
-* We prefer double-quoted strings
-* We allow 132 characters per line
-* We don't lint most of the Rails-generated files in the test application
+* We prefer double-quoted strings.
+* We allow 132 characters per line.
+* We don't lint most of the Rails-generated files in the test application.
 
-Note the Travis build will fail and your PR cannot be merged if the linter finds errors
+Note the GitHub actions build will fail and your PR cannot be merged if the linter finds errors.
 
-* Test that your contributions pass with `rake lint`
-* The linter is also run as part of the default rake task `rake`
+* Test that your contributions pass with `rake lint`.
+* The linter is also run as part of the default rake task `rake`.

data/Dangerfile

@@ -24,19 +24,19 @@ if has_lib_changes && !has_test_changes
   warn("There are code changes, but no corresponding tests. "\
        "Please include tests if this PR introduces any modifications in "\
        "#{project_name}'s behavior.",
-    sticky: false)
+       sticky: false)
 end
 
 # ------------------------------------------------------------------------------
 # Have you updated CHANGELOG.md?
 # ------------------------------------------------------------------------------
 if !has_changelog_changes && has_lib_changes
-  markdown <<-MARKDOWN
-Here's an example of a CHANGELOG.md entry (place it immediately under the `* Your contribution here!` line):
+  markdown <<~MARKDOWN
+  Here's an example of a CHANGELOG.md entry (place it immediately under the `* Your contribution here!` line):
 
-```markdown
-* [##{pr_number}](#{pr_url}): #{github.pr_title} - [@#{github.pr_author}](https://github.com/#{github.pr_author}).
-```
+  ```markdown
+  * [##{pr_number}](#{pr_url}): #{github.pr_title} - [@#{github.pr_author}](https://github.com/#{github.pr_author}).
+  ```
   MARKDOWN
   warn("Please update CHANGELOG.md with a description of your changes. "\
        "If this PR is not a user-facing change (e.g. just refactoring), "\
@@ -46,11 +46,9 @@ end
 # ------------------------------------------------------------------------------
 # Did you remove the CHANGELOG's "Your contribution here!" line?
 # ------------------------------------------------------------------------------
-if has_changelog_changes
-  if IO.read("CHANGELOG.md").scan(/^\s*[-\*] Your contribution here/i).count < 3
-    raise(
-      "Please put the `- Your contribution here!` line back into CHANGELOG.md.",
-      sticky: false
-    )
-  end
+if has_changelog_changes && File.read("CHANGELOG.md").scan(/^\s*[-*] Your contribution here/i).count < 3
+  raise(
+    "Please put the `- Your contribution here!` line back into CHANGELOG.md.",
+    sticky: false
+  )
 end

data/Gemfile

@@ -10,4 +10,5 @@ group :development do
   gem "chandler", ">= 0.7.0"
   # gem "htmlbeautifier"
   gem "rubocop", require: false
+  gem "rubocop-rake", require: false
 end

data/README.md

@@ -14,8 +14,9 @@ Add these lines to your application's `Gemfile`:
 
 ```ruby
 gem 'bootstrap', '~> 4.0'
-gem "bootstrap_form", ">= 4.0.0.alpha1"
-gem 'devise' # gem 'devise-i18n'
+gem "bootstrap_form", "~> 4.0"
+gem 'devise'
+# gem 'devise-i18n'
 # gem 'devise_invitable'
 gem 'devise-bootstrap-form'
 ```

data/devise-bootstrap-form.gemspec

@@ -11,14 +11,14 @@ Gem::Specification.new do |spec|
   spec.email         = ["larry.reid@jadesystems.ca"]
 
   spec.summary       = "Generates nicer views for Devise that use Bootstrap via the `bootstrap_form` gem."
-  spec.description   = <<-DESC
-This gem generates Devise views styled with Bootstrap via the `bootstrap_form`
-gem. If you plan to use, or are using, `bootstrap_form` in your app, your Devise
-forms will be consistent with the rest of your forms.
-
-The generator will detect if you're using `devise_invitable`, and will generate
-`bootstrap_form` forms for its views as well. If you're using `devise-i18n`, the
-forms will use translations.
+  spec.description   = <<~DESC
+    This gem generates Devise views styled with Bootstrap via the `bootstrap_form`
+    gem. If you plan to use, or are using, `bootstrap_form` in your app, your Devise
+    forms will be consistent with the rest of your forms.
+
+    The generator will detect if you're using `devise_invitable`, and will generate
+    `bootstrap_form` forms for its views as well. If you're using `devise-i18n`, the
+    forms will use translations.
   DESC
   spec.homepage      = "https://github.com/lcreid/devise-bootstrap-form"
   spec.license       = "MIT"
@@ -31,18 +31,23 @@ forms will use translations.
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
+  spec.required_ruby_version = ">= 2.6"
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "bootstrap_form", ">= 4.0.0.alpha1"
+  spec.add_dependency "bootstrap_form", "~> 4.0"
   # Devise deprecated devise_error_messages! at 4.6.0, so for later versions
   # we add a new partial.
   spec.add_dependency "devise", ">= 4.6.0"
   spec.add_dependency "rails", ">= 5.0.0"
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "chandler"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
+  spec.metadata = {
+    "rubygems_mfa_required" => "true"
+  }
 end

data/lib/devise_bootstrap_form/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DeviseBootstrapForm
   class Railtie < ::Rails::Railtie
   end

data/lib/devise_bootstrap_form/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeviseBootstrapForm
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0"
 end

data/lib/generators/devise/views/bootstrap_form_generator.rb

@@ -24,7 +24,7 @@ module Devise
         copy_base_devise(BootstrapFormGenerator.i18n ? "i18n" : "devise")
         # The shared error message view is already internationalized.
         copy_file "views/devise/shared/_error_messages.html.erb",
-          "app/views/devise/shared/_error_messages.html.erb"
+                  "app/views/devise/shared/_error_messages.html.erb"
         copy_invitable_devise
       end
 
@@ -40,7 +40,7 @@ module Devise
       def copy_base_devise(source)
         %w[confirmations passwords registrations sessions shared unlocks].each do |dir|
           directory File.join("views/#{source}", dir),
-            "app/views/devise/#{dir}"
+                    "app/views/devise/#{dir}"
         end
       end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: devise-bootstrap-form
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Larry Reid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.alpha1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chandler
   requirement: !ruby/object:Gem::Requirement
@@ -122,10 +122,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -174,7 +174,7 @@ homepage: https://github.com/lcreid/devise-bootstrap-form
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -183,15 +183,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Generates nicer views for Devise that use Bootstrap via the `bootstrap_form`

data/.travis.yml

@@ -1,25 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
-before_install:
-  # https://docs.travis-ci.com/user/languages/ruby/#bundler-20
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem i rubygems-update -v '<3' && update_rubygems
-  - gem install bundler -v 1.17.3 --no-document
-
-matrix:
-  include:
-    # Bleeding edge
-    - rvm: ruby-head
-
-    # Running one job to execute DANGER bot
-    - rvm: 2.5.0
-      script:
-        - gem install danger
-        - danger
-
-  allow_failures:
-    - rvm: ruby-head