jets 1.4.11 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24d179a8d9f5977280a81d8897cdbb13670a365823e94388f1ccb494aa47507d
-  data.tar.gz: 10ce7863fa659965ff45964ce4fbdb040f104a145dd57a5fdd6b18610afbff5f
+  metadata.gz: a211d70b05e7db0a0a74d1432901a395bf86270671bd52444d61578320e7dea3
+  data.tar.gz: 4f4ea63695bdb6230e9c40877911e476e6d0e35265089168920e3bad812b86e2
 SHA512:
-  metadata.gz: 0f01c123b0318172492ba05bb8c86acc9664b303662fb3ba8ef46b841783cc138c316516afa54468506697b4f899308d624de60b728fa6848feb03f6260b76b6
-  data.tar.gz: 3db800311acd08768ddb4a5747c58c1dee6667c59d09e1fe2750253c57805bd3dba6f830df83f5bd580f0356f71f40f2bc842c878ca7039bfd33f58289a82d21
+  metadata.gz: 0c951b27085d1a76cca87e843332f473407b9d45e0bce93ea7fa8b668130a61e559c6f1273840d82c1874232b9fa933789bfe05a54323a9d94503da8bbfe3364
+  data.tar.gz: 4095238a2422f3f61df81fd14d3804f4040dde12ae290beeff89d079914f5d86038d20d1f9d4fd88a9ec1fc13b6f423bbf6b6ea7c22c8808fe97c4a3507ff474

data/.gitmodules

@@ -1,3 +1,6 @@
 [submodule "vendor/jets-gems"]
 	path = vendor/jets-gems
 	url = https://github.com/tongueroo/jets-gems
+[submodule "vendor/rails"]
+	path = vendor/rails
+	url = https://github.com/tongueroo/rails.git

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.5.0]
+- #135 from tongueroo/remove-rails-constant Remove Rails Constant
+- #136 from tongueroo/routes-namespace routes namespace support (ghost release, not documented yet on purpose)
+
 ## [1.4.11]
 - #133 from tongueroo/custom-layer add custom lambda layer support
 - #134 from tongueroo/remove-dynomite-vendor remove vendor/dynomite

data/Gemfile.lock

@@ -11,9 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.4.11)
-      actionpack (>= 5.2.1)
-      actionview (>= 5.2.1)
+    jets (1.5.0)
       activerecord (>= 5.2.1)
       activesupport (>= 5.2.1)
       aws-sdk-apigateway
@@ -28,6 +26,7 @@ PATH
       dotenv
       gems
       hashie
+      jets-html-sanitizer
       json
       kramdown
       memoist
@@ -67,7 +66,7 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.130.0)
+    aws-partitions (1.131.0)
     aws-sdk-apigateway (1.23.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
@@ -109,7 +108,7 @@ GEM
     crass (1.0.4)
     diff-lcs (1.3)
     dotenv (2.6.0)
-    dynomite (1.1.0)
+    dynomite (1.1.1)
       activesupport
       aws-sdk-dynamodb
     erubi (1.8.0)
@@ -118,6 +117,8 @@ GEM
     hashie (3.6.0)
     i18n (1.5.1)
       concurrent-ruby (~> 1.0)
+    jets-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     jmespath (1.4.0)
     json (2.1.0)
     kramdown (1.17.0)

data/jets.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "actionpack", ">= 5.2.1"
-  spec.add_dependency "actionview", ">= 5.2.1"
+  # spec.add_dependency "actionpack", ">= 5.2.1" # using vendor/rails version
+  # spec.add_dependency "actionview", ">= 5.2.1" # using vendor/rails version
   spec.add_dependency "activerecord", ">= 5.2.1"
   spec.add_dependency "activesupport", ">= 5.2.1"
   spec.add_dependency "aws-sdk-apigateway"
@@ -43,6 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dotenv"
   spec.add_dependency "gems" # jets-gems dependency
   spec.add_dependency "hashie"
+  spec.add_dependency "jets-html-sanitizer"
   spec.add_dependency "json"
   spec.add_dependency "kramdown"
   spec.add_dependency "memoist"

data/lib/jets.rb

@@ -58,7 +58,13 @@ end
 
 require "jets/core_ext/kernel"
 
-$:.unshift(File.expand_path("../../vendor/jets-gems/lib", __FILE__))
+root = File.expand_path("..", File.dirname(__FILE__))
+
+$:.unshift("#{root}/vendor/jets-gems/lib")
 require "jets-gems"
 
-Jets::Db # trigger autoload
+$:.unshift("#{root}/vendor/rails/actionpack/lib")
+$:.unshift("#{root}/vendor/rails/actionview/lib")
+# will require action_controller, action_pack, etc later when needed
+
+Jets::Db # trigger autoload

data/lib/jets/builders/tidy.rb

@@ -66,7 +66,8 @@ class Jets::Builders
 
     # folders to remove in the vendor/gems folder regardless of the level of the folder
     def clean_vendor_gems
-      Dir.glob("#{@project_root}/vendor/gems/**/*").each do |path|
+      # Thanks: https://stackoverflow.com/questions/11385795/ruby-list-directory-with-dir-including-dotfiles-but-not-and
+      Dir.glob("#{@project_root}/vendor/gems/**/*", File::FNM_DOTMATCH).each do |path|
         next unless File.directory?(path)
         dir = File.basename(path)
         next unless always_removals.include?(dir)

data/lib/jets/commands/db.rb

@@ -1,6 +1,3 @@
-require "rails/generators"
-require "rails/generators/active_record/migration/migration_generator"
-
 module Jets::Commands
   class Db < Jets::Commands::Base
     autoload :Tasks, 'jets/commands/db/tasks'
@@ -8,6 +5,9 @@ module Jets::Commands
     desc "generate", "Creates a migration to change a db table"
     long_desc Help.text('db:generate')
     def generate(*args)
+      require "rails/generators"
+      require "rails/generators/active_record/migration/migration_generator"
+
       generator = ActiveRecord::Generators::MigrationGenerator.new(args)
       generator.create_migration_file
     end

data/lib/jets/commands/db/tasks.rb

@@ -1,10 +1,11 @@
-require "rails"
-require "active_record"
-require "recursive-open-struct"
-
 class Jets::Commands::Db::Tasks
   # Ugly but it loads ActiveRecord database tasks
   def self.load!
+    # Lazy require rails so Rails const is only defined in jets db:* tasks
+    require "rails"
+    require "active_record"
+    require "recursive-open-struct"
+
     # Jets.boot # Jets.boot here screws up jets -h, the db_config doesnt seem to match exactly
     # but seems to be working anyway.
     db_configs = Jets.application.config.database

data/lib/jets/generator.rb

@@ -1,5 +1,3 @@
-require "rails/configuration"
-
 # Piggy back off of Rails Generators.
 class Jets::Generator
   def self.invoke(generator, *args)
@@ -12,6 +10,9 @@ class Jets::Generator
   end
 
   def invoke
+    # lazy require so Rails const is only defined when using generators
+    require "rails/generators"
+    require "rails/configuration"
     Rails::Generators.configure!(config)
     Rails::Generators.invoke(@generator, @args, behavior: :invoke, destination_root: Jets.root)
   end

data/lib/jets/router.rb

@@ -2,6 +2,8 @@ require 'text-table'
 
 module Jets
   class Router
+    autoload :Scope, 'jets/router/scope'
+
     attr_reader :routes
     def initialize
       @routes = []
@@ -18,6 +20,33 @@ module Jets
       end
     end
 
+    def create_route(options)
+      # Currently only using scope to add namespace
+      # TODO: Can use it to add additional things like authorization_type
+      # Would be good to add authorization_type at the controller level also
+      options[:path] = add_namespace(options[:path])
+      @routes << Route.new(options)
+    end
+
+    def add_namespace(path)
+      return path unless @scope
+      ns = @scope.full_namespace
+      return path unless ns
+      "#{ns}/#{path}"
+    end
+
+    def namespace(ns, &block)
+      scope(namespace: ns, &block)
+    end
+
+    def scope(options={})
+      root_level = @scope.nil?
+      @scope = root_level ? Scope.new(options) : @scope.new(options)
+      yield
+    ensure
+      @scope = @scope.parent if @scope
+    end
+
     # resources macro expands to all the routes
     def resources(name)
       get "#{name}", to: "#{name}#index"
@@ -45,10 +74,6 @@ module Jets
       api_mode
     end
 
-    def create_route(options)
-      @routes << Route.new(options)
-    end
-
     # root "posts#index"
     def root(to)
       @routes << Route.new(path: '', to: to, method: :get, root: true)

data/lib/jets/router/scope.rb

@@ -0,0 +1,30 @@
+module Jets
+  class Router
+    class Scope
+      attr_reader :options, :parent, :level
+      def initialize(options = {}, parent = nil, level = 1)
+        @options = options
+        @parent = parent
+        @level = level
+      end
+
+      def root?
+        @parent.nil?
+      end
+
+      def new(options={})
+        self.class.new(options, self, level + 1)
+      end
+
+      def full_namespace
+        ns = []
+        current = self
+        while current
+          ns.unshift(current.options[:namespace])
+          current = current.parent
+        end
+        ns.empty? ? nil : ns.join('/')
+      end
+    end
+  end
+end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.4.11"
+  VERSION = "1.5.0"
 end

data/vendor/rails/Brewfile

@@ -0,0 +1,13 @@
+tap "homebrew/core"
+tap "homebrew/bundle"
+tap "homebrew/services"
+tap "caskroom/cask"
+brew "ffmpeg"
+brew "memcached"
+brew "mysql"
+brew "postgresql"
+brew "redis"
+brew "yarn"
+cask "xquartz"
+brew "mupdf"
+brew "poppler"

data/vendor/rails/CODE_OF_CONDUCT.md

@@ -0,0 +1,12 @@
+# Contributor Code of Conduct
+
+The Rails team is committed to fostering a welcoming community.
+
+**Our Code of Conduct can be found here**:
+
+http://rubyonrails.org/conduct/
+
+For a history of updates, see the page history here:
+
+https://github.com/rails/rails.github.com/commits/master/conduct/index.html
+

data/vendor/rails/CONTRIBUTING.md

@@ -0,0 +1,49 @@
+## How to contribute to Ruby on Rails
+
+#### **Did you find a bug?**
+
+* **Do not open up a GitHub issue if the bug is a security vulnerability
+  in Rails**, and instead to refer to our [security policy](http://rubyonrails.org/security/).
+
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/rails/rails/issues).
+
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/rails/rails/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
+
+* If possible, use the relevant bug report templates to create the issue. Simply copy the content of the appropriate template into a .rb file, make the necessary changes to demonstrate the issue, and **paste the content into the issue description**:
+  * [**Active Record** (models, database) issues](https://github.com/rails/rails/blob/master/guides/bug_report_templates/active_record_master.rb)
+  * [**Action Pack** (controllers, routing) issues](https://github.com/rails/rails/blob/master/guides/bug_report_templates/action_controller_master.rb)
+  * [**Generic template** for other issues](https://github.com/rails/rails/blob/master/guides/bug_report_templates/generic_master.rb)
+
+* For more detailed information on submitting a bug report and creating an issue, visit our [reporting guidelines](http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#reporting-an-issue).
+
+#### **Did you write a patch that fixes a bug?**
+
+* Open a new GitHub pull request with the patch.
+
+* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+* Before submitting, please read the [Contributing to Ruby on Rails](http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html) guide to know more about coding conventions and benchmarks.
+
+#### **Did you fix whitespace, format code, or make a purely cosmetic patch?**
+
+Changes that are cosmetic in nature and do not add anything substantial to the stability, functionality, or testability of Rails will generally not be accepted (read more about [our rationales behind this decision](https://github.com/rails/rails/pull/13771#issuecomment-32746700)).
+
+#### **Do you intend to add a new feature or change an existing one?**
+
+* Suggest your change in the [rubyonrails-core mailing list](https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core) and start writing code.
+
+* Do not open an issue on GitHub until you have collected positive feedback about the change. GitHub issues are primarily intended for bug reports and fixes.
+
+#### **Do you have questions about the source code?**
+
+* Ask any question about how to use Ruby on Rails in the [rubyonrails-talk mailing list](https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-talk).
+
+#### **Do you want to contribute to the Rails documentation?**
+
+* Please read [Contributing to the Rails Documentation](http://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-documentation).
+
+Ruby on Rails is a volunteer effort. We encourage you to pitch in and [join the team](http://contributors.rubyonrails.org)!
+
+Thanks! :heart: :heart: :heart:
+
+Rails Team

data/vendor/rails/Gemfile

@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gemspec
+
+# We need a newish Rake since Active Job sets its test tasks' descriptions.
+gem "rake", ">= 11.1"
+
+# This needs to be with require false to ensure correct loading order, as it has to
+# be loaded after loading the test library.
+gem "mocha", require: false
+
+if RUBY_VERSION < "2.3"
+  gem "capybara", ">= 2.15", "< 3.2"
+else
+  gem "capybara", ">= 2.15"
+end
+
+gem "rack-cache", "~> 1.2"
+gem "coffee-rails"
+gem "sass-rails"
+gem "turbolinks", "~> 5"
+
+# require: false so bcrypt is loaded only when has_secure_password is used.
+# This is to avoid Active Model (and by extension the entire framework)
+# being dependent on a binary library.
+gem "bcrypt", "~> 3.1.11", require: false
+
+# This needs to be with require false to avoid it being automatically loaded by
+# sprockets.
+gem "uglifier", ">= 1.3.0", require: false
+
+# Explicitly avoid 1.x that doesn't support Ruby 2.4+
+gem "json", ">= 2.0.0"
+
+gem "rubocop", ">= 0.47", require: false
+
+# https://github.com/guard/rb-inotify/pull/79
+gem "rb-inotify", github: "matthewd/rb-inotify", branch: "close-handling", require: false
+
+# https://github.com/puma/puma/pull/1345
+gem "stopgap_13632", github: "pixeltrix/stopgap_13632", platforms: :mri if RUBY_VERSION < "2.3"
+
+group :doc do
+  gem "sdoc", "~> 1.0"
+  gem "redcarpet", "~> 3.2.3", platforms: :ruby
+  gem "w3c_validators"
+  gem "kindlerb", "~> 1.2.0"
+end
+
+# Active Support.
+gem "dalli", ">= 2.2.1"
+gem "listen", ">= 3.0.5", "< 3.2", require: false
+gem "libxml-ruby", platforms: :ruby
+gem "connection_pool", require: false
+
+# for railties app_generator_test
+gem "bootsnap", ">= 1.1.0", require: false
+
+# Active Job.
+group :job do
+  gem "resque", require: false
+  gem "resque-scheduler", require: false
+  gem "sidekiq", require: false
+  gem "sucker_punch", require: false
+  gem "delayed_job", require: false
+  gem "queue_classic", github: "rafaelfranca/queue_classic", branch: "update-pg", require: false, platforms: :ruby
+  gem "sneakers", require: false
+  gem "que", require: false
+  gem "backburner", require: false
+  # TODO: add qu after it support Rails 5.1
+  # gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
+  # gem "qu-redis", require: false
+  gem "delayed_job_active_record", require: false
+  gem "sequel", require: false
+end
+
+# Action Cable
+group :cable do
+  gem "puma", require: false
+
+  gem "hiredis", require: false
+  gem "redis", "~> 4.0", require: false
+
+  gem "redis-namespace"
+
+  gem "websocket-client-simple", github: "matthewd/websocket-client-simple", branch: "close-race", require: false
+
+  gem "blade", require: false, platforms: [:ruby]
+  gem "blade-sauce_labs_plugin", require: false, platforms: [:ruby]
+  gem "sprockets-export", require: false
+end
+
+# Active Storage
+group :storage do
+  gem "aws-sdk-s3", require: false
+  gem "google-cloud-storage", "~> 1.8", require: false
+  gem "azure-storage", require: false
+
+  gem "mini_magick"
+end
+
+group :ujs do
+  gem "qunit-selenium"
+  gem "chromedriver-helper"
+end
+
+# Add your own local bundler stuff.
+local_gemfile = File.expand_path(".Gemfile", __dir__)
+instance_eval File.read local_gemfile if File.exist? local_gemfile
+
+group :test do
+  gem "minitest-bisect"
+
+  platforms :mri do
+    gem "stackprof"
+    gem "byebug"
+  end
+
+  gem "benchmark-ips"
+end
+
+platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
+  gem "nokogiri", ">= 1.8.1"
+
+  # Needed for compiling the ActionDispatch::Journey parser.
+  gem "racc", ">=1.4.6", require: false
+
+  # Active Record.
+  gem "sqlite3", "~> 1.3.6"
+
+  group :db do
+    gem "pg", ">= 0.18.0"
+    gem "mysql2", ">= 0.4.4"
+  end
+end
+
+platforms :jruby do
+  if ENV["AR_JDBC"]
+    gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
+    group :db do
+      gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
+      gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
+    end
+  else
+    gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0"
+    group :db do
+      gem "activerecord-jdbcmysql-adapter", ">= 1.3.0"
+      gem "activerecord-jdbcpostgresql-adapter", ">= 1.3.0"
+    end
+  end
+end
+
+platforms :rbx do
+  # The rubysl-yaml gem doesn't ship with Psych by default as it needs
+  # libyaml that isn't always available.
+  gem "psych", "~> 2.0"
+end
+
+# Gems that are necessary for Active Record tests with Oracle.
+if ENV["ORACLE_ENHANCED"]
+  platforms :ruby do
+    gem "ruby-oci8", "~> 2.2"
+  end
+  gem "activerecord-oracle_enhanced-adapter", github: "rsim/oracle-enhanced", branch: "release52"
+end
+
+# A gem necessary for Active Record tests with IBM DB.
+gem "ibm_db" if ENV["IBM_DB"]
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem "wdm", ">= 0.1.0", platforms: [:mingw, :mswin, :x64_mingw, :mswin64]