make_it_so 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2c34aca2be98715b41417216c183fc283c06ef203a42945927e6fa71c35e027
-  data.tar.gz: b0e6c29001e305ae6978fd52d6b753e599d85c77e41610e483f83e0485e694c8
+  metadata.gz: 62d0d492e8ebf31a42c217e5294c22c11e8e27fda46526c9ed9466e63e3cbc0a
+  data.tar.gz: 4d9e66ac27776841fb882234c0da8dc98458836a9f44650c0a82dd6a284fb813
 SHA512:
-  metadata.gz: e395f33577107fe638da218ed7a3fe068fce927c73098233d79ba64551b13a346ba0706cd9ca1de122b30d3e885ead9148e7c60e537c0e11b1295bab926d37b1
-  data.tar.gz: 43ee817cc5d04d3ad32c937c14137c9752c98f4c9aa24d376328a393007fd8771bbda8473f947962ed20a43fac4e7bcc2affdd3b6cfc937b17405e886a361350
+  metadata.gz: 4a56507b200ab5a6b5237b1b33abc919d8e7cb871e5b9533862024b6c47c02c983d155d04d91e7b819cb405a1ad04f783067802c0490b54d40c0c9c4bfb8353d
+  data.tar.gz: ebf9b7057c86b84dd9d1fa8ffcb7ab9837306efe1e81ebddac6f6a4ad4855024baafa76e12e935aaef7f8ec15e38f1541a3ec06e9701d7d4936079ee60ee36c4

data/CHANGELOG.md

@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- add @types/jest for VSCode intellisense
+
 ## [0.5.1] - 2019-10-08
 
 - skip bootsnap by default

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 require_relative 'lib/make_it_so/rails'
 
-ruby '2.6.3'
+ruby '2.7.3'
 
 # Specify your gem's dependencies in make_it_so.gemspec
 gemspec
@@ -19,7 +19,7 @@ group :development do
     gem gem_name, MakeItSo::Rails::VERSION
   end
 
-  gem 'sprockets-rails', '3.0.4'
+  gem 'sprockets-rails', '3.2.2'
   gem 'listen'
   gem 'rspec-rails'
   gem 'devise'

data/README.md

@@ -30,8 +30,9 @@ make_it_so rails <app_name>
 Then run:
 
 ```ruby
-rake db:create
-rake db:migrate
+yarn install
+bundle exec rake db:create
+bundle exec rake db:migrate
 ```
 
 By default, the generator will create a Rails app with the following options activated:

data/lib/make_it_so/rails.rb

@@ -1,5 +1,5 @@
 module MakeItSo
   module Rails
-    VERSION="5.2.3"
+    VERSION="5.2.5"
   end
 end

data/lib/make_it_so/rails/app_builder.rb

@@ -75,6 +75,7 @@ module MakeItSo
             copy_file 'new_application.js', 'application.js'
             remove_file 'new_application.js'
           end
+
         end
       end
 
@@ -262,15 +263,18 @@ module MakeItSo
 
         after_bundle do
           generate 'foundation:install foundation'
-          # foundation-rails generates an application layout so we
-          # must remove it
+          # foundation install always messes with the JS manifest
           remove_file 'app/views/layouts/foundation.html.erb'
 
           inside 'app/assets/javascripts' do
-            insert_into_file 'application.js',
-              "//= require foundation\n",
-              after: "//= require jquery_ujs\n"
+            remove_file 'application.js'
+            template 'application.foundation.js', 'application.js'
           end
+          # foundation-rails generates an application layout so we
+          # must remove it
+          remove_file 'app/views/layouts/foundation.html.erb'
+
+
         end
       end
 
@@ -294,7 +298,7 @@ module MakeItSo
         end
       end
 
-      def create_enzyme_config 
+      def create_enzyme_config
         run 'mkdir -p spec/javascript/support'
         devDependencies = parsed_package_json["devDependencies"].keys
         enzymeAdapter = devDependencies.select{ |d| d =~ /^enzyme-adapter-react-[0-9]*/ }[0]
@@ -303,6 +307,10 @@ module MakeItSo
           template 'enzyme.js'
           gsub_file 'enzyme.js', 'ADAPTER NAME GOES HERE', enzymeAdapter
         end
+
+        inside 'app/javascript/react/components' do
+          template "example.test.js"
+        end
       end
 
       def parsed_package_json

data/lib/make_it_so/version.rb

@@ -1,3 +1,3 @@
 module MakeItSo
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/make_it_so.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activerecord", "~> 5.2"
   spec.add_dependency "json"
 
-  spec.add_development_dependency "bundler", "~> 2.0.2"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "capybara"
 end

data/snippets/rails/js_jest_testing_deps.json

@@ -2,7 +2,8 @@
   "devDependencies": {
     "babel-jest": "^24.9.0",
     "fetch-mock": "~5.13.1",
-    "jest": "^24.9.0"
+    "jest": "^24.9.0",
+    "@types/jest": "^24.9.0"
   },
   "scripts": {
     "start": "./bin/webpack-dev-server",
@@ -11,17 +12,9 @@
   },
   "jest": {
     "automock": false,
-    "roots": [
-      "spec/javascript", 
-      "app/javascript"
-    ],
-    "moduleDirectories": [
-      "node_modules",
-      "app/javascript"
-    ],
-    "setupFiles": [
-      "./spec/javascript/support/enzyme.js"
-    ],
+    "roots": ["spec/javascript", "app/javascript"],
+    "moduleDirectories": ["node_modules", "app/javascript"],
+    "setupFiles": ["./spec/javascript/support/enzyme.js"],
     "testURL": "http://localhost/"
   }
 }

data/snippets/rails/react_dependencies.json

@@ -6,10 +6,10 @@
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
     "@babel/plugin-transform-destructuring": "^7.6.0",
     "@babel/plugin-transform-regenerator": "^7.4.5",
-    "@babel/plugin-transform-runtime": "^7.5.5",
+    "@babel/plugin-transform-runtime": "^7.13.10",
     "@babel/preset-env": "^7.5.5",
     "@babel/preset-react": "^7.0.0",
-    "@babel/runtime": "^7.6.2",
+    "@babel/runtime": "^7.13.10",
     "babel-loader": "^8.0.6",
     "prop-types": "~15.6.0",
     "react": "~16.8.0",

data/spec/features/rails/user_generates_rails_spec.rb

@@ -193,6 +193,12 @@ feature 'user generates rails app with default settings' do
     it 'does not include modernizr in the layout' do
       expect(read_file('app/views/layouts/application.html.erb')).to_not include('modernizr')
     end
+
+     it 'adds the custom application.js manifest to the assets folder' do
+      file_subpath = "app/assets/javascripts/application.js"
+      generated_js_manifest = File.join(app_path, file_subpath)
+      expect(FileTest.exists?(generated_js_manifest)).to eq(true)
+    end 
   end
 
   context 'react' do
@@ -264,8 +270,8 @@ feature 'user generates rails app with default settings' do
 
     it 'sets necessary presets in babel.config.js' do
       babel_config = read_file('babel.config.js')
-      expect(babel_config).to include("@babel/env")
-      expect(babel_config).to include("@babel/react")
+      expect(babel_config).to include("@babel/preset-env")
+      expect(babel_config).to include("@babel/preset-react")
     end
   end
 
@@ -303,6 +309,12 @@ feature 'user generates rails app with default settings' do
         expect(json["jest"]["setupFiles"]).to include('./spec/javascript/support/enzyme.js')
       end
     end 
+
+    it 'adds example.test.js to react components folder' do
+      file_subpath = "app/javascript/react/components/example.test.js"
+      example_test_file = File.join(app_path, file_subpath)
+      expect(FileTest.exists?(example_test_file)).to eq(true)
+    end 
   end
 
   context 'jest' do
@@ -318,6 +330,12 @@ feature 'user generates rails app with default settings' do
       end
     end
 
+    scenario 'adds @types/jest as a dependency' do
+      in_package_json?(package_json_path) do |json|
+        expect(json["devDependencies"]["@types/jest"]).to_not be_nil
+      end
+    end
+
     scenario 'adds enzyme as a dependency' do
       in_package_json?(package_json_path) do |json|
         expect(json["devDependencies"]["enzyme"]).to_not be_nil

data/templates/rails/app/assets/javascripts/application.foundation.js

@@ -0,0 +1,18 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs
+//= require foundation
+//= require_tree .
+
+$(function(){ $(document).foundation(); });

data/templates/rails/app/assets/javascripts/application.js

@@ -0,0 +1,16 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .
+

data/templates/rails/app/javascript/react/components/example.test.js

@@ -0,0 +1,5 @@
+describe('example test', () => {
+  it('should pass', () => {
+    expect(true).toBe(true);
+  });
+});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: make_it_so
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Dan Pickett
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -158,10 +158,13 @@ files:
 - templates/rails/.env
 - templates/rails/.env.example
 - templates/rails/.gitkeep
+- templates/rails/app/assets/javascripts/application.foundation.js
+- templates/rails/app/assets/javascripts/application.js
 - templates/rails/app/controllers/application_controller.rb
 - templates/rails/app/controllers/homes_controller.rb
 - templates/rails/app/javascript/packs/new_application.js
 - templates/rails/app/javascript/react/components/App.js
+- templates/rails/app/javascript/react/components/example.test.js
 - templates/rails/app/models/application_record.rb
 - templates/rails/app/views/homes/index.html.erb
 - templates/rails/app/views/layouts/application.html.erb.tt
@@ -193,7 +196,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -208,8 +211,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.1.6
+signing_key:
 specification_version: 4
 summary: An application generator for all things ruby
 test_files: